test: fix dns test case failures after c-ares update to 1.21.0+ · nodejs/node@95d7a75 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 756
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 95d7a75

Browse filesBrowse the repository at this point in the historyBrowse files

bradh352

authored and

richardlau

committed

test: fix dns test case failures after c-ares update to 1.21.0+

c-ares has made intentional changes to the behavior of TXT records to comply with RFC 7208, which concatenates multiple strings for the same TXT record into a single string. Multiple TXT records are not concatenated. Also, response handling has changed, such that a response which is completely invalid in formatting is thrown away as a malicious forged/spoofed packet rather than returning EBADRESP. This is one step toward RFC 9018 (EDNS COOKIES) which will require the message to at least be structurally valid to validate against spoofed records. Fix By: Brad House (@bradh352) PR-URL: #50743 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Fixes: #50741 Refs: #50444

1 parent cd613e5 commit 95d7a75
Copy full SHA for 95d7a75

2 files changed

+4-3Lines changed: 4 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• test/parallel
  • test-dns-resolveany-bad-ancount.js
  • test-dns-resolveany.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎test/parallel/test-dns-resolveany-bad-ancount.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-dns-resolveany-bad-ancount.js

+3-2Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -30,13 +30,14 @@ server.bind(0, common.mustCall(async () => {
30	30	dnsPromises.resolveAny('example.org')
31	31	.then(common.mustNotCall())
32	32	.catch(common.expectsError({
33		- code: 'EBADRESP',
	33	+ // May return EBADRESP or ETIMEOUT
	34	+ code: /^(?:EBADRESP|ETIMEOUT)$/,
34	35	syscall: 'queryAny',
35	36	hostname: 'example.org'
36	37	}));
37	38
38	39	dns.resolveAny('example.org', common.mustCall((err) => {
39		- assert.strictEqual(err.code, 'EBADRESP');
	40	+ assert.notStrictEqual(err.code, 'SUCCESS');
40	41	assert.strictEqual(err.syscall, 'queryAny');
41	42	assert.strictEqual(err.hostname, 'example.org');
42	43	const descriptor = Object.getOwnPropertyDescriptor(err, 'message');

Collapse file

‎test/parallel/test-dns-resolveany.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-dns-resolveany.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@ const answers = [
11	11	{ type: 'AAAA', address: '::42', ttl: 123 },
12	12	{ type: 'MX', priority: 42, exchange: 'foobar.com', ttl: 124 },
13	13	{ type: 'NS', value: 'foobar.org', ttl: 457 },
14		- { type: 'TXT', entries: [ 'v=spf1 ~all', 'xyz\0foo' ] },
	14	+ { type: 'TXT', entries: [ 'v=spf1 ~all xyz\0foo' ] },
15	15	{ type: 'PTR', value: 'baz.org', ttl: 987 },
16	16	{
17	17	type: 'SOA',

0 commit comments

Comments

0 (0)