From b752e7db3afec13fb69d61dea63fae31a1cbc8a3 Mon Sep 17 00:00:00 2001 From: Simon Vareille Date: Mon, 15 Jun 2020 11:51:16 +0200 Subject: [PATCH] Error codes more specifics --- src/service/pgp.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/service/pgp.js b/src/service/pgp.js index 0cd7648..6273cc5 100644 --- a/src/service/pgp.js +++ b/src/service/pgp.js @@ -48,7 +48,7 @@ class PGP { log.error('pgp', 'Failed to parse PGP key:\n%s', publicKeyArmored, error); util.throw(500, 'Failed to parse PGP key'); } 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 @@ -64,14 +64,14 @@ class PGP { const keyId = primaryKey.getKeyId().toHex(); const fingerprint = primaryKey.getFingerprint(); 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 const {userIds, status} = await this.parseUserIds(key.users, primaryKey, verifyDate); if (!userIds.length) { 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 { util.throw(400, 'Invalid PGP key: invalid user IDs');