pending-dns 1.2.3 → 1.2.5

package/config/default.toml

@@ -66,6 +66,14 @@ retry = 600
 expiration = 604800
 minimum = 60
 
+# Text to return for chaos requests
+# Disabled by default
+[chaos]
+#"version.bind" = "PendingDNS"
+#"hostname.bind" = "forbidden.lan"
+#"id.server" = "forbidden.lan"
+#"authors.bind" = ["Andris Reinman"]
+
 # Resolver for external DNS queries, set ns=false to use system default
 # Mostly used for ANAME resolving
 [resolver]

package/lib/api-server.js

@@ -125,7 +125,7 @@ const recordScheme = Joi.object({
                     allowQuerySquareBrackets: false
                 })
                 .default(false)
-                .required()
+                .optional()
         })
         .when('type', {
             is: 'AAAA',
@@ -138,7 +138,7 @@ const recordScheme = Joi.object({
                     allowQuerySquareBrackets: false
                 })
                 .default(false)
-                .required()
+                .optional()
         })
         .description('Health check URI for A/AAAA')
         .label('HealthCheck'),

package/lib/dns-handler.js

@@ -62,6 +62,7 @@ const processQuestion = async (response, question, domain, depth) => {
     domain = normalizeDomain(domain || question.name);
 
     let questionTypeStr = reversedTypes.has(question.type) ? reversedTypes.get(question.type) : false;
+
     if (!questionTypeStr) {
         // nothing to do here
         return;
@@ -163,6 +164,31 @@ const processQuestion = async (response, question, domain, depth) => {
             response.answers.push(entry);
         }
 
+        // Chaos responses
+        if (
+            question.class === dns2.Packet.CLASS.CH &&
+            questionTypeStr === 'TXT' &&
+            question.class === dns2.Packet.CLASS.CH &&
+            config.chaos &&
+            domain in config.chaos
+        ) {
+            for (let entry of [].concat(config.chaos[domain] || [])) {
+                response.answers.push({
+                    name: domain,
+                    type: 'TXT',
+                    data: formatTXTData(entry),
+                    ttl: 0,
+                    class: dns2.Packet.CLASS.CH
+                });
+            }
+            response.authorities.push({
+                name: domain,
+                type: 'NS',
+                ns: domain,
+                ttl: 0,
+                class: dns2.Packet.CLASS.CH
+            });
+        }
         return;
     }
 
@@ -365,12 +391,14 @@ const dnsHandler = async request => {
     });
 
     // normalize answers for the DNS library
-    response.answers.forEach(answer => {
-        answer.type = dns2.Packet.TYPE[answer.type];
-        answer.class = dns2.Packet.CLASS.IN;
-        answer.name = punycode.toASCII(answer.name);
-        answer.ttl = config.dns.ttl;
-    });
+    for (let responseType of [response.answers, response.authorities]) {
+        responseType.forEach(answer => {
+            answer.type = dns2.Packet.TYPE[answer.type];
+            answer.class = typeof answer.class === 'number' ? answer.class : dns2.Packet.CLASS.IN;
+            answer.name = punycode.toASCII(answer.name);
+            answer.ttl = typeof answer.ttl === 'number' && answer.ttl >= 0 ? answer.ttl : config.dns.ttl;
+        });
+    }
 
     return response;
 };

package/lib/dns-server.js

@@ -7,10 +7,14 @@ const logger = require('./logger').child({ component: 'dns-server' });
 const { createDNSTcpServer } = require('./dns-tcp-server');
 const { createDNSUdpServer } = require('./dns-udp-server');
 
+const SUSPENDED_TYPES = new Set([
+    0x29 // EDNS is supported by the dns module
+]);
+
 const SUPPORTED_TYPES = new Set(
     Object.keys(dns2.Packet.TYPE)
         .map(key => dns2.Packet.TYPE[key])
-        .filter(val => typeof val === 'number')
+        .filter(val => typeof val === 'number' && !SUSPENDED_TYPES.has(val))
 );
 
 const init = async () => {

package/lib/dns-udp-server.js

@@ -39,7 +39,9 @@ class DNSUdpServer extends EventEmitter {
         this.emit('request', request, this.send.bind(this, rinfo), rinfo);
     }
     send(rinfo, message) {
-        if (message instanceof Packet) message = message.toBuffer();
+        if (message instanceof Packet) {
+            message = message.toBuffer();
+        }
         return new Promise((resolve, reject) => {
             this.socket.send(message, rinfo.port, rinfo.address, err => {
                 if (err) return reject(err);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pending-dns",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "description": "Lightweight API driven DNS server",
     "main": "index.js",
     "scripts": {