Add support for search with wkd hash

Author: pravi

src/modules/public-key.js

@@ -244,7 +244,7 @@ class PublicKey {
    * @param  {String} keyId        (optional) The public key ID
    * @return {Promise<Object>}     The verified key document
    */
-  async getVerified({userIds, fingerprint, keyId}) {
+  async getVerified({userIds, fingerprint, keyId, wkd}) {
     let queries = [];
     // query by fingerprint
     if (fingerprint) {
@@ -260,8 +260,19 @@ class PublicKey {
         'userIds.verified': true
       });
     }
-    // query by user ID
-    if (userIds) {
+    // query by wkd hash
+    if (userIds && wkd) {
+      queries = queries.concat(userIds.map(uid => ({
+        userIds: {
+          $elemMatch: {
+            'wkdhash': uid.email,
+            'verified': true
+          }
+        }
+      })));
+    }
+    // query by user id
+    if (userIds && !wkd) {
       queries = queries.concat(userIds.map(uid => ({
         userIds: {
           $elemMatch: {
@@ -283,10 +294,10 @@ class PublicKey {
    * @param  {Object} i18n         i18n object
    * @return {Promise<Object>}     The public key document
    */
-  async get({fingerprint, keyId, email, i18n}) {
+  async get({fingerprint, keyId, email, wkd, i18n}) {
     // look for verified key
     const userIds = email ? [{email}] : undefined;
-    const key = await this.getVerified({keyId, fingerprint, userIds});
+    const key = await this.getVerified({keyId, fingerprint, userIds, wkd});
     if (!key) {
       throw Boom.notFound(i18n.__('key_not_found'));
     }

src/route/hkp.js

@@ -46,7 +46,7 @@ class HKP {
     const params = this.parseQueryString(request);
     const key = await this._publicKey.get({...params, i18n: request.i18n});
     if (params.op === 'get') {
-      if (params.mr) {
+      if (params.mr || params.wkd) {
         return h.response(key.publicKeyArmored)
         .header('Content-Type', 'application/pgp-keys; charset=utf-8')
         .header('Content-Disposition', 'attachment; filename=openpgp-key.asc');
@@ -84,7 +84,8 @@ class HKP {
   parseQueryString({query}) {
     const params = {
       op: query.op, // operation ... only 'get' is supported
-      mr: query.options === 'mr' // machine readable
+      mr: query.options === 'mr', // machine readable
+      wkd: query.options === 'wkd' // wkd hash
     };
     if (!['get', 'index', 'vindex'].includes(params.op)) {
       throw Boom.notImplemented('Method not implemented');