simonvareille/keyserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow update of an email address’ key with remove/verify flow in between

Browse Source
This commit is contained in:
Tankred Hase
2017-08-24 16:36:32 +08:00
parent 164585b406
commit b738e1bc5c
2 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/service/public-key.js
View File

@@ -71,10 +71,10 @@ class PublicKey {
await this._purgeOldUnverified();
// parse key block
const key = this._pgp.parseKey(publicKeyArmored);
// check for existing verfied key by id or email addresses
const verified = await this.getVerified(key);
// check for existing verified key with same id
const verified = await this.getVerified({keyId: key.keyId});
if (verified) {
util.throw(304, 'Key for this user already exists');
util.throw(304, 'Key with this key id already exists');
}
// store key in database
await this._persisKey(key);
@@ -144,11 +144,7 @@ class PublicKey {
if (!key) {
util.throw(404, 'User id not found');
}
// check if user ids of this key have already been verified in another key
const verified = await this.getVerified(key);
if (verified && verified.keyId !== keyId) {
util.throw(304, 'Key for this user already exists');
}
await this._removeKeysWithSameEmail(key, nonce);
// flag the user id as verified
await this._mongo.update(query, {
'userIds.$.verified': true,
@@ -156,6 +152,15 @@ class PublicKey {
}, DB_TYPE);
}
async _removeKeysWithSameEmail({keyId, userIds}, nonce) {
const {email} = userIds.find(uid => uid.nonce === nonce);
const keys = await this._mongo.list({
keyId: {$ne: keyId},
'userIds.email': email
}, DB_TYPE);
await Promise.all(keys.map(({_id}) => this._mongo.remove({_id}, DB_TYPE)));
}
/**
* Check if a verified key already exists either by fingerprint, 16 char key id,
* or email address. There can only be one verified user ID for an email address