Skip to content
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

net: throw error if port does not exist in options #22085

Closed
wants to merge 7 commits into from
Closed

net: throw error if port does not exist in options #22085

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a90ec5
net: throw error if port does not exist in options
yanivfriedensohn Aug 2, 2018
0c0fbe4
errors: add an additional error message argument to ERR_INVALID_OPT_V…
yanivfriedensohn Aug 4, 2018
54fc80f
net: use ERR_INVALID_OPT_VALUE instead of ERR_PROPERTY_NOT_IN_OBJECT
yanivfriedensohn Aug 4, 2018
daae72b
errors: remove ERR_PROPERTY_NOT_IN_OBJECT
yanivfriedensohn Aug 4, 2018
20b525e
test: add tests for the additional error message
yanivfriedensohn Aug 12, 2018
7be75d8
errors: revert adding an additional error message argument to ERR_INV…
yanivfriedensohn Aug 15, 2018
630d987
net: use ERR_INVALID_ARG_VALUE instead of ERR_INVALID_OPT_VALUE
yanivfriedensohn Aug 15, 2018
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
Prev Previous commit
Next Next commit
net: use ERR_INVALID_OPT_VALUE instead of ERR_PROPERTY_NOT_IN_OBJECT
  • Loading branch information
@yanivfriedensohn @Trott
yanivfriedensohn authored and Trott committed Aug 22, 2018
commit 54fc80f90b67ceefc1a8044f0f6b2056436f7e3d
11 changes: 7 additions & 4 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ const {
ERR_INVALID_FD_TYPE,
ERR_INVALID_IP_ADDRESS,
ERR_INVALID_OPT_VALUE,
ERR_PROPERTY_NOT_IN_OBJECT,
ERR_SERVER_ALREADY_LISTEN,
ERR_SERVER_NOT_RUNNING,
ERR_SOCKET_BAD_PORT,
Expand Down Expand Up @@ -1497,11 +1496,15 @@ Server.prototype.listen = function(...args) {
return this;
}

if (typeof options === 'object' && !('port' in options)) {
throw new ERR_PROPERTY_NOT_IN_OBJECT('port', 'options');
let additionalMessage;
if (typeof options === 'object' &&
!(('port' in options) || ('path' in options))) {

additionalMessage = '"port" or "path" must be specified in options.';
}

throw new ERR_INVALID_OPT_VALUE('options', util.inspect(options));
throw new ERR_INVALID_OPT_VALUE('options', util.inspect(options),
additionalMessage);
};

function lookupAndListen(self, port, address, backlog, exclusive) {
Expand Down
21 changes: 6 additions & 15 deletions test/parallel/test-net-server-listen-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,12 @@ const listenOnPort = [
net.createServer().listen(options, common.mustNotCall());
};

if (typeof options === 'object' && !('port' in options)) {
common.expectsError(block,
{
code: 'ERR_PROPERTY_NOT_IN_OBJECT',
type: TypeError,
message: 'port does not exist in options',
});
} else {
common.expectsError(block,
{
code: 'ERR_INVALID_OPT_VALUE',
type: TypeError,
message: /^The value "{.*}" is invalid for option "options"$/
});
}
common.expectsError(block,
{
code: 'ERR_INVALID_OPT_VALUE',
type: TypeError,
message: /^The value "{.*}" is invalid for option "options"(?:\. .+)?$/,
});
}

shouldFailToListen(false, { port: false });
Expand Down