From d2ed111f16b86d0af522a24ce70585f7c150835e Mon Sep 17 00:00:00 2001
From: XadillaX <admin@xcoder.in>
Date: Fri, 4 Aug 2017 11:36:05 +0800
Subject: [PATCH 1/2] dns: add setDefaultResolver and getDefaultResolver

Since `dns.Resolver` was added, it gives a chance to manage the default
resolver by ourselves. So `dns.setDefaultResolver` and
`dns.getDefaultResolver` is added here.
---
 doc/api/dns.md                                | 26 ++++++++
 lib/dns.js                                    | 53 +++++++++++-----
 lib/internal/errors.js                        |  1 +
 .../parallel/test-dns-set-default-resolver.js | 60 +++++++++++++++++++
 4 files changed, 124 insertions(+), 16 deletions(-)
 create mode 100644 test/parallel/test-dns-set-default-resolver.js

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 5be30f22284b9c..ed8511b9f16382 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -103,6 +103,32 @@ added: REPLACEME
 Cancel all outstanding DNS queries made by this resolver. The corresponding
 callbacks will be called with an error with code `ECANCELLED`.
 
+## dns.getDefaultResolver()
+<!-- YAML
+added: REPLACEME
+-->
+
+Get the default resolver which may used by Node.js modules such as `http` and
+provides functions like `dns.resolve()`, `dns.setServers()`, etc.
+
+## dns.setDefaultResolver()
+<!-- YAML
+added: REPLACEME
+-->
+
+Set the default resolver which may used by Node.js modules such as `http` and
+provides functions like `dns.resolve()`, `dns.setServers()`, etc.
+
+The only parameter must be a `dns.Resolver` instance that to replace the default
+one.
+
+For example:
+
+```js
+const resolver = new dns.Resolver();
+dns.setDefaultResolver(resolver);
+```
+
 ## dns.getServers()
 <!-- YAML
 added: v0.11.3
diff --git a/lib/dns.js b/lib/dns.js
index 036197c28dbff5..91c9fdd42f4ec9 100644
--- a/lib/dns.js
+++ b/lib/dns.js
@@ -75,6 +75,23 @@ const digits = [
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 96-111
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0  // 112-127
 ];
+const DEFAULT_RESOLVER_EXPORTED_FUNCTIONS = [
+  'getServers',
+  'setServers',
+  'resolve',
+  'resolveAny',
+  'resolve4',
+  'resolve6',
+  'resolveCname',
+  'resolveMx',
+  'resolveNs',
+  'resolveTxt',
+  'resolveSrv',
+  'resolvePtr',
+  'resolveNaptr',
+  'resolveSoa',
+  'reverse'
+];
 function isIPv4(str) {
   if (!digits[str.charCodeAt(0)]) return false;
   if (str.length === 1) return false;
@@ -377,28 +394,30 @@ function setServers(servers) {
   }
 }
 
