Skip to content

lib: use validators for argument validation #59416

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 2 commits into from
Sep 21, 2025
Merged

lib: use validators for argument validation #59416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb46bec
lib: use validators for argument validation
meteorqz6 Aug 9, 2025
49c5ea1
test: fix validation error assertions in child_process
meteorqz6 Aug 15, 2025
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
24 changes: 11 additions & 13 deletions lib/child_process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const {
ArrayPrototypeSort,
ArrayPrototypeSplice,
ArrayPrototypeUnshift,
NumberIsInteger,
ObjectAssign,
ObjectDefineProperty,
ObjectPrototypeHasOwnProperty,
Expand Down Expand Up @@ -70,18 +69,19 @@ const {
ERR_CHILD_PROCESS_STDIO_MAXBUFFER,
ERR_INVALID_ARG_TYPE,
ERR_INVALID_ARG_VALUE,
ERR_OUT_OF_RANGE,
},
genericNodeError,
} = require('internal/errors');
const { clearTimeout, setTimeout } = require('timers');
const { getValidatedPath } = require('internal/fs/utils');
const {
isInt32,
validateAbortSignal,
validateArray,
validateBoolean,
validateFunction,
validateInteger,
validateInt32,
validateNumber,
validateObject,
validateString,
} = require('internal/validators');
Expand Down Expand Up @@ -603,13 +603,13 @@ function normalizeSpawnArguments(file, args, options) {
}

// Validate the uid, if present.
if (options.uid != null && !isInt32(options.uid)) {
throw new ERR_INVALID_ARG_TYPE('options.uid', 'int32', options.uid);
if (options.uid != null) {
validateInt32(options.uid, 'options.uid');
}

// Validate the gid, if present.
if (options.gid != null && !isInt32(options.gid)) {
throw new ERR_INVALID_ARG_TYPE('options.gid', 'int32', options.gid);
if (options.gid != null) {
validateInt32(options.gid, 'options.gid');
}

// Validate the shell, if present.
Expand Down Expand Up @@ -1017,17 +1017,15 @@ function validateArgumentsNullCheck(args, propName) {


function validateTimeout(timeout) {
if (timeout != null && !(NumberIsInteger(timeout) && timeout >= 0)) {
throw new ERR_OUT_OF_RANGE('timeout', 'an unsigned integer', timeout);
if (timeout != null) {
validateInteger(timeout, 'timeout', 0);
}
}


function validateMaxBuffer(maxBuffer) {
if (maxBuffer != null && !(typeof maxBuffer === 'number' && maxBuffer >= 0)) {
throw new ERR_OUT_OF_RANGE('options.maxBuffer',
'a positive number',
maxBuffer);
if (maxBuffer != null) {
validateNumber(maxBuffer, 'options.maxBuffer', 0);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-child-process-fork-timeout-kill-signal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ const { getEventListeners } = require('events');
// Verify timeout verification
throws(() => fork(fixtures.path('child-process-stay-alive-forever.js'), {
timeout: 'badValue',
}), /ERR_OUT_OF_RANGE/);
}), /ERR_INVALID_ARG_TYPE/);

throws(() => fork(fixtures.path('child-process-stay-alive-forever.js'), {
timeout: {},
}), /ERR_OUT_OF_RANGE/);
}), /ERR_INVALID_ARG_TYPE/);
}

{
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-child-process-spawn-timeout-kill-signal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ const aliveForeverFile = 'child-process-stay-alive-forever.js';
// Verify timeout verification
throws(() => spawn(process.execPath, [fixtures.path(aliveForeverFile)], {
timeout: 'badValue',
}), /ERR_OUT_OF_RANGE/);
}), /ERR_INVALID_ARG_TYPE/);

throws(() => spawn(process.execPath, [fixtures.path(aliveForeverFile)], {
timeout: {},
}), /ERR_OUT_OF_RANGE/);
}), /ERR_INVALID_ARG_TYPE/);
}

