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

Fix bug that prevented verification of multiple user ids

Browse Source
This commit is contained in:
Tankred Hase 2016-06-17 19:56:33 +02:00
parent 7c16ccd40a
commit 516df397c2
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@ class PublicKey {
} }
// check if user ids of this key have already been verified in another key // check if user ids of this key have already been verified in another key
let verified = yield this.getVerified(key); let verified = yield this.getVerified(key);
if (verified) { if (verified && verified.keyId !== keyId) {
util.throw(304, 'Key for this user already exists'); util.throw(304, 'Key for this user already exists');
} }
// flag the user id as verified // flag the user id as verified

15
test/integration/public-key-test.js
View File

@ -142,6 +142,21 @@ describe('Public Key Integration Tests', function() {
expect(gotten.userIds[1].verified).to.be.false; expect(gotten.userIds[1].verified).to.be.false;
expect(gotten.userIds[1].nonce).to.equal(mailsSent[0].params.nonce); expect(gotten.userIds[1].nonce).to.equal(mailsSent[0].params.nonce);
}); });
it('should be able to verify multiple user ids', function *() {
yield publicKey.put({ publicKeyArmored, origin });
expect(mailsSent.length).to.equal(4);
yield publicKey.verify(mailsSent[0].params);
yield publicKey.verify(mailsSent[1].params);
yield publicKey.verify(mailsSent[2].params);
yield publicKey.verify(mailsSent[3].params);
let gotten = yield mongo.get({ keyId:mailsSent[0].params.keyId }, DB_TYPE);
expect(gotten.userIds[0].verified).to.be.true;
expect(gotten.userIds[1].verified).to.be.true;
expect(gotten.userIds[2].verified).to.be.true;
expect(gotten.userIds[3].verified).to.be.true;
});
}); });
describe('getVerified', () => { describe('getVerified', () => {