Skip to content

dns: idna encode hostnames before resolution#25559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
santigimeno wants to merge 4 commits into from
Closed

dns: idna encode hostnames before resolution #25559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
973bab3
dns: idna encode hostnames before resolution
santigimeno Jan 18, 2019
37505d9
fixup
santigimeno Jan 18, 2019
7f05c44
be lenient on exceptions if using punycode toASCII
santigimeno Jan 18, 2019
79a2772
fix linting
santigimeno Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/dns.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
'use strict';

const cares = internalBinding('cares_wrap');
const { toASCII } = internalBinding('config').hasIntl ?
internalBinding('icu') : require('punycode');

@saghulsaghulJan 18, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the policy here, considering punycode is deprecated?

@santigimenosantigimenoJan 18, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know 🤷‍♂️

@cjihrigcjihrigJan 18, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, we do the same thing in lib/url.js, so it's probably fine.

@jasnelljasnellJan 18, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using punycode is the fallback if Node.js is compiled without ICU.

@silverwindsilverwindJan 18, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's only deprecated for userland.

const { isIP, isIPv4, isLegalPort } = require('internal/net');
const { customPromisifyArgs } = require('internal/util');
const errors = require('internal/errors');
Expand DownExpand Up@@ -213,6 +215,11 @@ function resolver(bindingName) {
throw new ERR_INVALID_CALLBACK();
}

try {

@saghulsaghulJan 18, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this be needed if we were only using the ICU based toASCII?

@santigimenosantigimenoJan 18, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My guess is no

name = toASCII(name, true);
} catch {
// If using the punycode implementation, be lenient too
}
var req = new QueryReqWrap();
req.bindingName = bindingName;
req.callback = callback;
Expand Down
7 changes: 7 additions & 0 deletions lib/internal/dns/promises.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {
Expand DownExpand Up@@ -183,6 +185,11 @@ function createResolverPromise(resolver, bindingName, hostname, ttl) {
req.reject = reject;
req.ttl = ttl;

try {
hostname = toASCII(hostname, true);
} catch {
// If using the punycode implementation, be lenient too
}
const err = resolver._handle[bindingName](req, hostname);

if (err)
Expand Down
3 changes: 2 additions & 1 deletion test/common/internet.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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'

@silverwindsilverwindJan 18, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

domaintest.みんな might be a better testing domain name, info here.

@saghulsaghulJan 22, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 also, I'd say a comment is missing.

};

for (const key of Object.keys(addresses)) {
Expand Down
17 changes: 17 additions & 0 deletions test/internet/test-dns.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,23 @@ 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.resolve4(addresses.IDNA_HOST));

const req = dns.resolve4(addresses.IDNA_HOST, function(err, result) {
assert.ifError(err);
validateResult(result);
done();
});

assert.strictEqual(req.hostname, 'xn--espaa-rta.icom.museum');
checkWrap(req);
});

TEST(async function test_resolveSrv(done) {
function validateResult(result) {
assert.ok(result.length > 0);
Expand Down