From c31b507b947d5b4803dd96a7c9a09fd2112085ab Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 26 Oct 2016 07:51:34 +0200
Subject: [PATCH 1/2] dns: implement {ttl: true} for dns.resolve4()

Add an option to retrieve the Time-To-Live of the A record.

PR-URL: https://github.com/nodejs/node/pull/9296
Refs: https://github.com/nodejs/node/issues/5893
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 doc/api/dns.md            |  9 ++++++++-
 lib/dns.js                | 14 ++++++++++++--
 src/cares_wrap.cc         | 33 +++++++++++++++++----------------
 test/internet/test-dns.js | 20 ++++++++++++++++++++
 4 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index e930892cedc927..2dd6fa60bc0a2a 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -183,7 +183,7 @@ corresponding lookup methods.
 On error, `err` is an [`Error`][] object, where `err.code` is
 one of the error codes listed [here](#dns_error_codes).
 
-## dns.resolve4(hostname, callback)
+## dns.resolve4(hostname[, options], callback)
 <!-- YAML
 added: v0.1.16
 -->
@@ -193,6 +193,13 @@ Uses the DNS protocol to resolve a IPv4 addresses (`A` records) for the
 will contain an array of IPv4 addresses (e.g.
 `['74.125.79.104', '74.125.79.105', '74.125.79.106']`).
 
+* `hostname` {String} Hostname to resolve.
+* `options` {Object}
+  * `ttl` {Boolean} Retrieve the Time-To-Live value (TTL) of each record.
+    The callback receives an array of `{ address: '1.2.3.4', ttl: 60 }` objects
+    rather than an array of strings.  The TTL is expressed in seconds.
+* `callback` {Function} An `(err, result)` callback function.
+
 ## dns.resolve6(hostname, callback)
 <!-- YAML
 added: v0.1.16
diff --git a/lib/dns.js b/lib/dns.js
index 4767acbab6041f..cbb994b8f271de 100644
--- a/lib/dns.js
+++ b/lib/dns.js
@@ -211,7 +211,10 @@ exports.lookupService = function lookupService(host, port, callback) {
 };
 
 
-function onresolve(err, result) {
+function onresolve(err, result, ttls) {
+  if (ttls && this.ttl)
+    result = result.map((address, index) => ({ address, ttl: ttls[index] }));
+
   if (err)
     this.callback(errnoException(err, this.bindingName, this.hostname));
   else
@@ -222,7 +225,13 @@ function onresolve(err, result) {
 function resolver(bindingName) {
   var binding = cares[bindingName];
 
-  return function query(name, callback) {
+  return function query(name, /* options, */ callback) {
+    var options;
+    if (arguments.length > 2) {
+      options = callback;
+      callback = arguments[2];
+    }
+
     if (typeof name !== 'string') {
       throw new Error('"name" argument must be a string');
     } else if (typeof callback !== 'function') {
@@ -235,6 +244,7 @@ function resolver(bindingName) {
     req.callback = callback;
     req.hostname = name;
     req.oncomplete = onresolve;
+    req.ttl = !!(options && options.ttl);
     var err = binding(req, name);
     if (err) throw errnoException(err, bindingName);
     callback.immediately = true;
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index 492e151832ea32..4b9ba26fe4caed 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -336,25 +336,17 @@ class QueryWrap : public AsyncWrap {
     delete wrap;
   }
 
-  void CallOnComplete(Local<Value> answer) {
-    HandleScope handle_scope(env()->isolate());
-    Context::Scope context_scope(env()->context());
-    Local<Value> argv[] = {
-      Integer::New(env()->isolate(), 0),
-      answer
-    };
-    MakeCallback(env()->oncomplete_string(), arraysize(argv), argv);
-  }
-
-  void CallOnComplete(Local<Value> answer, Local<Value> family) {
+  void CallOnComplete(Local<Value> answer,
+                      Local<Value> extra = Local<Value>()) {
     HandleScope handle_scope(env()->isolate());
     Context::Scope context_scope(env()->context());
     Local<Value> argv[] = {
       Integer::New(env()->isolate(), 0),
       answer,
-      family
+      extra
     };
-    MakeCallback(env()->oncomplete_string(), arraysize(argv), argv);
+    const int argc = arraysize(argv) - extra.IsEmpty();
+    MakeCallback(env()->oncomplete_string(), argc, argv);
   }
 
   void ParseError(int status) {
@@ -400,18 +392,27 @@ class QueryAWrap: public QueryWrap {
     HandleScope handle_scope(env()->isolate());
     Context::Scope context_scope(env()->context());
 
-    struct hostent* host;
+    hostent* host;
+    ares_addrttl addrttls[256];
+    int naddrttls = arraysize(addrttls);
 
-    int status = ares_parse_a_reply(buf, len, &host, nullptr, nullptr);
+    int status = ares_parse_a_reply(buf, len, &host, addrttls, &naddrttls);
     if (status != ARES_SUCCESS) {
       ParseError(status);
       return;
     }
 
     Local<Array> addresses = HostentToAddresses(env(), host);
+    Local<Array> ttls = Array::New(env()->isolate(), naddrttls);
+
+    auto context = env()->context();
+    for (int i = 0; i < naddrttls; i += 1) {
+      auto value = Integer::New(env()->isolate(), addrttls[i].ttl);
+      ttls->Set(context, i, value).FromJust();
+    }
     ares_free_hostent(host);
 
-    this->CallOnComplete(addresses);
+    CallOnComplete(addresses, ttls);
   }
 };
 
diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js
index 893992e66096db..096ed87e7933f4 100644
--- a/test/internet/test-dns.js
+++ b/test/internet/test-dns.js
@@ -60,6 +60,26 @@ TEST(function test_reverse_bogus(done) {
   done();
 });
 
+TEST(function test_resolve4_ttl(done) {
+  var req = dns.resolve4('google.com', { ttl: true }, function(err, result) {
+    assert.ifError(err);
+    assert.ok(result.length > 0);
+
+    for (var i = 0; i < result.length; i++) {
+      var item = result[i];
+      assert.ok(item);
+      assert.strictEqual(typeof item, 'object');
+      assert.strictEqual(typeof item.ttl, 'number');
+      assert.strictEqual(typeof item.address, 'string');
+      assert.ok(item.ttl > 0);
+      assert.ok(isIPv4(item.address));
+    }
+
+    done();
+  });
+
+  checkWrap(req);
+});
 
 TEST(function test_resolveMx(done) {
   var req = dns.resolveMx('gmail.com', function(err, result) {

From 6b1a8d03c7a8aabb20568af2e5d07c18c92a4c0c Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 26 Oct 2016 07:54:20 +0200
Subject: [PATCH 2/2] dns: implement {ttl: true} for dns.resolve6()

Add an option to retrieve the Time-To-Live of the AAAA record.

PR-URL: https://github.com/nodejs/node/pull/9296
Refs: https://github.com/nodejs/node/issues/5893
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 doc/api/dns.md            |  9 ++++++++-
 src/cares_wrap.cc         | 15 ++++++++++++---
 test/internet/test-dns.js | 21 +++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 2dd6fa60bc0a2a..53af8491a7ef22 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -200,7 +200,7 @@ will contain an array of IPv4 addresses (e.g.
     rather than an array of strings.  The TTL is expressed in seconds.
 * `callback` {Function} An `(err, result)` callback function.
 
-## dns.resolve6(hostname, callback)
+## dns.resolve6(hostname[, options], callback)
 <!-- YAML
 added: v0.1.16
 -->
@@ -209,6 +209,13 @@ Uses the DNS protocol to resolve a IPv6 addresses (`AAAA` records) for the
 `hostname`. The `addresses` argument passed to the `callback` function
 will contain an array of IPv6 addresses.
 
+* `hostname` {String} Hostname to resolve.
+* `options` {Object}
+  * `ttl` {Boolean} Retrieve the Time-To-Live value (TTL) of each record.
+    The callback receives an array of `{ address: '0:1:2:3:4:5:6:7', ttl: 60 }`
+    objects rather than an array of strings.  The TTL is expressed in seconds.
+* `callback` {Function} An `(err, result)` callback function.
+
 ## dns.resolveCname(hostname, callback)
 <!-- YAML
 added: v0.3.2
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index 4b9ba26fe4caed..2b61209f6e643a 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -440,18 +440,27 @@ class QueryAaaaWrap: public QueryWrap {
     HandleScope handle_scope(env()->isolate());
     Context::Scope context_scope(env()->context());
 
-    struct hostent* host;
+    hostent* host;
+    ares_addr6ttl addrttls[256];
+    int naddrttls = arraysize(addrttls);
 
-    int status = ares_parse_aaaa_reply(buf, len, &host, nullptr, nullptr);
+    int status = ares_parse_aaaa_reply(buf, len, &host, addrttls, &naddrttls);
     if (status != ARES_SUCCESS) {
       ParseError(status);
       return;
     }
 
     Local<Array> addresses = HostentToAddresses(env(), host);
+    Local<Array> ttls = Array::New(env()->isolate(), naddrttls);
+
+    auto context = env()->context();
+    for (int i = 0; i < naddrttls; i += 1) {
+      auto value = Integer::New(env()->isolate(), addrttls[i].ttl);
+      ttls->Set(context, i, value).FromJust();
+    }
     ares_free_hostent(host);
 
-    this->CallOnComplete(addresses);
+    CallOnComplete(addresses, ttls);
   }
 };
 
diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js
index 096ed87e7933f4..db3449dc727516 100644
--- a/test/internet/test-dns.js
+++ b/test/internet/test-dns.js
@@ -81,6 +81,27 @@ TEST(function test_resolve4_ttl(done) {
   checkWrap(req);
 });
 
+TEST(function test_resolve6_ttl(done) {
+  var req = dns.resolve6('google.com', { ttl: true }, function(err, result) {
+    assert.ifError(err);
+    assert.ok(result.length > 0);
+
+    for (var i = 0; i < result.length; i++) {
+      var item = result[i];
+      assert.ok(item);
+      assert.strictEqual(typeof item, 'object');
+      assert.strictEqual(typeof item.ttl, 'number');
+      assert.strictEqual(typeof item.address, 'string');
+      assert.ok(item.ttl > 0);
+      assert.ok(isIPv6(item.address));
+    }
+
+    done();
+  });
+
+  checkWrap(req);
+});
+
 TEST(function test_resolveMx(done) {
   var req = dns.resolveMx('gmail.com', function(err, result) {
     if (err) throw err;