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

Error codes more specifics

hkp-hkps-improvement
Simon Vareille 2020-06-15 11:51:16 +02:00
parent 5c1ddb4e21
commit b752e7db3a
No known key found for this signature in database
GPG Key ID: 008AE8E706CC19F9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/service/pgp.js
View File

@ -48,7 +48,7 @@ class PGP {
log.error('pgp', 'Failed to parse PGP key:\n%s', publicKeyArmored, error); log.error('pgp', 'Failed to parse PGP key:\n%s', publicKeyArmored, error);
util.throw(500, 'Failed to parse PGP key'); util.throw(500, 'Failed to parse PGP key');
} else if (!r.keys || r.keys.length !== 1 || !r.keys[0].primaryKey) { } else if (!r.keys || r.keys.length !== 1 || !r.keys[0].primaryKey) {
util.throw(400, 'Invalid PGP key: only one key can be uploaded'); util.throw(501, 'Invalid PGP key: only one key can be uploaded');
} }
// verify primary key // verify primary key
@ -64,14 +64,14 @@ class PGP {
const keyId = primaryKey.getKeyId().toHex(); const keyId = primaryKey.getKeyId().toHex();
const fingerprint = primaryKey.getFingerprint(); const fingerprint = primaryKey.getFingerprint();
if (!util.isKeyId(keyId) || !util.isFingerPrint(fingerprint)) { if (!util.isKeyId(keyId) || !util.isFingerPrint(fingerprint)) {
util.throw(400, 'Invalid PGP key: only v4 keys are accepted'); util.throw(501, 'Invalid PGP key: only v4 keys are accepted');
} }
// check for at least one valid user id // check for at least one valid user id
const {userIds, status} = 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(403, 'Invalid PGP key: no user ID comes from a valid organisation');
} }
else { else {
util.throw(400, 'Invalid PGP key: invalid user IDs'); util.throw(400, 'Invalid PGP key: invalid user IDs');