{
Expand Down
6 changes: 4 additions & 2 deletions test/parallel/test-child-process-spawn-typeerror.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ const invalidArgTypeError = {
name: 'TypeError'
};

const invalidRangeError = { code: 'ERR_OUT_OF_RANGE', name: 'RangeError' };

assert.throws(function() {
spawn(invalidcmd, 'this is not an array');
}, invalidArgTypeError);
Expand Down Expand Up @@ -77,11 +79,11 @@ assert.throws(function() {

assert.throws(function() {
spawn(cmd, [], { uid: 2 ** 63 });
}, invalidArgTypeError);
}, invalidRangeError);

assert.throws(function() {
spawn(cmd, [], { gid: 2 ** 63 });
}, invalidArgTypeError);
}, invalidRangeError);

// Argument types for combinatorics.
const a = [];
Expand Down
40 changes: 20 additions & 20 deletions test/parallel/test-child-process-spawnsync-validation-errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ if (!common.isWindows) {
fail('uid', [], invalidArgTypeError);
fail('uid', {}, invalidArgTypeError);
fail('uid', common.mustNotCall(), invalidArgTypeError);
fail('uid', NaN, invalidArgTypeError);
fail('uid', Infinity, invalidArgTypeError);
fail('uid', 3.1, invalidArgTypeError);
fail('uid', -3.1, invalidArgTypeError);
fail('uid', NaN, invalidRangeError);
fail('uid', Infinity, invalidRangeError);
fail('uid', 3.1, invalidRangeError);
fail('uid', -3.1, invalidRangeError);
}
}

Expand All @@ -83,10 +83,10 @@ if (!common.isWindows) {
fail('gid', [], invalidArgTypeError);
fail('gid', {}, invalidArgTypeError);
fail('gid', common.mustNotCall(), invalidArgTypeError);
fail('gid', NaN, invalidArgTypeError);
fail('gid', Infinity, invalidArgTypeError);
fail('gid', 3.1, invalidArgTypeError);
fail('gid', -3.1, invalidArgTypeError);
fail('gid', NaN, invalidRangeError);
fail('gid', Infinity, invalidRangeError);
fail('gid', 3.1, invalidRangeError);
fail('gid', -3.1, invalidRangeError);
}
}
}
Expand Down Expand Up @@ -152,12 +152,12 @@ if (!common.isWindows) {
pass('timeout', 1);
pass('timeout', 0);
fail('timeout', -1, invalidRangeError);
fail('timeout', true, invalidRangeError);
fail('timeout', false, invalidRangeError);
fail('timeout', __dirname, invalidRangeError);
fail('timeout', [], invalidRangeError);
fail('timeout', {}, invalidRangeError);
fail('timeout', common.mustNotCall(), invalidRangeError);
fail('timeout', true, invalidArgTypeError);
fail('timeout', false, invalidArgTypeError);
fail('timeout', __dirname, invalidArgTypeError);
fail('timeout', [], invalidArgTypeError);
fail('timeout', {}, invalidArgTypeError);
fail('timeout', common.mustNotCall(), invalidArgTypeError);
fail('timeout', NaN, invalidRangeError);
fail('timeout', Infinity, invalidRangeError);
fail('timeout', 3.1, invalidRangeError);
Expand All @@ -175,12 +175,12 @@ if (!common.isWindows) {
fail('maxBuffer', -1, invalidRangeError);
fail('maxBuffer', NaN, invalidRangeError);
fail('maxBuffer', -Infinity, invalidRangeError);
fail('maxBuffer', true, invalidRangeError);
fail('maxBuffer', false, invalidRangeError);
fail('maxBuffer', __dirname, invalidRangeError);
fail('maxBuffer', [], invalidRangeError);
fail('maxBuffer', {}, invalidRangeError);
fail('maxBuffer', common.mustNotCall(), invalidRangeError);
fail('maxBuffer', true, invalidArgTypeError);
fail('maxBuffer', false, invalidArgTypeError);
fail('maxBuffer', __dirname, invalidArgTypeError);
fail('maxBuffer', [], invalidArgTypeError);
fail('maxBuffer', {}, invalidArgTypeError);
fail('maxBuffer', common.mustNotCall(), invalidArgTypeError);
}

{
Expand Down
Loading