pending-dns 1.1.1 → 1.2.0

package/README.md

@@ -1,6 +1,6 @@
 # PendingDNS
 
-Lightweight API driven Authoritative DNS server. Extracted from [Project Pending](https://projectpending.com/).
+Lightweight API driven Authoritative DNS server.
 
 ## Features
 

package/lib/api-server.js

@@ -18,28 +18,26 @@ const hostnameSchema = Joi.string().hostname({
     minDomainSegments: 1
 });
 
-const subdomainValidator = opts => {
-    return (value, helpers) => {
-        if (!value) {
-            return value;
-        }
+const subdomainValidator = opts => (value, helpers) => {
+    if (!value) {
+        return value;
+    }
 
-        let valueToCheck = value;
-        if (opts.allowUnderscore) {
-            valueToCheck = valueToCheck.replace(/\b_/g, 'x');
-        }
+    let valueToCheck = value;
+    if (opts.allowUnderscore) {
+        valueToCheck = valueToCheck.replace(/\b_/g, 'x');
+    }
 
-        if (opts.allowWildcard) {
-            valueToCheck = valueToCheck.replace(/^\*\./, 'x.');
-        }
+    if (opts.allowWildcard) {
+        valueToCheck = valueToCheck.replace(/^\*\./, 'x.');
+    }
 
-        let result = hostnameSchema.validate(valueToCheck);
-        if (result.error) {
-            return helpers.error('any.invalid');
-        }
+    let result = hostnameSchema.validate(valueToCheck);
+    if (result.error) {
+        return helpers.error('any.invalid');
+    }
 
-        return value;
-    };
+    return value;
 };
 
 const recordScheme = Joi.object({

package/lib/cached-resolver.js

@@ -2,7 +2,7 @@
 
 const config = require('wild-config');
 const db = require('./db');
-const punycode = require('punycode');
+const punycode = require('punycode/');
 const { Resolver } = require('dns').promises;
 const resolver = new Resolver();
 const logger = require('./logger').child({ component: 'cached-resolver' });

package/lib/certs.js

@@ -3,7 +3,7 @@
 const config = require('wild-config');
 const pkg = require('../package.json');
 const db = require('./db');
-const punycode = require('punycode');
+const punycode = require('punycode/');
 const { zoneStore } = require('./zone-store');
 const crypto = require('crypto');
 const { checkNSStatus, normalizeDomain } = require('./tools');
@@ -34,11 +34,9 @@ const acme = ACME.create({
     },
     dns01(query) {
         return localResolver.resolveTxt(query.dnsHost).then(records => ({
-            answer: records.map(rr => {
-                return {
-                    data: rr
-                };
-            })
+            answer: records.map(rr => ({
+                data: rr
+            }))
         }));
     }
 });

package/lib/dns-handler.js

@@ -2,12 +2,13 @@
 
 const config = require('wild-config');
 const dns2 = require('dns2');
-const punycode = require('punycode');
+const punycode = require('punycode/');
 const { zoneStore } = require('./zone-store');
 const cachedResolver = require('./cached-resolver');
 const ipaddr = require('ipaddr.js');
 const logger = require('./logger').child({ component: 'dns-handler' });
 const { normalizeDomain } = require('./tools');
+const { v4: uuidv4 } = require('uuid');
 
 // Split long string values into character chunks
 const formatTXTData = data => {
@@ -19,11 +20,7 @@ const formatTXTData = data => {
 };
 
 // Helps to convert DNS type integer into a string (0x01 -> 'A')
-const reversedTypes = new Map(
-    Object.keys(dns2.Packet.TYPE).map(key => {
-        return [dns2.Packet.TYPE[key], key];
-    })
-);
+const reversedTypes = new Map(Object.keys(dns2.Packet.TYPE).map(key => [dns2.Packet.TYPE[key], key]));
 
 const shuffle = array => {
     let currentIndex = array.length,
@@ -89,7 +86,7 @@ const processQuestion = async (response, question, domain, depth) => {
     let dnsEntries = (
         await Promise.all(
             Array.from(types).map(async type => {
-                let records = await zoneStore.resolve(domain, type, true);
+                let records = await zoneStore.resolve(domain, type, false);
                 if (records && records.length > 1) {
                     switch (type) {
                         case 'A':
@@ -187,7 +184,13 @@ const processQuestion = async (response, question, domain, depth) => {
                         break;
                 }
             } catch (err) {
-                logger.error({ msg: 'Failed resolving ANAME', domain: dnsEntry.domain, type: questionTypeStr, err });
+                logger.error({
+                    msg: 'Failed resolving ANAME',
+                    id: response._id,
+                    domain: dnsEntry.domain,
+                    type: questionTypeStr,
+                    err
+                });
             }
 
             [].concat(value || []).forEach(value => {
@@ -258,7 +261,12 @@ const processQuestion = async (response, question, domain, depth) => {
                 try {
                     entry.domain = punycode.toASCII(entry.domain);
                 } catch (err) {
-                    logger.error({ msg: 'Failed to punycode', domain: entry.domain, err });
+                    logger.error({
+                        msg: 'Failed to punycode',
+                        id: response._id,
+                        domain: entry.domain,
+                        err
+                    });
                 }
                 break;
 
@@ -267,7 +275,12 @@ const processQuestion = async (response, question, domain, depth) => {
                 try {
                     entry.ns = punycode.toASCII(entry.ns);
                 } catch (err) {
-                    logger.error({ msg: 'Failed to punycode', domain: entry.ns, err });
+                    logger.error({
+                        msg: 'Failed to punycode',
+                        id: response._id,
+                        domain: entry.ns,
+                        err
+                    });
                 }
                 break;
 
@@ -284,7 +297,12 @@ const processQuestion = async (response, question, domain, depth) => {
                 try {
                     entry.exchange = punycode.toASCII(entry.exchange);
                 } catch (err) {
-                    logger.error({ msg: 'Failed to punycode', domain: entry.exchange, err });
+                    logger.error({
+                        msg: 'Failed to punycode',
+                        id: response._id,
+                        domain: entry.exchange,
+                        err
+                    });
                 }
                 break;
 
@@ -316,6 +334,7 @@ const processQuestion = async (response, question, domain, depth) => {
 const dnsHandler = async request => {
     let startTime = Date.now();
     const response = new dns2.Packet(request);
+    request._id = response._id = uuidv4();
 
     response.header.qr = 1;
     response.header.aa = 1;
@@ -323,18 +342,25 @@ const dnsHandler = async request => {
     await Promise.all(
         request.questions.map(question => {
             logger.info({
+                id: request._id,
                 msg: 'DNS query',
                 type: request.source.type,
                 port: request.source.port,
                 address: request.source.address,
-                name: question.name,
+                question: question.name,
                 rr: reversedTypes.get(question.type) || question.type
             });
             return processQuestion(response, question);
         })
     );
 
-    logger.info({ msg: 'DNS response', dnsTime: Date.now() - startTime, questions: request.questions, answers: response.answers });
+    logger.info({
+        msg: 'DNS response',
+        id: request._id,
+        dnsTime: Date.now() - startTime,
+        questions: request.questions,
+        answers: response.answers
+    });
 
     // normalize answers for the DNS library
     response.answers.forEach(answer => {

package/lib/dns-server.js

@@ -15,7 +15,7 @@ const SUPPORTED_TYPES = new Set(
 
 const init = async () => {
     // create UDP server
-    createDNSUdpServer(function (request, send) {
+    createDNSUdpServer((request, send) => {
         // filter out unsupported requests (eg. EDNS)
         if (request.additionals && request.additionals.length) {
             request.additionals = request.additionals.filter(additional => SUPPORTED_TYPES.has(additional.type));
@@ -43,7 +43,7 @@ const init = async () => {
         });
 
     // create TCP server
-    createDNSTcpServer(function (request, send) {
+    createDNSTcpServer((request, send) => {
         // filter out unsupported requests (eg. EDNS)
         if (request.additionals && request.additionals.length) {
             request.additionals = request.additionals.filter(additional => SUPPORTED_TYPES.has(additional.type));

package/lib/dns-tcp-server.js

@@ -52,9 +52,7 @@ class DNSTcpServer extends EventEmitter {
                     port: socket.remotePort,
                     address: socket.remoteAddress
                 };
-                this.emit('request', request, message => {
-                    return this.send(socket, message);
-                });
+                this.emit('request', request, message => this.send(socket, message));
             };
 
             socket.on('readable', () => {

package/lib/health-worker.js

@@ -10,8 +10,8 @@ const tls = require('tls');
 const http = require('http');
 const https = require('https');
 
-const tcpHealthCheck = async url => {
-    return new Promise((resolve, reject) => {
+const tcpHealthCheck = async url =>
+    new Promise((resolve, reject) => {
         let connectTimeout;
 
         let conn;
@@ -57,10 +57,9 @@ const tcpHealthCheck = async url => {
         client.on('timeout', onTimeout);
         client.setTimeout(config.health.ttl);
     });
-};
 
-const httpHealthCheck = async url => {
-    return new Promise((resolve, reject) => {
+const httpHealthCheck = async url =>
+    new Promise((resolve, reject) => {
         let connectTimeout;
 
         let conn;
@@ -111,7 +110,6 @@ const httpHealthCheck = async url => {
         client.on('timeout', onTimeout);
         client.setTimeout(config.health.ttl);
     });
-};
 
 const healthCheck = async target => {
     try {

package/lib/public-server.js

@@ -17,7 +17,7 @@ const httpProxy = require('http-proxy');
 
 const proxyServer = httpProxy.createProxyServer({});
 
-proxyServer.on('proxyReq', function (proxyReq, req /*, res, options*/) {
+proxyServer.on('proxyReq', (proxyReq, req /*, res, options*/) => {
     proxyReq.setHeader('X-Forwarded-Proto', req.proto);
     proxyReq.setHeader('X-Connecting-IP', req.ip);
     proxyReq.setHeader('X-CDN-Loop', 'PendingDNS');
@@ -181,11 +181,7 @@ const handler = async (req, res) => {
     const url = new URL(req.url, `${req.proto}://${domain}/`);
     const route = url.pathname;
 
-    const target =
-        records &&
-        records.find(rr => {
-            return rr && rr.type === 'URL' && rr.value && rr.value.length;
-        });
+    const target = records && records.find(rr => rr && rr.type === 'URL' && rr.value && rr.value.length);
 
     if (target) {
         // redirect to target URL
@@ -238,8 +234,8 @@ const handler = async (req, res) => {
     );
 };
 
-const setupHttps = () => {
-    return new Promise((resolve, reject) => {
+const setupHttps = () =>
+    new Promise((resolve, reject) => {
         const server = https.createServer(
             {
                 key: defaultKey,
@@ -249,9 +245,7 @@ const setupHttps = () => {
                 allowHTTP1: true,
                 SNICallback(servername, cb) {
                     getSNIContext(servername)
-                        .then(ctx => {
-                            return cb(null, ctx || defaultCtx);
-                        })
+                        .then(ctx => cb(null, ctx || defaultCtx))
                         .catch(err => {
                             logger.error({ msg: 'SNI failed', servername, err });
                             return cb(null, defaultCtx);
@@ -325,10 +319,9 @@ const setupHttps = () => {
             reject(err);
         });
     });
-};
 
-const setupHttp = () => {
-    return new Promise((resolve, reject) => {
+const setupHttp = () =>
+    new Promise((resolve, reject) => {
         const server = http.createServer((req, res) => {
             req.proto = 'http';
             middleware(req, res);
@@ -362,7 +355,6 @@ const setupHttp = () => {
             reject(err);
         });
     });
-};
 
 const init = async () => {
     await Promise.all([setupHttps(), setupHttp()]);

package/lib/tools.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const cachedResolver = require('./cached-resolver');
-const punycode = require('punycode');
+const punycode = require('punycode/');
 const Joi = require('@hapi/joi');
 
 const emailSchema = Joi.string().email({}).required();

package/lib/zone-store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const punycode = require('punycode');
+const punycode = require('punycode/');
 const shortid = require('shortid');
 const db = require('./db');
 const logger = require('./logger').child({ component: 'zone-store' });
@@ -196,6 +196,7 @@ class ZoneStore {
             if (short) {
                 return {
                     id: this.getFullId(name, type, hid),
+                    zone: zoneDomain,
                     domain,
                     type,
                     value: JSON.parse(value)
@@ -225,9 +226,7 @@ class ZoneStore {
 
         return Object.keys(record)
             .map(key => [key, record[key]])
-            .sort((a, b) => {
-                return a[1].localeCompare(b[1]);
-            })
+            .sort((a, b) => a[1].localeCompare(b[1]))
             .map(entry => {
                 let hid = entry[0];
                 let value = entry[1];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pending-dns",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "description": "Lightweight API driven DNS server",
     "main": "index.js",
     "scripts": {
@@ -25,34 +25,36 @@
     },
     "homepage": "https://github.com/postalsys/pending-dns#readme",
     "devDependencies": {
-        "eslint": "7.1.0",
+        "eslint": "8.18.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "6.11.0",
-        "grunt": "1.1.0",
-        "grunt-cli": "1.3.2",
-        "grunt-eslint": "23.0.0",
+        "eslint-config-prettier": "8.5.0",
+        "grunt": "1.5.3",
+        "grunt-cli": "1.4.3",
+        "grunt-eslint": "24.0.0",
         "npm-license-crawler": "0.2.1"
     },
     "dependencies": {
         "@fidm/x509": "1.2.1",
-        "@hapi/boom": "9.1.0",
-        "@hapi/hapi": "19.1.1",
-        "@hapi/inert": "6.0.1",
+        "@hapi/boom": "10.0.0",
+        "@hapi/hapi": "20.2.2",
+        "@hapi/inert": "6.0.5",
         "@hapi/joi": "17.1.1",
-        "@hapi/vision": "6.0.0",
-        "@root/acme": "3.0.10",
+        "@hapi/vision": "6.1.0",
+        "@root/acme": "3.1.0",
         "@root/csr": "0.8.1",
-        "dns2": "1.3.2",
-        "hapi-pino": "8.0.1",
-        "hapi-swagger": "13.0.2",
+        "dns2": "2.0.2",
+        "hapi-pino": "10.1.0",
+        "hapi-swagger": "14.5.5",
         "http-proxy": "1.18.1",
-        "ioredfour": "1.0.2-ioredis-03",
-        "ioredis": "4.17.3",
-        "ipaddr.js": "1.9.1",
-        "node-rsa": "1.0.8",
+        "ioredfour": "1.2.0-ioredis-06",
+        "ioredis": "5.0.6",
+        "ipaddr.js": "2.0.1",
+        "node-rsa": "1.1.1",
         "pem-jwk": "2.0.0",
-        "pino": "6.3.2",
-        "shortid": "2.2.15",
-        "wild-config": "1.5.1"
+        "pino": "8.1.0",
+        "punycode": "^2.1.1",
+        "shortid": "2.2.16",
+        "uuid": "^8.3.2",
+        "wild-config": "1.6.1"
     }
 }