-const defaultResolver = new Resolver();
+let defaultResolver;
+
+function getDefaultResolver() {
+  return defaultResolver;
+}
+
+function setDefaultResolver(resolver) {
+  if (!(resolver instanceof Resolver)) {
+    throw new errors.TypeError('ERR_INVALID_DNS_RESOLVER');
+  }
+
+  defaultResolver = resolver;
+  DEFAULT_RESOLVER_EXPORTED_FUNCTIONS.forEach((key) => {
+    module.exports[key] = defaultResolver[key].bind(defaultResolver);
+  });
+}
 
 module.exports = {
   lookup,
   lookupService,
 
   Resolver,
-  getServers: defaultResolver.getServers.bind(defaultResolver),
-  setServers: defaultResolver.setServers.bind(defaultResolver),
-  resolve: defaultResolver.resolve.bind(defaultResolver),
-  resolveAny: defaultResolver.resolveAny.bind(defaultResolver),
-  resolve4: defaultResolver.resolve4.bind(defaultResolver),
-  resolve6: defaultResolver.resolve6.bind(defaultResolver),
-  resolveCname: defaultResolver.resolveCname.bind(defaultResolver),
-  resolveMx: defaultResolver.resolveMx.bind(defaultResolver),
-  resolveNs: defaultResolver.resolveNs.bind(defaultResolver),
-  resolveTxt: defaultResolver.resolveTxt.bind(defaultResolver),
-  resolveSrv: defaultResolver.resolveSrv.bind(defaultResolver),
-  resolvePtr: defaultResolver.resolvePtr.bind(defaultResolver),
-  resolveNaptr: defaultResolver.resolveNaptr.bind(defaultResolver),
-  resolveSoa: defaultResolver.resolveSoa.bind(defaultResolver),
-  reverse: defaultResolver.reverse.bind(defaultResolver),
+  setDefaultResolver,
+  getDefaultResolver,
 
   // uv_getaddrinfo flags
   ADDRCONFIG: cares.AI_ADDRCONFIG,
@@ -430,3 +449,5 @@ module.exports = {
   ADDRGETNETWORKPARAMS: 'EADDRGETNETWORKPARAMS',
   CANCELLED: 'ECANCELLED'
 };
+
+setDefaultResolver(new Resolver());
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index 9989528f76ea01..2e5a55eb6267f3 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -130,6 +130,7 @@ E('ERR_INVALID_CALLBACK', 'Callback must be a function');
 E('ERR_INVALID_CHAR', 'Invalid character in %s');
 E('ERR_INVALID_CURSOR_POS',
   'Cannot set cursor row without setting its column');
+E('ERR_INVALID_DNS_RESOLVER', 'Not a DNS resolver instance');
 E('ERR_INVALID_DOMAIN_NAME', 'Unable to determine the domain name');
 E('ERR_INVALID_FD', '"fd" must be a positive integer: %s');
 E('ERR_INVALID_FILE_URL_HOST',
diff --git a/test/parallel/test-dns-set-default-resolver.js b/test/parallel/test-dns-set-default-resolver.js
new file mode 100644
index 00000000000000..3f062e5a805f8e
--- /dev/null
+++ b/test/parallel/test-dns-set-default-resolver.js
@@ -0,0 +1,60 @@
+'use strict';
+
+const common = require('../common');
+const dnstools = require('../common/dns');
+const dns = require('dns');
+const assert = require('assert');
+const dgram = require('dgram');
+
+const answers = [
+  { type: 'A', address: '1.2.3.4', ttl: 123 },
+  { type: 'AAAA', address: '::42', ttl: 123 },
+  { type: 'MX', priority: 42, exchange: 'foobar.com', ttl: 124 },
+  { type: 'NS', value: 'foobar.org', ttl: 457 },
+  { type: 'TXT', entries: [ 'v=spf1 ~all', 'xyz' ] },
+  { type: 'PTR', value: 'baz.org', ttl: 987 },
+  {
+    type: 'SOA',
+    nsname: 'ns1.example.com',
+    hostmaster: 'admin.example.com',
+    serial: 156696742,
+    refresh: 900,
+    retry: 900,
+    expire: 1800,
+    minttl: 60
+  },
+];
+
+const server = dgram.createSocket('udp4');
+
+server.on('message', common.mustCall((msg, { address, port }) => {
+  const parsed = dnstools.parseDNSPacket(msg);
+  const domain = parsed.questions[0].domain;
+  assert.strictEqual(domain, 'example.org');
+
+  server.send(dnstools.writeDNSPacket({
+    id: parsed.id,
+    questions: parsed.questions,
+    answers: answers.map((answer) => Object.assign({ domain }, answer)),
+  }), port, address);
+}));
+
+server.bind(0, common.mustCall(() => {
+  const address = server.address();
+  dns.setServers([`127.0.0.1:${address.port + 1}`]);
+  const resolver = new dns.Resolver();
+  resolver.setServers([`127.0.0.1:${address.port}`]);
+  dns.setDefaultResolver(resolver);
+
+  dns.resolveAny('example.org', common.mustCall((err, res) => {
+    assert.ifError(err);
+
+    // Compare copies with ttl removed, c-ares fiddles with that value.
+    assert.deepStrictEqual(
+      res.map((r) => Object.assign({}, r, { ttl: null })),
+      answers.map((r) => Object.assign({}, r, { ttl: null })));
+    server.close();
+
+    assert.strictEqual(dns.getDefaultResolver(), resolver);
+  }));
+}));

From b57d85ce2e685fa769c6cddc8b05ea9d9b676d9d Mon Sep 17 00:00:00 2001
From: XadillaX <admin@xcoder.in>
Date: Fri, 4 Aug 2017 11:41:59 +0800
Subject: [PATCH 2/2] add test case of error

---
 test/parallel/test-dns-set-default-resolver.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/parallel/test-dns-set-default-resolver.js b/test/parallel/test-dns-set-default-resolver.js
index 3f062e5a805f8e..9445faf9a3c13d 100644
--- a/test/parallel/test-dns-set-default-resolver.js
+++ b/test/parallel/test-dns-set-default-resolver.js
@@ -56,5 +56,13 @@ server.bind(0, common.mustCall(() => {
     server.close();
 
     assert.strictEqual(dns.getDefaultResolver(), resolver);
+
+    common.expectsError(function() {
+      dns.setDefaultResolver(123);
+    }, {
+      code: 'ERR_INVALID_DNS_RESOLVER',
+      type: TypeError,
+      message: /^Not a DNS resolver instance$/
+    })
   }));
 }));