dns: idna encode hostnames before resolution

Fixes: nodejs/node#25558
abhishekumar-tyagi · Jan 18, 2019 · 973bab3 · 973bab3
1 parent 9a26546
commit 973bab3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/lib/dns.js b/lib/dns.js
@@ -22,6 +22,8 @@
 'use strict';
 
 const cares = internalBinding('cares_wrap');
+const { toASCII } = internalBinding('config').hasIntl ?
+  internalBinding('icu') : require('punycode');
 const { isIP, isIPv4, isLegalPort } = require('internal/net');
 const { customPromisifyArgs } = require('internal/util');
 const errors = require('internal/errors');
@@ -213,6 +215,7 @@ function resolver(bindingName) {
       throw new ERR_INVALID_CALLBACK();
     }
 
+    name = toASCII(name, true);
     var req = new QueryReqWrap();
     req.bindingName = bindingName;
     req.callback = callback;

diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js
@@ -5,6 +5,8 @@ const {
   validateHints,
   emitInvalidHostnameWarning,
 } = require('internal/dns/utils');
+const { toASCII } = internalBinding('config').hasIntl ?
+  internalBinding('icu') : require('punycode');
 const { codes, dnsException } = require('internal/errors');
 const { isIP, isIPv4, isLegalPort } = require('internal/net');
 const {
@@ -183,6 +185,7 @@ function createResolverPromise(resolver, bindingName, hostname, ttl) {
     req.reject = reject;
     req.ttl = ttl;
 
+    hostname = toASCII(hostname, true);
     const err = resolver._handle[bindingName](req, hostname);
 
     if (err)

diff --git a/test/common/internet.js b/test/common/internet.js
@@ -39,7 +39,8 @@ const addresses = {
   // An accessible IPv4 DNS server
   DNS4_SERVER: '8.8.8.8',
   // An accessible IPv4 DNS server
-  DNS6_SERVER: '2001:4860:4860::8888'
+  DNS6_SERVER: '2001:4860:4860::8888',
+  IDNA_HOST: 'españa.icom.museum'
 };
 
 for (const key of Object.keys(addresses)) {

diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js
@@ -213,6 +213,22 @@ TEST(function test_resolveNs_failure(done) {
   checkWrap(req);
 });
 
+TEST(async function test_resolve_idna(done) {
+  function validateResult(result) {
+    assert.ok(result.length > 0);
+  }
+
+  validateResult(await dnsPromises.resolve(addresses.IDNA_HOST));
+
+  const req = dns.resolve4(addresses.IDNA_HOST, function(err, result) {
+    assert.ifError(err);
+    validateResult(result);
+    done();
+  });
+
+  checkWrap(req);
+});
+
 TEST(async function test_resolveSrv(done) {
   function validateResult(result) {
     assert.ok(result.length > 0);