Skip to content

node:dns: validate rrtype in resolve() like Node #39556

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

Open
robobun wants to merge 13 commits into
base: main
Choose a base branch
from
Open

node:dns: validate rrtype in resolve() like Node #39556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b4cce68
node:dns: reject lowercase rrtype values in resolve()
robobun Aug 18, 2026
ac546f4
node:dns: accept TLSA as a valid rrtype
robobun Aug 18, 2026
e37b6ed
node:dns: test that an unknown rrtype name gets the Node error message
robobun Aug 19, 2026
4a43c26
node:dns: test that inherited property names are invalid rrtypes
robobun Aug 19, 2026
034d199
node:dns: dispatch resolve() through the resolve* methods, like Node
robobun Aug 20, 2026
f017aba
node:dns: tighten the resolve map comments
robobun Aug 20, 2026
4ffa6e7
node:dns: keep uncancellable resolvers out of the positive rrtype tests
robobun Aug 20, 2026
a003d11
Merge branch 'main' into farm/12420a6f/dns-rrtype-case
cirospaciari Sep 3, 2026
e296c5b
node:dns: pick the resolve* method with a switch instead of module-le…
robobun Sep 3, 2026
6243f24
node:dns: dispatch resolve() with a switch that calls each resolve* m…
robobun Sep 3, 2026
9b35cf7
node:dns: shorten the resolve() dispatch comment
robobun Sep 3, 2026
893c22d
node:dns: update the inherited-name test comment for the switch dispatch
robobun Sep 3, 2026
b9eb935
ci: retrigger
robobun Sep 3, 2026
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
159 changes: 110 additions & 49 deletions src/js/node/dns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,26 +410,35 @@ var InternalResolver = class Resolver {
throw $ERR_INVALID_ARG_TYPE("rrtype", "string", rrtype);
}

callback = validateResolve(hostname, callback);

Resolver.#getResolver(this)
.resolve(hostname, rrtype)
.then(
results => {
switch (rrtype?.toLowerCase()) {
case "a":

@cirospaciari cirospaciari Sep 3, 2026

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.

@robobun how we are compensating for this 3 output differences?

@robobun robobun Sep 3, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Each case lands on the same output the removed block produced:

  • A and AAAA: resolve4(hostname, callback) and resolve6(hostname, callback) call the native resolve(hostname, "A" | "AAAA") and, with no options, return addresses.map(mapResolveX). That is the old results.map(mapResolveX) branch.
  • The other ten types: the native resolve(hostname, rrtype) arm and the native resolveX method both end in do_resolve_cares::<T> with the same T (src/runtime/dns_jsc/dns.rs:5003-5030 and the resolve_record_fn! list at 5305-5360, for example struct_ares_mx_reply for MX, NsHostent for NS). Same c-ares query, same record objects. That is the old pass-through branch.
  • Errors: every resolveX rejects through withTranslatedError, the same handler the old block used, and the callback goes through validateResolve (guardCallback) in each method as before.

The QTYPE dispatch tests in node-dns-rrtype.test.js pin the query each rrtype sends. The one intentional difference: resolve(hostname, "NS" | "SOA") now accepts an empty hostname, because resolveNs("") and resolveSoa("") allow it (allow_empty = true) and Node does too. That is listed in the PR notes.

case "aaaa":
callback(null, results.map(mapResolveX));
break;
default:
callback(null, results);
break;
}
},
error => {
callback(withTranslatedError(error));
},
);
// $call: the module-level function runs with `this` undefined when destructured.
switch (rrtype) {
case "A":
return Resolver.prototype.resolve4.$call(this, hostname, callback);

@cirospaciari cirospaciari Sep 3, 2026

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.

@robobun why you need to use $call here? just do this.resolve4 etc

@robobun robobun Sep 3, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Because of the receiver. resolve is exported straight off InternalResolver.prototype, so import { resolve } from "node:dns" and const { resolve } = require("node:dns") call it with this undefined. this.resolve4 throws a TypeError there. Every other exported method keeps working in that case because #getResolver(this) treats an undefined this as the default resolver. $call(this, ...) forwards whatever receiver we got, so the dispatched method makes the same choice the caller would have made.

If you prefer this.resolve4, the other way is to bind the module-level resolve to a default instance, like Node bindDefaultResolver does. Say the word and I will switch to that.

case "AAAA":
return Resolver.prototype.resolve6.$call(this, hostname, callback);
case "ANY":
return Resolver.prototype.resolveAny.$call(this, hostname, callback);
case "CAA":
return Resolver.prototype.resolveCaa.$call(this, hostname, callback);
case "CNAME":
return Resolver.prototype.resolveCname.$call(this, hostname, callback);
case "MX":
return Resolver.prototype.resolveMx.$call(this, hostname, callback);
case "NAPTR":
return Resolver.prototype.resolveNaptr.$call(this, hostname, callback);
case "NS":
return Resolver.prototype.resolveNs.$call(this, hostname, callback);
case "PTR":
return Resolver.prototype.resolvePtr.$call(this, hostname, callback);
case "SOA":
return Resolver.prototype.resolveSoa.$call(this, hostname, callback);
case "SRV":
return Resolver.prototype.resolveSrv.$call(this, hostname, callback);
case "TXT":
return Resolver.prototype.resolveTxt.$call(this, hostname, callback);
default:
throw $ERR_INVALID_ARG_VALUE("rrtype", rrtype, "is invalid");
}
}

