dns: serve TXT from root only if NS is not present

handshake-org · Feb 25, 2021 · d2a31f1 · d2a31f1
1 parent 56f4186
commit d2a31f1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/lib/dns/resource.js b/lib/dns/resource.js
@@ -322,6 +322,13 @@ class Resource extends Struct {
         res.authority = this.toNS(name);
         res.additional = this.toGlue(name);
         break;
+      case types.TXT:
+        if (!this.hasNS()) {
+          res.aa = true;
+          res.answer = this.toTXT(name);
+          key.signZSK(res.answer, types.TXT);
+        }
+        break;
       case types.DS:
         res.aa = true;
         res.answer = this.toDS(name);

diff --git a/test/resource-test.js b/test/resource-test.js
@@ -106,14 +106,37 @@ describe('Resource', function() {
     assert.strictEqual(synthAAAA.data.address, '::2');
   });
 
-  it('should not return TXT from root zone', () => {
+  it('should not return TXT from root zone if NS is present', () => {
     const res = Resource.fromJSON(json);
     const msg = res.toDNS('hns.', types.TXT);
 
     assert(msg.aa);
     assert(msg.answer.length === 0);
   });
 
+  it('should return TXT from root zone if NS is not present', () => {
+    const res = Resource.fromJSON({
+      records: [
+        {
+          type: 'TXT',
+          txt: ['hello world']
+        }
+      ]
+    });
+    const msg = res.toDNS('hns.', types.TXT);
+
+    assert(msg.aa);
+    assert(msg.answer.length === 2);
+
+    const [txt, sig] = msg.answer;
+    assert.strictEqual(txt.type, types.TXT);
+    assert.strictEqual(txt.name, 'hns.');
+    assert.strictEqual(txt.data.txt.length, 1);
+    assert.strictEqual(txt.data.txt[0], 'hello world');
+    assert.strictEqual(sig.type, types.RRSIG);
+    assert.strictEqual(sig.name, 'hns.');
+  });
+
   it('should synthesize an answer', () => {
     const res = Resource.fromJSON(json);
     const msg = res.toDNS('hns.', types.DS);