Skip to content

fix(node:dns): fix crash and compatibility issues with resolve #5200

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

Merged
merged 1 commit into from
Sep 14, 2023
Merged

fix(node:dns): fix crash and compatibility issues with resolve #5200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions src/bun.js/api/bun/dns_resolver.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1977,11 +1977,6 @@ pub const DNSResolver = struct {
return .zero;
};

if (name_str.length() == 0) {
globalThis.throwInvalidArgumentType("resolveSoa", "hostname", "non-empty string");
return .zero;
}

const name = name_str.toSliceClone(globalThis, bun.default_allocator);

var vm = globalThis.bunVM();
Expand Down Expand Up @@ -2039,11 +2034,6 @@ pub const DNSResolver = struct {
return .zero;
};

if (name_str.length() == 0) {
globalThis.throwInvalidArgumentType("resolveNs", "hostname", "non-empty string");
return .zero;
}

const name = name_str.toSliceClone(globalThis, bun.default_allocator);

var vm = globalThis.bunVM();
Expand Down
9 changes: 5 additions & 4 deletions src/deps/c_ares.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,11 +524,12 @@ pub const Channel = opaque {
}

pub fn resolve(this: *Channel, name: []const u8, comptime lookup_name: []const u8, comptime Type: type, ctx: *Type, comptime cares_type: type, comptime callback: cares_type.Callback(Type)) void {
if (name.len >= 1023 or (name.len == 0 and !(bun.strings.eqlComptime(lookup_name, "ns") or bun.strings.eqlComptime(lookup_name, "soa")))) {
return cares_type.callbackWrapper(lookup_name, Type, callback).?(ctx, ARES_EBADNAME, 0, null, 0);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ARES_EBADNAME The query name name could not be encoded as a domain name, either because it contained a zero-length label or because it contained a label of more than 63 characters.

Ref: https://c-ares.org/ares_query.html

}

var name_buf: [1024]u8 = undefined;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

maybe a smaller size here

const name_ptr: ?[*:0]const u8 = brk: {
if (name.len == 0 or name.len >= 1023) {
break :brk null;
}
const name_ptr: [*:0]const u8 = brk: {
const len = @min(name.len, name_buf.len - 1);
@memcpy(name_buf[0..len], name[0..len]);

Expand Down
62 changes: 61 additions & 1 deletion test/js/node/dns/node-dns.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { expect, test } from "bun:test";
import { describe, expect, test, it } from "bun:test";
import * as dns from "node:dns";
import * as dns_promises from "node:dns/promises";
import * as fs from "node:fs";
Expand Down Expand Up @@ -102,6 +102,15 @@ test("dns.resolveSoa (bun.sh)", done => {
});
});

test("dns.resolveSoa (empty string)", done => {
dns.resolveSoa("", (err, result) => {
expect(err).toBeNull();
// one of root server
expect(result).not.toBeUndefined();
done(err);
});
});

test("dns.resolveNaptr (naptr.socketify.dev)", done => {
dns.resolveNaptr("naptr.socketify.dev", (err, results) => {
expect(err).toBeNull();
Expand Down Expand Up @@ -146,6 +155,32 @@ test("dns.resolveNs (bun.sh) ", done => {
});
});

test("dns.resolveNs (empty string) ", done => {
dns.resolveNs("", (err, results) => {
expect(err).toBeNull();
expect(results instanceof Array).toBe(true);
// root servers
expect(results.sort()).toStrictEqual(
[
"e.root-servers.net",
"h.root-servers.net",
"l.root-servers.net",
"i.root-servers.net",
"a.root-servers.net",
"d.root-servers.net",
"c.root-servers.net",
"b.root-servers.net",
"j.root-servers.net",
"k.root-servers.net",
"g.root-servers.net",
"m.root-servers.net",
"f.root-servers.net",
].sort(),
);
done(err);
});
});

test("dns.resolvePtr (ptr.socketify.dev)", done => {
dns.resolvePtr("ptr.socketify.dev", (err, results) => {
expect(err).toBeNull();
Expand Down Expand Up @@ -268,3 +303,28 @@ test("dns.promises.reverse", async () => {
expect(hostnames).toContain("one.one.one.one");
}
});

describe("test invalid arguments", () => {
it.each([
// TODO: dns.resolveAny is not implemented yet
["dns.resolveCname", dns.resolveCname],
["dns.resolveCaa", dns.resolveCaa],
["dns.resolveMx", dns.resolveMx],
["dns.resolveNaptr", dns.resolveNaptr],
["dns.resolveNs", dns.resolveNs],
["dns.resolvePtr", dns.resolvePtr],
["dns.resolveSoa", dns.resolveSoa],
["dns.resolveSrv", dns.resolveSrv],
["dns.resolveTxt", dns.resolveTxt],
])("%s", (_, fn, done) => {
fn("a".repeat(2000), (err, results) => {
try {
expect(err).not.toBeNull();
expect(results).toBeUndefined();
done();
} catch (e) {
done(e);
}
});
});
});