Permalink
Browse files

net: emit error on invalid address family

This commit adds proper error handling to net.connect() when
a custom lookup() function returns an invalid address family.

PR-URL: #19415
Fixes: #19407
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Khaidi Chu <i@2333.moe>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information...
cjihrig committed Mar 17, 2018
1 parent 0fb017d commit 7c73cd4c70513dd4fa1f7ea13e3bb3270696eabe
Showing with 23 additions and 1 deletion.
  1. +5 −0 doc/api/errors.md
  2. +1 −0 lib/internal/errors.js
  3. +7 −0 lib/net.js
  4. +10 −1 test/parallel/test-net-options-lookup.js
View
@@ -1042,6 +1042,11 @@ The `inspector` module is not available for use.
While using the `inspector` module, an attempt was made to use the inspector
before it was connected.
<a id="ERR_INVALID_ADDRESS_FAMILY"></a>
### ERR_INVALID_ADDRESS_FAMILY
The provided address family is not understood by the Node.js API.
<a id="ERR_INVALID_ARG_TYPE"></a>
### ERR_INVALID_ARG_TYPE
View
@@ -737,6 +737,7 @@ E('ERR_INSPECTOR_ALREADY_CONNECTED',
E('ERR_INSPECTOR_CLOSED', 'Session was closed', Error);
E('ERR_INSPECTOR_NOT_AVAILABLE', 'Inspector is not available', Error);
E('ERR_INSPECTOR_NOT_CONNECTED', 'Session is not connected', Error);
E('ERR_INVALID_ADDRESS_FAMILY', 'Invalid address family: %s', RangeError);
E('ERR_INVALID_ARG_TYPE', invalidArgType, TypeError);
E('ERR_INVALID_ARG_VALUE', (name, value, reason = 'is invalid') => {
const util = lazyUtil();
View
@@ -54,6 +54,7 @@ const {
} = require('internal/async_hooks');
const errors = require('internal/errors');
const {
ERR_INVALID_ADDRESS_FAMILY,
ERR_INVALID_ARG_TYPE,
ERR_INVALID_FD_TYPE,
ERR_INVALID_IP_ADDRESS,
@@ -1117,6 +1118,12 @@ function lookupAndConnect(self, options) {
err.port = options.port;
err.message = err.message + ' ' + options.host + ':' + options.port;
process.nextTick(connectErrorNT, self, err);
} else if (addressType !== 4 && addressType !== 6) {
err = new ERR_INVALID_ADDRESS_FAMILY(addressType);
err.host = options.host;
err.port = options.port;
err.message = err.message + ' ' + options.host + ':' + options.port;
process.nextTick(connectErrorNT, self, err);
} else {
self._unrefTimer();
defaultTriggerAsyncIdScope(
@@ -29,5 +29,14 @@ function connectDoesNotThrow(input) {
lookup: input
};
net.connect(opts);
return net.connect(opts);
}
{
// Verify that an error is emitted when an invalid address family is returned.
const s = connectDoesNotThrow((host, options, cb) => {
cb(null, '127.0.0.1', 100);
});
s.on('error', common.expectsError({ code: 'ERR_INVALID_ADDRESS_FAMILY' }));
}

0 comments on commit 7c73cd4

Please sign in to comment.