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

Fix merge bug

esisar-restrictions
Simon Vareille 2020-06-13 11:11:25 +02:00
parent 22bf076bff
commit 80721b237e
No known key found for this signature in database
GPG Key ID: 008AE8E706CC19F9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/service/pgp.js
View File

@ -68,7 +68,7 @@ class PGP {
} }
// check for at least one valid user id // check for at least one valid user id
const userIds = await this.parseUserIds(key.users, primaryKey, verifyDate); const {userIds, status} = await this.parseUserIds(key.users, primaryKey, verifyDate);
if (!userIds.length) { if (!userIds.length) {
if (status == 1) { if (status == 1) {
util.throw(400, 'Invalid PGP key: no user ID comes from a valid organisation'); util.throw(400, 'Invalid PGP key: no user ID comes from a valid organisation');
@ -122,7 +122,7 @@ class PGP {
/** /**
* Parse an array of user ids and verify signatures * Parse an array of user ids and verify signatures
* @param {Array} users A list of openpgp.js user objects * @param {Array} users A list of openpgp.js user objects
* @param {Object} primaryKey The primary key packet of the key * @param {Object} primaryKey The primary key packet of the key
* @param {Date} verifyDate Verify user IDs at this point in time * @param {Date} verifyDate Verify user IDs at this point in time
* @return {Array, integer} An array of user id objects and a satus indicator * @return {Array, integer} An array of user id objects and a satus indicator