net: throw ERR_OUT_OF_RANGE if blockList.addSubnet prefix is NaN · nodejs/node@24246a2 · GitHub

nodejs / node Public

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

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

Additional navigation options

Commit 24246a2

Browse filesBrowse the repository at this point in the historyBrowse files

Lxxyx

authored and

danielleadams

committed

net: throw ERR_OUT_OF_RANGE if blockList.addSubnet prefix is NaN

Fixes: #36731 PR-URL: #36732 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

1 parent 2d8423d commit 24246a2
Copy full SHA for 24246a2

2 files changed

+5-7Lines changed: 5 additions & 7 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal
  • blocklist.js
• test/parallel
  • test-blocklist.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/blocklist.js‎

Copy file name to clipboardExpand all lines: lib/internal/blocklist.js

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

Original file line number	Diff line number	Diff line change
@@ -22,9 +22,10 @@ const { owner_symbol } = internalBinding('symbols');
22	22	const {
23	23	ERR_INVALID_ARG_TYPE,
24	24	ERR_INVALID_ARG_VALUE,
25		- ERR_OUT_OF_RANGE,
26	25	} = require('internal/errors').codes;
27	26
	27	+ const { validateInt32 } = require('internal/validators');
	28	+
28	29	class BlockList {
29	30	constructor(handle = new BlockListHandle()) {
30	31	// The handle argument is an intentionally undocumented
@@ -81,22 +82,18 @@ class BlockList {
81	82	addSubnet(network, prefix, family = 'ipv4') {
82	83	if (typeof network !== 'string')
83	84	throw new ERR_INVALID_ARG_TYPE('network', 'string', network);
84		- if (typeof prefix !== 'number')
85		- throw new ERR_INVALID_ARG_TYPE('prefix', 'number', prefix);
86	85	if (typeof family !== 'string')
87	86	throw new ERR_INVALID_ARG_TYPE('family', 'string', family);
88	87	family = family.toLowerCase();
89	88	let type;
90	89	switch (family) {
91	90	case 'ipv4':
92	91	type = AF_INET;
93		- if (prefix < 0 || prefix > 32)
94		- throw new ERR_OUT_OF_RANGE(prefix, '>= 0 and <= 32', prefix);
	92	+ validateInt32(prefix, 'prefix', 0, 32);
95	93	break;
96	94	case 'ipv6':
97	95	type = AF_INET6;
98		- if (prefix < 0 || prefix > 128)
99		- throw new ERR_OUT_OF_RANGE(prefix, '>= 0 and <= 128', prefix);
	96	+ validateInt32(prefix, 'prefix', 0, 128);
100	97	break;
101	98	default:
102	99	throw new ERR_INVALID_ARG_VALUE('family', family);

Collapse file

‎test/parallel/test-blocklist.js‎

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

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -150,6 +150,7 @@ const util = require('util');
150	150	const blockList = new BlockList();
151	151	assert.throws(() => blockList.addSubnet(1), /ERR_INVALID_ARG_TYPE/);
152	152	assert.throws(() => blockList.addSubnet('', ''), /ERR_INVALID_ARG_TYPE/);
	153	+ assert.throws(() => blockList.addSubnet('', NaN), /ERR_OUT_OF_RANGE/);
153	154	assert.throws(() => blockList.addSubnet('', 1, 1), /ERR_INVALID_ARG_TYPE/);
154	155	assert.throws(() => blockList.addSubnet('', 1, ''), /ERR_INVALID_ARG_VALUE/);
155	156

0 commit comments

Comments

0 (0)