pending-dns 1.2.2 → 1.2.4

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;
@@ -341,10 +342,11 @@ const dnsHandler = async request => {
 
     await Promise.all(
         request.questions.map(question => {
-            logger.info({
+            logger.debug({
                 id: request._id,
                 msg: 'DNS query',
-                type: request.source.type,
+                action: 'dns_query',
+                proto: request.source.type,
                 port: request.source.port,
                 address: request.source.address,
                 question: question.name,
@@ -354,9 +356,10 @@ const dnsHandler = async request => {
         })
     );
 
-    logger.info({
-        msg: 'DNS response',
+    logger.debug({
         id: request._id,
+        msg: 'DNS response',
+        action: 'dns_response',
         dnsTime: Date.now() - startTime,
         questions: request.questions,
         answers: response.answers

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 () => {
@@ -59,7 +63,11 @@ const init = async () => {
             logger.info({ msg: 'DNS server listening', protocol: 'tcp', host: config.dns.host, port: config.dns.port });
         })
         .on('error', err => {
-            logger.error({ msg: 'DNS server error', protocol: 'tcp', err });
+            let method = 'error';
+            if (err && ['ECONNRESET'].includes(err.code)) {
+                method = 'trace';
+            }
+            logger[method]({ msg: 'DNS server error', protocol: 'tcp', err });
         });
 };
 

package/lib/dns-tcp-server.js

@@ -40,7 +40,7 @@ class DNSTcpServer extends EventEmitter {
                 try {
                     request = Packet.parse(buffer.slice(2));
                 } catch (err) {
-                    logger.error({ msg: 'Failed to parse DNS package', type: 'tcp', err, buffer, port: socket.remotePort, address: socket.remoteAddress });
+                    logger.trace({ msg: 'Failed to parse DNS package', proto: 'tcp', err, buffer, port: socket.remotePort, address: socket.remoteAddress });
                     try {
                         socket.end();
                     } catch (err) {
@@ -50,7 +50,7 @@ class DNSTcpServer extends EventEmitter {
                 }
 
                 request.source = {
-                    type: 'tcp',
+                    proto: 'tcp',
                     port: socket.remotePort,
                     address: socket.remoteAddress
                 };
@@ -95,10 +95,16 @@ class DNSTcpServer extends EventEmitter {
             try {
                 let len = Buffer.alloc(2);
                 len.writeUInt16BE(message.length);
-                socket.end(Buffer.concat([len, message]));
+
+                if (['open', 'writeOnly'].includes(socket.readyState)) {
+                    socket.end(Buffer.concat([len, message]));
+                } else {
+                    socket.end();
+                }
             } catch (err) {
                 // ignore
             }
+
             resolve(message);
         });
     }

package/lib/dns-udp-server.js

@@ -26,19 +26,22 @@ class DNSUdpServer extends EventEmitter {
         try {
             request = Packet.parse(buffer);
         } catch (err) {
-            logger.error({ msg: 'Failed to parse DNS package', type: 'udp', err, buffer, port: rinfo.port, address: rinfo.address });
+            logger.trace({ msg: 'Failed to parse DNS package', proto: 'udp', err, buffer, port: rinfo.port, address: rinfo.address });
             return;
         }
 
         request.source = {
-            type: 'udp',
+            proto: 'udp',
             port: rinfo.port,
             address: rinfo.address
         };
+
         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/lib/public-server.js

@@ -263,7 +263,17 @@ const setupHttps = () =>
 
                     logger.error({ msg: 'Failed to serve redirect page', err, hostname });
 
-                    const url = new URL(req.url || req.headers[':path'], `https://${hostname}/`);
+                    let url;
+                    try {
+                        url = new URL(req.url || req.headers[':path'], `https://${hostname}/`);
+                    } catch (err) {
+                        try {
+                            url = new URL(req.headers[':path'], `https://${hostname}/`);
+                        } catch (err) {
+                            url = `https://${hostname}/`;
+                        }
+                    }
+
                     const route = url.pathname;
 
                     res.send(
@@ -332,8 +342,17 @@ const setupHttp = () =>
                 const hostname = getHostname(req).replace(/^www\./, '');
 
                 logger.error({ msg: 'Failed to serve redirect page', err, hostname });
+                let url;
+                try {
+                    url = new URL(req.url || req.headers[':path'], `https://${hostname}/`);
+                } catch (err) {
+                    try {
+                        url = new URL(req.headers[':path'], `https://${hostname}/`);
+                    } catch (err) {
+                        url = `https://${hostname}/`;
+                    }
+                }
 
-                const url = new URL(req.url || req.headers[':path'], `https://${hostname}/`);
                 const route = url.pathname;
 
                 res.send(

package/package.json

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