Merge 500ad2d into d06ff06

handshake-org · Aug 7, 2020 · 0f38612 · 0f38612
2 parents d06ff06 + 500ad2d
commit 0f38612
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/lib/dns/server.js b/lib/dns/server.js
@@ -276,6 +276,10 @@ class RootServer extends DNSServer {
           res.answer.push(key.ds.deepClone());
           key.signZSK(res.answer, types.DS);
           break;
+        case types.KEY:
+          res.answer.push(this.toKEY());
+          key.signZSK(res.answer, types.KEY);
+          break;
         default:
           // Empty Proof:
           res.authority.push(this.toNSEC());
@@ -489,6 +493,10 @@ class RootServer extends DNSServer {
     rd.typeBitmap = TYPE_MAP;
     return rr;
   }
+
+  toKEY() {
+    return hsig.makeKey(this.key);
+  }
 }
 
 /**

diff --git a/test/ns-test.js b/test/ns-test.js
@@ -107,4 +107,13 @@ describe('RootServer', function() {
     // Nothing was added to the cache
     assert.strictEqual(cache.size, 1);
   });
+
+  it('should resolve KEY rr', async () => {
+    const req = {question: [{name: '.', type: wire.types.KEY}]};
+    const res = await ns.resolve(req);
+    const got = res.answer.find(rr => rr.type === wire.types.KEY);
+
+    assert(got);
+    assert.equal(got.name, '.');
+  });
 });