Compare commits
2 Commits
lookup-vis
...
hkp-hkps-i
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b752e7db3a | ||
|
|
5c1ddb4e21 |
@@ -136,7 +136,9 @@ class HKP {
|
||||
ctx.body = `info:${VERSION}:${COUNT}\npub:${fp}:${algo}:${key.keySize}:${created}::\n`;
|
||||
|
||||
for (const uid of key.userIds) {
|
||||
ctx.body += `uid:${encodeURIComponent(`${uid.name} <${uid.email}>`)}:::\n`;
|
||||
if(uid.verified) {
|
||||
ctx.body += `uid:${encodeURIComponent(`${uid.name} <${uid.email}>`)}:::\n`;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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');
|
||||
|
||||
Reference in New Issue
Block a user