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

Replace addressparser with openpgp.util.parseUserId

Browse Source
This commit is contained in:
Thomas Oberndörfer 2019-03-13 11:18:20 +01:00
parent b83f13cde2
commit f88f4d5d2e
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package-lock.json generated
View File

@ -94,11 +94,6 @@
"email-addresses": "^3.0.0" "email-addresses": "^3.0.0"
} }
}, },
"addressparser": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
"integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
},
"ajv": { "ajv": {
"version": "6.9.2", "version": "6.9.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",

1
package.json
View File

@ -21,7 +21,6 @@
"release:archive": "zip -rq release.zip package.json package-lock.json node_modules/ *.js src/ config/" "release:archive": "zip -rq release.zip package.json package-lock.json node_modules/ *.js src/ config/"
}, },
"dependencies": { "dependencies": {
"addressparser": "1.0.1",
"co-body": "6.0.0", "co-body": "6.0.0",
"config": "3.0.1", "config": "3.0.1",
"koa": "2.7.0", "koa": "2.7.0",

9
src/service/pgp.js
View File

@ -20,7 +20,6 @@
const log = require('winston'); const log = require('winston');
const util = require('./util'); const util = require('./util');
const openpgp = require('openpgp'); const openpgp = require('openpgp');
const addressparser = require('addressparser');
const KEY_BEGIN = '-----BEGIN PGP PUBLIC KEY BLOCK-----'; const KEY_BEGIN = '-----BEGIN PGP PUBLIC KEY BLOCK-----';
const KEY_END = '-----END PGP PUBLIC KEY BLOCK-----'; const KEY_END = '-----END PGP PUBLIC KEY BLOCK-----';
@ -131,16 +130,18 @@ class PGP {
for (const user of users) { for (const user of users) {
const userStatus = await user.verify(primaryKey, verifyDate); const userStatus = await user.verify(primaryKey, verifyDate);
if (userStatus !== openpgp.enums.keyStatus.invalid && user.userId && user.userId.userid) { if (userStatus !== openpgp.enums.keyStatus.invalid && user.userId && user.userId.userid) {
const uid = addressparser(user.userId.userid)[0]; try {
if (util.isEmail(uid.address)) { const uid = openpgp.util.parseUserId(user.userId.userid);
if (util.isEmail(uid.email)) {
// map to local user id object format // map to local user id object format
result.push({ result.push({
status: userStatus, status: userStatus,
name: uid.name, name: uid.name,
email: util.normalizeEmail(uid.address), email: util.normalizeEmail(uid.email),
verified: false verified: false
}); });
} }
} catch (e) {}
} }
} }
return result; return result;