resolve4(hostname, options, callback) {
Expand Down Expand Up @@ -602,10 +611,7 @@ var InternalResolver = class Resolver {
if (arguments.length > 2) {
callback = arguments[2];
}
if (typeof callback !== "function") {
throw $ERR_INVALID_ARG_TYPE("callback", "function", callback);
}
callback = guardCallback(callback);
callback = validateResolve(hostname, callback);

Resolver.#getResolver(this)
.resolveCaa(hostname)
Expand All @@ -623,10 +629,7 @@ var InternalResolver = class Resolver {
if (arguments.length > 2) {
callback = arguments[2];
}
if (typeof callback !== "function") {
throw $ERR_INVALID_ARG_TYPE("callback", "function", callback);
}
callback = guardCallback(callback);
callback = validateResolve(hostname, callback);

Resolver.#getResolver(this)
.resolveTxt(hostname)
Expand All @@ -643,10 +646,7 @@ var InternalResolver = class Resolver {
if (arguments.length > 2) {
callback = arguments[2];
}
if (typeof callback !== "function") {
throw $ERR_INVALID_ARG_TYPE("callback", "function", callback);
}
callback = guardCallback(callback);
callback = validateResolve(hostname, callback);

Resolver.#getResolver(this)
.resolveSoa(hostname)
Expand Down Expand Up @@ -829,61 +829,90 @@ const promises = {
},

resolve(hostname, rrtype) {
if (typeof hostname !== "string") {
throw $ERR_INVALID_ARG_TYPE("hostname", "string", hostname);
}

if (typeof rrtype === "undefined") {
rrtype = "A";
} else if (typeof rrtype !== "string") {
throw $ERR_INVALID_ARG_TYPE("rrtype", "string", rrtype);
}

switch (rrtype?.toLowerCase()) {
case "a":
case "aaaa":
return translateErrorCode(dns.resolve(hostname, rrtype).then(promisifyResolveX(false)));
switch (rrtype) {
case "A":
return promises.resolve4(hostname);
case "AAAA":
return promises.resolve6(hostname);
case "ANY":
return promises.resolveAny(hostname);
case "CAA":
return promises.resolveCaa(hostname);
case "CNAME":
return promises.resolveCname(hostname);
case "MX":
return promises.resolveMx(hostname);
case "NAPTR":
return promises.resolveNaptr(hostname);
case "NS":
return promises.resolveNs(hostname);
case "PTR":
return promises.resolvePtr(hostname);
case "SOA":
return promises.resolveSoa(hostname);
case "SRV":
return promises.resolveSrv(hostname);
case "TXT":
return promises.resolveTxt(hostname);
default:
return translateErrorCode(dns.resolve(hostname, rrtype));
throw $ERR_INVALID_ARG_VALUE("rrtype", rrtype, "is invalid");
}
},

resolve4(hostname, options) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolve(hostname, "A").then(promisifyResolveX(options?.ttl)));
},

resolve6(hostname, options) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolve(hostname, "AAAA").then(promisifyResolveX(options?.ttl)));
},

resolveAny(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveAny(hostname));
},
resolveSrv(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveSrv(hostname));
},
resolveTxt(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveTxt(hostname));
},
resolveSoa(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveSoa(hostname));
},
resolveNaptr(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveNaptr(hostname));
},
resolveMx(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveMx(hostname));
},
resolveCaa(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveCaa(hostname));
},
resolveNs(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveNs(hostname));
},
resolvePtr(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolvePtr(hostname));
},
resolveCname(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(dns.resolveCname(hostname));
},
reverse(ip) {
Expand Down Expand Up @@ -913,68 +942,100 @@ const promises = {
if (typeof rrtype === "undefined") {
rrtype = "A";
} else if (typeof rrtype !== "string") {
rrtype = null;
throw $ERR_INVALID_ARG_TYPE("rrtype", "string", rrtype);
}
switch (rrtype?.toLowerCase()) {
case "a":
case "aaaa":
return translateErrorCode(
Resolver.#getResolver(this).resolve(hostname, rrtype).then(promisifyResolveX(false)),
);

switch (rrtype) {
case "A":
return Resolver.prototype.resolve4.$call(this, hostname);
case "AAAA":
return Resolver.prototype.resolve6.$call(this, hostname);
case "ANY":
return Resolver.prototype.resolveAny.$call(this, hostname);
case "CAA":
return Resolver.prototype.resolveCaa.$call(this, hostname);
case "CNAME":
return Resolver.prototype.resolveCname.$call(this, hostname);
case "MX":
return Resolver.prototype.resolveMx.$call(this, hostname);
case "NAPTR":
return Resolver.prototype.resolveNaptr.$call(this, hostname);
case "NS":
return Resolver.prototype.resolveNs.$call(this, hostname);
case "PTR":
return Resolver.prototype.resolvePtr.$call(this, hostname);
case "SOA":
return Resolver.prototype.resolveSoa.$call(this, hostname);
case "SRV":
return Resolver.prototype.resolveSrv.$call(this, hostname);
case "TXT":
return Resolver.prototype.resolveTxt.$call(this, hostname);
default:
return translateErrorCode(Resolver.#getResolver(this).resolve(hostname, rrtype));
throw $ERR_INVALID_ARG_VALUE("rrtype", rrtype, "is invalid");
}
}

resolve4(hostname, options) {
validateString(hostname, "hostname");
return translateErrorCode(
Resolver.#getResolver(this).resolve(hostname, "A").then(promisifyResolveX(options?.ttl)),
);
}

resolve6(hostname, options) {
validateString(hostname, "hostname");
return translateErrorCode(
Resolver.#getResolver(this).resolve(hostname, "AAAA").then(promisifyResolveX(options?.ttl)),
);
}

resolveAny(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveAny(hostname));
}

resolveCname(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveCname(hostname));
}

resolveMx(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveMx(hostname));
}

resolveNaptr(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveNaptr(hostname));
}

resolveNs(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveNs(hostname));
}

resolvePtr(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolvePtr(hostname));
}

resolveSoa(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveSoa(hostname));
}

resolveSrv(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveSrv(hostname));
}

resolveCaa(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveCaa(hostname));
}

resolveTxt(hostname) {
validateString(hostname, "hostname");
return translateErrorCode(Resolver.#getResolver(this).resolveTxt(hostname));
}

Expand Down
Loading