From 292a1ed826a041c628652c1c048e4aa68efafa1b Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 18 May 2018 14:49:00 +0200 Subject: [PATCH 1/3] dns: default to verbatim=true in dns.lookup() Switch the default from false (reorder the result so that IPv4 addresses come before IPv6 addresses) to true (return them exactly as the resolver sent them to us.) --- doc/api/dns.md | 5 +---- lib/dns.js | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/api/dns.md b/doc/api/dns.md index afbd7e253cde4c..150db1ad70b6db 100644 --- a/doc/api/dns.md +++ b/doc/api/dns.md @@ -147,10 +147,7 @@ changes: an array. Otherwise, returns a single address. **Default:** `false`. - `verbatim` {boolean} When `true`, the callback receives IPv4 and IPv6 addresses in the order the DNS resolver returned them. When `false`, - IPv4 addresses are placed before IPv6 addresses. - **Default:** currently `false` (addresses are reordered) but this is - expected to change in the not too distant future. - New code should use `{ verbatim: true }`. + IPv4 addresses are placed before IPv6 addresses. **Default:** `true` * `callback` {Function} - `err` {Error} - `address` {string} A string representation of an IPv4 or IPv6 address. diff --git a/lib/dns.js b/lib/dns.js index ac3f6d6f0ec725..b3329223405e67 100644 --- a/lib/dns.js +++ b/lib/dns.js @@ -89,7 +89,7 @@ function lookup(hostname, options, callback) { var hints = 0; var family = -1; var all = false; - var verbatim = false; + var verbatim = true; // Parse arguments if (hostname && typeof hostname !== 'string') { @@ -103,7 +103,7 @@ function lookup(hostname, options, callback) { hints = options.hints >>> 0; family = options.family >>> 0; all = options.all === true; - verbatim = options.verbatim === true; + verbatim = options.verbatim !== false; validateHints(hints); } else { From 55fb3ab8dc47ed6a1b83439c30e916ff784a49f0 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 18 May 2018 14:49:00 +0200 Subject: [PATCH 2/3] squash! test fixups --- test/common/inspector-helper.js | 3 +++ test/parallel/test-cluster-message.js | 2 +- test/parallel/test-http-upgrade-client.js | 2 +- test/parallel/test-https-localaddress.js | 1 - test/parallel/test-net-dns-lookup.js | 4 ++-- test/parallel/test-net-remote-address-port.js | 2 +- test/parallel/test-tcp-wrap-listen.js | 4 ++-- ...imeout-removes-other-socket-unref-timer.js | 2 +- .../test-tls-client-getephemeralkeyinfo.js | 1 + test/parallel/test-tls-client-mindhsize.js | 1 + .../test-tls-wrap-econnreset-localaddress.js | 19 +++++++++---------- test/sequential/test-inspector.js | 2 +- .../test-net-better-error-messages-port.js | 2 +- .../test-net-connect-local-error.js | 4 ++-- 14 files changed, 26 insertions(+), 23 deletions(-) diff --git a/test/common/inspector-helper.js b/test/common/inspector-helper.js index 75b87e9cf91372..493a527f2c8dd1 100644 --- a/test/common/inspector-helper.js +++ b/test/common/inspector-helper.js @@ -375,6 +375,9 @@ class NodeInstance extends EventEmitter { httpGet(host, path, hostHeaderValue) { console.log('[test]', `Testing ${path}`); + // 'localhost' can either resolve to 127.0.0.1 or ::1 but + // the inspector only listens on 127.0.0.1 so be explicit. + if (!host) host = '127.0.0.1'; const headers = hostHeaderValue ? { 'Host': hostHeaderValue } : null; return this.portPromise.then((port) => new Promise((resolve, reject) => { const req = http.get({ host, port, path, headers }, (res) => { diff --git a/test/parallel/test-cluster-message.js b/test/parallel/test-cluster-message.js index 5585a64d48149d..2ab378700a6ed8 100644 --- a/test/parallel/test-cluster-message.js +++ b/test/parallel/test-cluster-message.js @@ -60,7 +60,7 @@ if (cluster.isWorker) { maybeReply(); }); - server.listen(0, '127.0.0.1'); + server.listen(); } else if (cluster.isMaster) { const checks = { diff --git a/test/parallel/test-http-upgrade-client.js b/test/parallel/test-http-upgrade-client.js index c637324a53d801..7a05410ecc2e41 100644 --- a/test/parallel/test-http-upgrade-client.js +++ b/test/parallel/test-http-upgrade-client.js @@ -47,7 +47,7 @@ const srv = net.createServer(function(c) { }); }); -srv.listen(0, '127.0.0.1', common.mustCall(function() { +srv.listen(0, common.mustCall(function() { const port = this.address().port; const headers = [ { diff --git a/test/parallel/test-https-localaddress.js b/test/parallel/test-https-localaddress.js index 6c6cac37ccca3b..1a4dfc6df14413 100644 --- a/test/parallel/test-https-localaddress.js +++ b/test/parallel/test-https-localaddress.js @@ -50,7 +50,6 @@ const server = https.createServer(options, function(req, res) { server.listen(0, '127.0.0.1', function() { const options = { - host: 'localhost', port: this.address().port, path: '/', method: 'GET', diff --git a/test/parallel/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js index 53052de716ee9e..25bd46935539b1 100644 --- a/test/parallel/test-net-dns-lookup.js +++ b/test/parallel/test-net-dns-lookup.js @@ -33,8 +33,8 @@ server.listen(0, '127.0.0.1', common.mustCall(function() { net.connect(this.address().port, 'localhost') .on('lookup', common.mustCall(function(err, ip, type, host) { assert.strictEqual(err, null); - assert.strictEqual(ip, '127.0.0.1'); - assert.strictEqual(type, 4); + assert(ip === '127.0.0.1' || ip === '::1', `ip === ${ip}`); + assert(type === 4 || type === 6, `type === ${type}`); assert.strictEqual(host, 'localhost'); })); })); diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js index 094206f85df34d..cc14d0c951167d 100644 --- a/test/parallel/test-net-remote-address-port.js +++ b/test/parallel/test-net-remote-address-port.js @@ -28,7 +28,7 @@ const net = require('net'); let conns_closed = 0; const remoteAddrCandidates = [ common.localhostIPv4 ]; -if (common.hasIPv6) remoteAddrCandidates.push('::ffff:127.0.0.1'); +if (common.hasIPv6) remoteAddrCandidates.push('::1', '::ffff:127.0.0.1'); const remoteFamilyCandidates = ['IPv4']; if (common.hasIPv6) remoteFamilyCandidates.push('IPv6'); diff --git a/test/parallel/test-tcp-wrap-listen.js b/test/parallel/test-tcp-wrap-listen.js index 72981b683ccea3..3db81c9c682b73 100644 --- a/test/parallel/test-tcp-wrap-listen.js +++ b/test/parallel/test-tcp-wrap-listen.js @@ -14,7 +14,7 @@ const { const server = new TCP(TCPConstants.SOCKET); -const r = server.bind('0.0.0.0', 0); +const r = server.bind('127.0.0.1', 0); assert.strictEqual(r, 0); let port = {}; server.getsockname(port); @@ -84,7 +84,7 @@ server.onconnection = (err, client) => { const net = require('net'); -const c = net.createConnection(port); +const c = net.createConnection(port, '127.0.0.1'); c.on('connect', common.mustCall(() => { c.end('hello world'); })); diff --git a/test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js b/test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js index 5dceb386fdbdf4..aa0a7aa1f877fa 100644 --- a/test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js +++ b/test/parallel/test-timers-socket-timeout-removes-other-socket-unref-timer.js @@ -32,7 +32,7 @@ const server = net.createServer(function onClient(client) { } }); -server.listen(0, common.localhostIPv4, common.mustCall(() => { +server.listen(0, common.mustCall(() => { const countdown = new Countdown(2, () => server.close()); { diff --git a/test/parallel/test-tls-client-getephemeralkeyinfo.js b/test/parallel/test-tls-client-getephemeralkeyinfo.js index 9432a277ac0fd0..439f327fba6595 100644 --- a/test/parallel/test-tls-client-getephemeralkeyinfo.js +++ b/test/parallel/test-tls-client-getephemeralkeyinfo.js @@ -48,6 +48,7 @@ function test(size, type, name, next) { server.listen(0, '127.0.0.1', common.mustCall(function() { const client = tls.connect({ + host: '127.0.0.1', port: this.address().port, rejectUnauthorized: false }, function() { diff --git a/test/parallel/test-tls-client-mindhsize.js b/test/parallel/test-tls-client-mindhsize.js index 3017d30e6c5e9e..45b75161d6a2eb 100644 --- a/test/parallel/test-tls-client-mindhsize.js +++ b/test/parallel/test-tls-client-mindhsize.js @@ -40,6 +40,7 @@ function test(size, err, next) { // dhparams is 1024 bits const client = tls.connect({ minDHSize: 2048, + host: '127.0.0.1', port: this.address().port, rejectUnauthorized: false }, function() { diff --git a/test/parallel/test-tls-wrap-econnreset-localaddress.js b/test/parallel/test-tls-wrap-econnreset-localaddress.js index 9df145ac374ab7..438f9f40adb1d5 100644 --- a/test/parallel/test-tls-wrap-econnreset-localaddress.js +++ b/test/parallel/test-tls-wrap-econnreset-localaddress.js @@ -10,19 +10,18 @@ const tls = require('tls'); const server = net.createServer((c) => { c.end(); -}).listen(common.mustCall(() => { +}).listen(0, common.localhostIPv4, common.mustCall(() => { const port = server.address().port; tls.connect({ + host: common.localhostIPv4, port: port, localAddress: common.localhostIPv4 - }, common.localhostIPv4) - .once('error', common.mustCall((e) => { - assert.strictEqual(e.code, 'ECONNRESET'); - assert.strictEqual(e.path, undefined); - assert.strictEqual(e.host, undefined); - assert.strictEqual(e.port, port); - assert.strictEqual(e.localAddress, common.localhostIPv4); - server.close(); - })); + }).once('error', common.mustCall((e) => { + assert.strictEqual(e.code, 'ECONNRESET'); + assert.strictEqual(e.path, undefined); + assert.strictEqual(e.port, port); + assert.strictEqual(e.localAddress, common.localhostIPv4); + server.close(); + })); })); diff --git a/test/sequential/test-inspector.js b/test/sequential/test-inspector.js index 00fdb000e9e251..662493829fb6cb 100644 --- a/test/sequential/test-inspector.js +++ b/test/sequential/test-inspector.js @@ -16,7 +16,7 @@ function checkListResponse(response) { ); assert.ok(response[0].devtoolsFrontendUrl); assert.ok( - /ws:\/\/localhost:\d+\/[0-9A-Fa-f]{8}-/ + /ws:\/\/127\.0\.0\.1:\d+\/[0-9A-Fa-f]{8}-/ .test(response[0].webSocketDebuggerUrl), response[0].webSocketDebuggerUrl); } diff --git a/test/sequential/test-net-better-error-messages-port.js b/test/sequential/test-net-better-error-messages-port.js index 789b2e31801da1..3de7c52801f9e2 100644 --- a/test/sequential/test-net-better-error-messages-port.js +++ b/test/sequential/test-net-better-error-messages-port.js @@ -3,7 +3,7 @@ const common = require('../common'); const net = require('net'); const assert = require('assert'); -const c = net.createConnection(common.PORT); +const c = net.createConnection(common.PORT, '127.0.0.1'); c.on('connect', common.mustNotCall()); diff --git a/test/sequential/test-net-connect-local-error.js b/test/sequential/test-net-connect-local-error.js index 6f5139aefb226d..ff114a0d28fce4 100644 --- a/test/sequential/test-net-connect-local-error.js +++ b/test/sequential/test-net-connect-local-error.js @@ -10,7 +10,7 @@ const expectedErrorCodes = ['ECONNREFUSED', 'EADDRINUSE']; const optionsIPv4 = { port: common.PORT, localPort: common.PORT + 1, - localAddress: common.localhostIPv4 + localAddress: '127.0.0.1' }; const optionsIPv6 = { @@ -21,7 +21,7 @@ const optionsIPv6 = { }; function onError(err, options) { - assert.ok(expectedErrorCodes.includes(err.code)); + assert.ok(expectedErrorCodes.includes(err.code), `err.code === ${err.code}`); assert.strictEqual(err.syscall, 'connect'); assert.strictEqual(err.localPort, options.localPort); assert.strictEqual(err.localAddress, options.localAddress); From 3e8af64dd7a49eafccceb11c5306920f039a9a4f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 18 May 2018 14:49:00 +0200 Subject: [PATCH 3/3] test: get rid of common.localhostIPv4 This was ostensibly introduced to make the test suite run inside a FreeBSD jail (why?) but the liberal use of the '127.0.0.1' string literal all across the test suite is IMO a good indicator that it bitrotted. A test suite without `common.localhostIPv4` is an infinitesimally easier to comprehend test suite so let's get rid of it. --- .../addons/openssl-client-cert-engine/test.js | 4 ++-- test/common/README.md | 5 ----- test/common/index.js | 22 ------------------- ...st-dgram-bind-shared-ports-after-port-0.js | 4 ++-- .../test-inspector-cluster-port-clash.js | 2 +- .../test-child-process-send-keep-open.js | 2 +- .../test-cluster-worker-wait-server-close.js | 6 ++--- test/parallel/test-dgram-address.js | 4 ++-- .../test-dgram-create-socket-handle.js | 2 +- .../test-dgram-send-callback-buffer.js | 2 +- .../test-dgram-send-callback-multi-buffer.js | 2 +- .../test-dgram-send-callback-recursive.js | 2 +- test/parallel/test-dgram-send-empty-array.js | 2 +- test/parallel/test-dgram-send-error.js | 4 ++-- .../test-dgram-send-multi-buffer-copy.js | 2 +- test/parallel/test-dgram-udp4.js | 4 ++-- .../parallel/test-domain-abort-on-uncaught.js | 4 ++-- test/parallel/test-http-client-get-url.js | 4 ++-- ...est-http-client-reject-unexpected-agent.js | 2 +- .../test-http-client-timeout-on-connect.js | 4 ++-- ...st-http-client-timeout-option-listeners.js | 2 +- .../test-http-flush-response-headers.js | 6 ++--- ...test-http-request-dont-override-options.js | 4 ++-- test/parallel/test-http-same-map.js | 4 ++-- test/parallel/test-https-client-get-url.js | 2 +- test/parallel/test-net-client-bind-twice.js | 8 +++---- .../test-net-connect-immediate-destroy.js | 2 +- .../test-net-connect-options-allowhalfopen.js | 2 +- test/parallel/test-net-dns-custom-lookup.js | 4 ++-- test/parallel/test-net-local-address-port.js | 6 ++--- test/parallel/test-net-remote-address-port.js | 2 +- .../parallel/test-net-socket-local-address.js | 4 ++-- test/parallel/test-repl-require.js | 2 +- test/parallel/test-tls-alpn-server-client.js | 2 +- test/parallel/test-tls-getprotocol.js | 4 ++-- .../test-tls-multiple-cas-as-string.js | 2 +- .../test-tls-wrap-econnreset-localaddress.js | 8 +++---- test/parallel/test-tls-wrap-econnreset.js | 4 ++-- test/sequential/test-async-wrap-getasyncid.js | 4 ++-- test/sequential/test-child-process-pass-fd.js | 4 ++-- .../test-dgram-bind-shared-ports.js | 2 +- test/sequential/test-net-GH-5504.js | 4 ++-- test/sequential/test-net-server-address.js | 4 ++-- 43 files changed, 71 insertions(+), 98 deletions(-) diff --git a/test/addons/openssl-client-cert-engine/test.js b/test/addons/openssl-client-cert-engine/test.js index 1c0e4564a5c3e9..3490db3feaf464 100644 --- a/test/addons/openssl-client-cert-engine/test.js +++ b/test/addons/openssl-client-cert-engine/test.js @@ -32,10 +32,10 @@ const serverOptions = { const server = https.createServer(serverOptions, (req, res) => { res.writeHead(200); res.end('hello world'); -}).listen(0, common.localhostIPv4, () => { +}).listen(0, '127.0.0.1', () => { const clientOptions = { method: 'GET', - host: common.localhostIPv4, + host: '127.0.0.1', port: server.address().port, path: '/test', clientCertEngine: engine, // engine will provide key+cert diff --git a/test/common/README.md b/test/common/README.md index 356c8531ec0c38..ac26bf2c978d72 100644 --- a/test/common/README.md +++ b/test/common/README.md @@ -214,11 +214,6 @@ Platform check for SunOS. Platform check for Windows. -### localhostIPv4 -* [<string>] - -IP of `localhost`. - ### localIPv6Hosts * [<Array>] diff --git a/test/common/index.js b/test/common/index.js index 7b668e58c48ead..fc13d0b9b3d1af 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -119,7 +119,6 @@ if (process.env.NODE_TEST_WITH_ASYNC_HOOKS) { let opensslCli = null; let inFreeBSDJail = null; -let localhostIPv4 = null; const localIPv6Hosts = isLinux ? [ @@ -759,27 +758,6 @@ module.exports = { return inFreeBSDJail; }, - get localhostIPv4() { - if (localhostIPv4 !== null) return localhostIPv4; - - if (this.inFreeBSDJail) { - // Jailed network interfaces are a bit special - since we need to jump - // through loops, as well as this being an exception case, assume the - // user will provide this instead. - if (process.env.LOCALHOST) { - localhostIPv4 = process.env.LOCALHOST; - } else { - console.error('Looks like we\'re in a FreeBSD Jail. ' + - 'Please provide your default interface address ' + - 'as LOCALHOST or expect some tests to fail.'); - } - } - - if (localhostIPv4 === null) localhostIPv4 = '127.0.0.1'; - - return localhostIPv4; - }, - // opensslCli defined lazily to reduce overhead of spawnSync get opensslCli() { if (opensslCli !== null) return opensslCli; diff --git a/test/known_issues/test-dgram-bind-shared-ports-after-port-0.js b/test/known_issues/test-dgram-bind-shared-ports-after-port-0.js index 7b750c765ba226..860c8495edfc4c 100644 --- a/test/known_issues/test-dgram-bind-shared-ports-after-port-0.js +++ b/test/known_issues/test-dgram-bind-shared-ports-after-port-0.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +require('../common'); // This test should fail because at present `cluster` does not know how to share // a socket when `worker1` binds with `port: 0`, and others try to bind to the @@ -50,7 +50,7 @@ if (cluster.isMaster) { const socket1 = dgram.createSocket('udp4', () => {}); socket1.on('error', PRT1 === 0 ? () => {} : assert.fail); socket1.bind( - { address: common.localhostIPv4, port: PRT1, exclusive: false }, + { address: '127.0.0.1', port: PRT1, exclusive: false }, () => process.send({ message: 'success', port1: socket1.address().port }) ); } diff --git a/test/known_issues/test-inspector-cluster-port-clash.js b/test/known_issues/test-inspector-cluster-port-clash.js index 0333ffcb98751c..0eaa80e9ca1701 100644 --- a/test/known_issues/test-inspector-cluster-port-clash.js +++ b/test/known_issues/test-inspector-cluster-port-clash.js @@ -52,7 +52,7 @@ if (cluster.isMaster) { // block one of the ports with a listening socket const server = net.createServer(); - server.listen(clashPort, common.localhostIPv4, common.mustCall(() => { + server.listen(clashPort, '127.0.0.1', common.mustCall(() => { // try to fork 3 workers No.2 should fail Promise.all([serialFork(), serialFork(), serialFork()]) .then(common.mustNotCall()) diff --git a/test/parallel/test-child-process-send-keep-open.js b/test/parallel/test-child-process-send-keep-open.js index 2d8a28121ac1fb..0c49879181f79b 100644 --- a/test/parallel/test-child-process-send-keep-open.js +++ b/test/parallel/test-child-process-send-keep-open.js @@ -38,7 +38,7 @@ if (process.argv[2] !== 'child') { }); server.listen(0, () => { - const socket = net.connect(server.address().port, common.localhostIPv4); + const socket = net.connect(server.address().port, '127.0.0.1'); socket.setEncoding('utf8'); socket.on('data', (data) => result += data); }); diff --git a/test/parallel/test-cluster-worker-wait-server-close.js b/test/parallel/test-cluster-worker-wait-server-close.js index b8183afb06ae18..0072613298cce6 100644 --- a/test/parallel/test-cluster-worker-wait-server-close.js +++ b/test/parallel/test-cluster-worker-wait-server-close.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const cluster = require('cluster'); const net = require('net'); @@ -12,7 +12,7 @@ if (cluster.isWorker) { // Wait for any data, then close connection socket.write('.'); socket.on('data', () => {}); - }).listen(0, common.localhostIPv4); + }).listen(0, '127.0.0.1'); server.once('close', function() { serverClosed = true; @@ -34,7 +34,7 @@ if (cluster.isWorker) { // Disconnect worker when it is ready worker.once('listening', function(address) { - const socket = net.createConnection(address.port, common.localhostIPv4); + const socket = net.createConnection(address.port, '127.0.0.1'); socket.on('connect', function() { socket.on('data', function() { diff --git a/test/parallel/test-dgram-address.js b/test/parallel/test-dgram-address.js index f14b910fc27a2b..901b5399005cba 100644 --- a/test/parallel/test-dgram-address.js +++ b/test/parallel/test-dgram-address.js @@ -31,7 +31,7 @@ const dgram = require('dgram'); socket.on('listening', common.mustCall(() => { const address = socket.address(); - assert.strictEqual(address.address, common.localhostIPv4); + assert.strictEqual(address.address, '127.0.0.1'); assert.strictEqual(typeof address.port, 'number'); assert.ok(isFinite(address.port)); assert.ok(address.port > 0); @@ -44,7 +44,7 @@ const dgram = require('dgram'); assert.fail(`Unexpected error on udp4 socket. ${err.toString()}`); }); - socket.bind(0, common.localhostIPv4); + socket.bind(0, '127.0.0.1'); } if (common.hasIPv6) { diff --git a/test/parallel/test-dgram-create-socket-handle.js b/test/parallel/test-dgram-create-socket-handle.js index 6875448474ab8f..a6f05e2ff1686d 100644 --- a/test/parallel/test-dgram-create-socket-handle.js +++ b/test/parallel/test-dgram-create-socket-handle.js @@ -17,7 +17,7 @@ const UDP = internalBinding('udp_wrap').UDP; { // Create a bound handle. - const handle = _createSocketHandle(common.localhostIPv4, 0, 'udp4'); + const handle = _createSocketHandle('127.0.0.1', 0, 'udp4'); assert(handle instanceof UDP); assert.strictEqual(typeof handle.fd, 'number'); diff --git a/test/parallel/test-dgram-send-callback-buffer.js b/test/parallel/test-dgram-send-callback-buffer.js index c174e585d61282..bab58880587e27 100644 --- a/test/parallel/test-dgram-send-callback-buffer.js +++ b/test/parallel/test-dgram-send-callback-buffer.js @@ -16,5 +16,5 @@ const onMessage = common.mustCall(function(err, bytes) { client.bind(0, () => client.send(buf, client.address().port, - common.localhostIPv4, + '127.0.0.1', onMessage)); diff --git a/test/parallel/test-dgram-send-callback-multi-buffer.js b/test/parallel/test-dgram-send-callback-multi-buffer.js index 09f01f6e8adccc..fba1fdce0690b2 100644 --- a/test/parallel/test-dgram-send-callback-multi-buffer.js +++ b/test/parallel/test-dgram-send-callback-multi-buffer.js @@ -15,7 +15,7 @@ const buf2 = Buffer.alloc(256, 'y'); client.on('listening', () => { const port = client.address().port; - client.send([buf1, buf2], port, common.localhostIPv4, messageSent); + client.send([buf1, buf2], port, '127.0.0.1', messageSent); }); client.on('message', common.mustCall((buf, info) => { diff --git a/test/parallel/test-dgram-send-callback-recursive.js b/test/parallel/test-dgram-send-callback-recursive.js index 835fa332dfbe4d..7449c6d06ca1bb 100644 --- a/test/parallel/test-dgram-send-callback-recursive.js +++ b/test/parallel/test-dgram-send-callback-recursive.js @@ -13,7 +13,7 @@ let port; function onsend() { if (sent++ < limit) { - client.send(chunk, 0, chunk.length, port, common.localhostIPv4, onsend); + client.send(chunk, 0, chunk.length, port, '127.0.0.1', onsend); } else { assert.strictEqual(async, true); } diff --git a/test/parallel/test-dgram-send-empty-array.js b/test/parallel/test-dgram-send-empty-array.js index 178b72bb1272dd..1dfcc7263a5625 100644 --- a/test/parallel/test-dgram-send-empty-array.js +++ b/test/parallel/test-dgram-send-empty-array.js @@ -18,7 +18,7 @@ client.on('message', common.mustCall(function onMessage(buf, info) { client.on('listening', common.mustCall(function() { interval = setInterval(function() { - client.send([], client.address().port, common.localhostIPv4); + client.send([], client.address().port, '127.0.0.1'); }, 10); })); diff --git a/test/parallel/test-dgram-send-error.js b/test/parallel/test-dgram-send-error.js index f6d37f2c818112..dd3c3b3967eb99 100644 --- a/test/parallel/test-dgram-send-error.js +++ b/test/parallel/test-dgram-send-error.js @@ -52,7 +52,7 @@ getSocket((socket) => { assert.strictEqual(err.code, 'UNKNOWN'); assert.strictEqual(err.errno, 'UNKNOWN'); assert.strictEqual(err.syscall, 'send'); - assert.strictEqual(err.address, common.localhostIPv4); + assert.strictEqual(err.address, '127.0.0.1'); assert.strictEqual(err.port, port); assert.strictEqual( err.message, @@ -64,6 +64,6 @@ getSocket((socket) => { return UV_UNKNOWN; }; - socket.send('foo', port, common.localhostIPv4, callback); + socket.send('foo', port, '127.0.0.1', callback); })); } diff --git a/test/parallel/test-dgram-send-multi-buffer-copy.js b/test/parallel/test-dgram-send-multi-buffer-copy.js index 2ee87494b02836..f6ef07b58dc284 100644 --- a/test/parallel/test-dgram-send-multi-buffer-copy.js +++ b/test/parallel/test-dgram-send-multi-buffer-copy.js @@ -15,7 +15,7 @@ const buf2 = Buffer.alloc(256, 'y'); client.on('listening', function() { const toSend = [buf1, buf2]; - client.send(toSend, this.address().port, common.localhostIPv4, onMessage); + client.send(toSend, this.address().port, '127.0.0.1', onMessage); toSend.splice(0, 2); }); diff --git a/test/parallel/test-dgram-udp4.js b/test/parallel/test-dgram-udp4.js index c7ee34b2c1085b..bb5ec14aca9d0d 100644 --- a/test/parallel/test-dgram-udp4.js +++ b/test/parallel/test-dgram-udp4.js @@ -27,7 +27,7 @@ const message_to_send = 'A message to send'; const server = dgram.createSocket('udp4'); server.on('message', common.mustCall((msg, rinfo) => { - assert.strictEqual(rinfo.address, common.localhostIPv4); + assert.strictEqual(rinfo.address, '127.0.0.1'); assert.strictEqual(msg.toString(), message_to_send.toString()); server.send(msg, 0, msg.length, rinfo.port, rinfo.address); })); @@ -35,7 +35,7 @@ server.on('listening', common.mustCall(() => { const client = dgram.createSocket('udp4'); const port = server.address().port; client.on('message', common.mustCall((msg, rinfo) => { - assert.strictEqual(rinfo.address, common.localhostIPv4); + assert.strictEqual(rinfo.address, '127.0.0.1'); assert.strictEqual(rinfo.port, port); assert.strictEqual(msg.toString(), message_to_send.toString()); client.close(); diff --git a/test/parallel/test-domain-abort-on-uncaught.js b/test/parallel/test-domain-abort-on-uncaught.js index e74fb436bf18e0..c332fd05c992e6 100644 --- a/test/parallel/test-domain-abort-on-uncaught.js +++ b/test/parallel/test-domain-abort-on-uncaught.js @@ -94,8 +94,8 @@ const tests = [ const server = net.createServer(function(conn) { conn.pipe(conn); }); - server.listen(0, common.localhostIPv4, function() { - const conn = net.connect(this.address().port, common.localhostIPv4); + server.listen(0, '127.0.0.1', function() { + const conn = net.connect(this.address().port, '127.0.0.1'); conn.once('data', function() { throw new Error('ok'); }); diff --git a/test/parallel/test-http-client-get-url.js b/test/parallel/test-http-client-get-url.js index a72eea56538c4d..bf207477887669 100644 --- a/test/parallel/test-http-client-get-url.js +++ b/test/parallel/test-http-client-get-url.js @@ -35,8 +35,8 @@ const server = http.createServer(common.mustCall((req, res) => { res.end(); }, 3)); -server.listen(0, common.localhostIPv4, common.mustCall(() => { - const u = `http://${common.localhostIPv4}:${server.address().port}${testPath}`; +server.listen(0, '127.0.0.1', common.mustCall(() => { + const u = `http://127.0.0.1:${server.address().port}${testPath}`; http.get(u, common.mustCall(() => { http.get(url.parse(u), common.mustCall(() => { http.get(new URL(u), common.mustCall(() => { diff --git a/test/parallel/test-http-client-reject-unexpected-agent.js b/test/parallel/test-http-client-reject-unexpected-agent.js index 27cb77951cf5fd..c51096ab8dbe79 100644 --- a/test/parallel/test-http-client-reject-unexpected-agent.js +++ b/test/parallel/test-http-client-reject-unexpected-agent.js @@ -6,7 +6,7 @@ const http = require('http'); const baseOptions = { method: 'GET', port: undefined, - host: common.localhostIPv4, + host: '127.0.0.1', }; const failingAgentOptions = [ diff --git a/test/parallel/test-http-client-timeout-on-connect.js b/test/parallel/test-http-client-timeout-on-connect.js index 3a0098229d9af8..428ec022f6c1ae 100644 --- a/test/parallel/test-http-client-timeout-on-connect.js +++ b/test/parallel/test-http-client-timeout-on-connect.js @@ -11,9 +11,9 @@ const server = http.createServer((req, res) => { // This space is intentionally left blank. }); -server.listen(0, common.localhostIPv4, common.mustCall(() => { +server.listen(0, '127.0.0.1', common.mustCall(() => { const port = server.address().port; - const req = http.get(`http://${common.localhostIPv4}:${port}`); + const req = http.get(`http://127.0.0.1:${port}`); req.setTimeout(1); req.on('socket', common.mustCall((socket) => { diff --git a/test/parallel/test-http-client-timeout-option-listeners.js b/test/parallel/test-http-client-timeout-option-listeners.js index 727b5fddf09624..929b5cb7c49044 100644 --- a/test/parallel/test-http-client-timeout-option-listeners.js +++ b/test/parallel/test-http-client-timeout-option-listeners.js @@ -16,7 +16,7 @@ const options = { agent, method: 'GET', port: undefined, - host: common.localhostIPv4, + host: '127.0.0.1', path: '/', timeout: timeout }; diff --git a/test/parallel/test-http-flush-response-headers.js b/test/parallel/test-http-flush-response-headers.js index 0f0a1387b56733..9ab81113324293 100644 --- a/test/parallel/test-http-flush-response-headers.js +++ b/test/parallel/test-http-flush-response-headers.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const http = require('http'); @@ -10,10 +10,10 @@ server.on('request', function(req, res) { res.flushHeaders(); res.flushHeaders(); // Should be idempotent. }); -server.listen(0, common.localhostIPv4, function() { +server.listen(0, '127.0.0.1', function() { const req = http.request({ method: 'GET', - host: common.localhostIPv4, + host: '127.0.0.1', port: this.address().port, }, onResponse); diff --git a/test/parallel/test-http-request-dont-override-options.js b/test/parallel/test-http-request-dont-override-options.js index ff534436cb8f93..223963fd2a0d44 100644 --- a/test/parallel/test-http-request-dont-override-options.js +++ b/test/parallel/test-http-request-dont-override-options.js @@ -19,7 +19,7 @@ server.listen(0, function() { // be mutable / modified const options = { host: undefined, - hostname: common.localhostIPv4, + hostname: '127.0.0.1', port: undefined, defaultPort: undefined, path: undefined, @@ -31,7 +31,7 @@ server.listen(0, function() { res.resume(); server.close(); assert.strictEqual(options.host, undefined); - assert.strictEqual(options.hostname, common.localhostIPv4); + assert.strictEqual(options.hostname, '127.0.0.1'); assert.strictEqual(options.port, undefined); assert.strictEqual(options.defaultPort, undefined); assert.strictEqual(options.path, undefined); diff --git a/test/parallel/test-http-same-map.js b/test/parallel/test-http-same-map.js index 0adb73222de184..c77c6903c0d65b 100644 --- a/test/parallel/test-http-same-map.js +++ b/test/parallel/test-http-same-map.js @@ -1,12 +1,12 @@ // Flags: --allow_natives_syntax 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const http = require('http'); const server = - http.createServer(onrequest).listen(0, common.localhostIPv4, () => next(0)); + http.createServer(onrequest).listen(0, '127.0.0.1', () => next(0)); function onrequest(req, res) { res.end('ok'); diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js index 5d520416fe22da..3ca0638b640905 100644 --- a/test/parallel/test-https-client-get-url.js +++ b/test/parallel/test-https-client-get-url.js @@ -48,7 +48,7 @@ const server = https.createServer(options, common.mustCall((req, res) => { }, 3)); server.listen(0, common.mustCall(() => { - const u = `https://${common.localhostIPv4}:${server.address().port}/foo?bar`; + const u = `https://127.0.0.1:${server.address().port}/foo?bar`; https.get(u, common.mustCall(() => { https.get(url.parse(u), common.mustCall(() => { https.get(new URL(u), common.mustCall(() => { diff --git a/test/parallel/test-net-client-bind-twice.js b/test/parallel/test-net-client-bind-twice.js index ca7eb502d85ba5..c0c3540571bb9f 100644 --- a/test/parallel/test-net-client-bind-twice.js +++ b/test/parallel/test-net-client-bind-twice.js @@ -7,13 +7,13 @@ const assert = require('assert'); const net = require('net'); const server1 = net.createServer(common.mustNotCall()); -server1.listen(0, common.localhostIPv4, common.mustCall(() => { +server1.listen(0, '127.0.0.1', common.mustCall(() => { const server2 = net.createServer(common.mustNotCall()); - server2.listen(0, common.localhostIPv4, common.mustCall(() => { + server2.listen(0, '127.0.0.1', common.mustCall(() => { const client = net.connect({ - host: common.localhostIPv4, + host: '127.0.0.1', port: server1.address().port, - localAddress: common.localhostIPv4, + localAddress: '127.0.0.1', localPort: server2.address().port }, common.mustNotCall()); diff --git a/test/parallel/test-net-connect-immediate-destroy.js b/test/parallel/test-net-connect-immediate-destroy.js index 3ca58c356b44d1..78667e15ecda4e 100644 --- a/test/parallel/test-net-connect-immediate-destroy.js +++ b/test/parallel/test-net-connect-immediate-destroy.js @@ -5,7 +5,7 @@ const net = require('net'); const server = net.createServer(); server.listen(0); const port = server.address().port; -const socket = net.connect(port, common.localhostIPv4, common.mustNotCall()); +const socket = net.connect(port, '127.0.0.1', common.mustNotCall()); socket.on('error', common.mustNotCall()); server.close(); socket.destroy(); diff --git a/test/parallel/test-net-connect-options-allowhalfopen.js b/test/parallel/test-net-connect-options-allowhalfopen.js index 509b33ec4c33a8..8f847a7fca1d78 100644 --- a/test/parallel/test-net-connect-options-allowhalfopen.js +++ b/test/parallel/test-net-connect-options-allowhalfopen.js @@ -30,7 +30,7 @@ const net = require('net'); let serverConnections = 0; let clientSentFIN = 0; let serverReceivedFIN = 0; - const host = common.localhostIPv4; + const host = '127.0.0.1'; function serverOnConnection(socket) { console.log(`'connection' ${++serverConnections} emitted on server`); diff --git a/test/parallel/test-net-dns-custom-lookup.js b/test/parallel/test-net-dns-custom-lookup.js index c7a01f5fa6faec..49089d01ca52fe 100644 --- a/test/parallel/test-net-dns-custom-lookup.js +++ b/test/parallel/test-net-dns-custom-lookup.js @@ -10,7 +10,7 @@ function check(addressType, cb) { cb && cb(); }); - const address = addressType === 4 ? common.localhostIPv4 : '::1'; + const address = addressType === 4 ? '127.0.0.1' : '::1'; server.listen(0, address, common.mustCall(function() { net.connect({ port: this.address().port, @@ -28,7 +28,7 @@ function check(addressType, cb) { dnsopts.family = addressType; if (addressType === 4) { process.nextTick(function() { - cb(null, common.localhostIPv4, 4); + cb(null, '127.0.0.1', 4); }); } else { process.nextTick(function() { diff --git a/test/parallel/test-net-local-address-port.js b/test/parallel/test-net-local-address-port.js index dfd7ef359b71d2..ca7d69bf2c3f6e 100644 --- a/test/parallel/test-net-local-address-port.js +++ b/test/parallel/test-net-local-address-port.js @@ -25,7 +25,7 @@ const assert = require('assert'); const net = require('net'); const server = net.createServer(common.mustCall(function(socket) { - assert.strictEqual(socket.localAddress, common.localhostIPv4); + assert.strictEqual(socket.localAddress, '127.0.0.1'); assert.strictEqual(socket.localPort, this.address().port); socket.on('end', function() { server.close(); @@ -33,9 +33,9 @@ const server = net.createServer(common.mustCall(function(socket) { socket.resume(); })); -server.listen(0, common.localhostIPv4, function() { +server.listen(0, '127.0.0.1', function() { const client = net.createConnection(this.address() - .port, common.localhostIPv4); + .port, '127.0.0.1'); client.on('connect', function() { client.end(); }); diff --git a/test/parallel/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js index cc14d0c951167d..444c258936f959 100644 --- a/test/parallel/test-net-remote-address-port.js +++ b/test/parallel/test-net-remote-address-port.js @@ -27,7 +27,7 @@ const net = require('net'); let conns_closed = 0; -const remoteAddrCandidates = [ common.localhostIPv4 ]; +const remoteAddrCandidates = [ '127.0.0.1' ]; if (common.hasIPv6) remoteAddrCandidates.push('::1', '::ffff:127.0.0.1'); const remoteFamilyCandidates = ['IPv4']; diff --git a/test/parallel/test-net-socket-local-address.js b/test/parallel/test-net-socket-local-address.js index e80731bc78fb0a..97469f1f14f9ba 100644 --- a/test/parallel/test-net-socket-local-address.js +++ b/test/parallel/test-net-socket-local-address.js @@ -22,7 +22,7 @@ server.on('close', common.mustCall(() => { assert.strictEqual(conns, 2); })); -server.listen(0, common.localhostIPv4, connect); +server.listen(0, '127.0.0.1', connect); function connect() { if (conns === 2) { @@ -34,7 +34,7 @@ function connect() { client.once('close', connect); assert.strictEqual( client, - client.connect(server.address().port, common.localhostIPv4, () => { + client.connect(server.address().port, '127.0.0.1', () => { clientLocalPorts.push(client.localPort); }) ); diff --git a/test/parallel/test-repl-require.js b/test/parallel/test-repl-require.js index 818fca7431fa94..4013cf46e273de 100644 --- a/test/parallel/test-repl-require.js +++ b/test/parallel/test-repl-require.js @@ -18,7 +18,7 @@ const server = net.createServer((conn) => { }); }); -const host = common.localhostIPv4; +const host = '127.0.0.1'; const port = 0; const options = { host, port }; diff --git a/test/parallel/test-tls-alpn-server-client.js b/test/parallel/test-tls-alpn-server-client.js index 2540831a38f25c..46ee6926e71c71 100644 --- a/test/parallel/test-tls-alpn-server-client.js +++ b/test/parallel/test-tls-alpn-server-client.js @@ -12,7 +12,7 @@ function loadPEM(n) { return fixtures.readKey(`${n}.pem`); } -const serverIP = common.localhostIPv4; +const serverIP = '127.0.0.1'; function checkResults(result, expected) { assert.strictEqual(result.server.ALPN, expected.server.ALPN); diff --git a/test/parallel/test-tls-getprotocol.js b/test/parallel/test-tls-getprotocol.js index 20018241e33572..51d9ab4fa60020 100644 --- a/test/parallel/test-tls-getprotocol.js +++ b/test/parallel/test-tls-getprotocol.js @@ -24,11 +24,11 @@ const serverConfig = { const server = tls.createServer(serverConfig, common.mustCall(function() { -}, clientConfigs.length)).listen(0, common.localhostIPv4, function() { +}, clientConfigs.length)).listen(0, '127.0.0.1', function() { let connected = 0; clientConfigs.forEach(function(v) { tls.connect({ - host: common.localhostIPv4, + host: '127.0.0.1', port: server.address().port, rejectUnauthorized: false, secureProtocol: v.secureProtocol diff --git a/test/parallel/test-tls-multiple-cas-as-string.js b/test/parallel/test-tls-multiple-cas-as-string.js index 2612de55fe988f..a048264b2dcc6e 100644 --- a/test/parallel/test-tls-multiple-cas-as-string.js +++ b/test/parallel/test-tls-multiple-cas-as-string.js @@ -23,7 +23,7 @@ function test(ca, next) { server.addContext('agent3', { ca, cert, key }); - const host = common.localhostIPv4; + const host = '127.0.0.1'; server.listen(0, host, function() { tls.connect({ servername: 'agent3', host, port: this.address().port, ca }); }); diff --git a/test/parallel/test-tls-wrap-econnreset-localaddress.js b/test/parallel/test-tls-wrap-econnreset-localaddress.js index 438f9f40adb1d5..1379c59ec436d2 100644 --- a/test/parallel/test-tls-wrap-econnreset-localaddress.js +++ b/test/parallel/test-tls-wrap-econnreset-localaddress.js @@ -10,18 +10,18 @@ const tls = require('tls'); const server = net.createServer((c) => { c.end(); -}).listen(0, common.localhostIPv4, common.mustCall(() => { +}).listen(0, '127.0.0.1', common.mustCall(() => { const port = server.address().port; tls.connect({ - host: common.localhostIPv4, + host: '127.0.0.1', port: port, - localAddress: common.localhostIPv4 + localAddress: '127.0.0.1' }).once('error', common.mustCall((e) => { assert.strictEqual(e.code, 'ECONNRESET'); assert.strictEqual(e.path, undefined); assert.strictEqual(e.port, port); - assert.strictEqual(e.localAddress, common.localhostIPv4); + assert.strictEqual(e.localAddress, '127.0.0.1'); server.close(); })); })); diff --git a/test/parallel/test-tls-wrap-econnreset.js b/test/parallel/test-tls-wrap-econnreset.js index 5c6db86b75e06a..a5a4207b8873f0 100644 --- a/test/parallel/test-tls-wrap-econnreset.js +++ b/test/parallel/test-tls-wrap-econnreset.js @@ -13,11 +13,11 @@ const server = net.createServer((c) => { }).listen(common.mustCall(() => { const port = server.address().port; - tls.connect(port, common.localhostIPv4) + tls.connect(port, '127.0.0.1') .once('error', common.mustCall((e) => { assert.strictEqual(e.code, 'ECONNRESET'); assert.strictEqual(e.path, undefined); - assert.strictEqual(e.host, common.localhostIPv4); + assert.strictEqual(e.host, '127.0.0.1'); assert.strictEqual(e.port, port); assert.strictEqual(e.localAddress, undefined); server.close(); diff --git a/test/sequential/test-async-wrap-getasyncid.js b/test/sequential/test-async-wrap-getasyncid.js index 16868de5585d1d..39b5bd10b719ed 100644 --- a/test/sequential/test-async-wrap-getasyncid.js +++ b/test/sequential/test-async-wrap-getasyncid.js @@ -216,7 +216,7 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check socket.destroy(); }); socket.resume(); - })).listen(0, common.localhostIPv4, common.mustCall(() => { + })).listen(0, '127.0.0.1', common.mustCall(() => { const handle = new tcp_wrap.TCP(tcp_wrap.constants.SOCKET); const req = new tcp_wrap.TCPConnectWrap(); const sreq = new stream_wrap.ShutdownWrap(); @@ -247,7 +247,7 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check } testInitialized(wreq, 'WriteWrap'); } - req.address = common.localhostIPv4; + req.address = '127.0.0.1'; req.port = server.address().port; const err = handle.connect(req, req.address, req.port); assert.strictEqual(err, 0); diff --git a/test/sequential/test-child-process-pass-fd.js b/test/sequential/test-child-process-pass-fd.js index 98832c57a3df67..917b13753fb7f4 100644 --- a/test/sequential/test-child-process-pass-fd.js +++ b/test/sequential/test-child-process-pass-fd.js @@ -77,8 +77,8 @@ if (process.argv[2] !== 'child') { }); socketConnected(); }).unref(); - server.listen(0, common.localhostIPv4, () => { + server.listen(0, '127.0.0.1', () => { const { port } = server.address(); - socket = net.connect(port, common.localhostIPv4, socketConnected).unref(); + socket = net.connect(port, '127.0.0.1', socketConnected).unref(); }); } diff --git a/test/sequential/test-dgram-bind-shared-ports.js b/test/sequential/test-dgram-bind-shared-ports.js index 9f7e23ba0bdaf5..38120ed204285a 100644 --- a/test/sequential/test-dgram-bind-shared-ports.js +++ b/test/sequential/test-dgram-bind-shared-ports.js @@ -96,7 +96,7 @@ if (cluster.isMaster) { common.mustCall((err) => { process.send(`socket3:${err.code}`); }); - const address = common.localhostIPv4; + const address = '127.0.0.1'; const opt1 = { address, port: 0, exclusive: false }; const opt2 = { address, port: common.PORT, exclusive: false }; const opt3 = { address, port: common.PORT + 1, exclusive: true }; diff --git a/test/sequential/test-net-GH-5504.js b/test/sequential/test-net-GH-5504.js index ebe987d0443b6c..acd8e3fe75497d 100644 --- a/test/sequential/test-net-GH-5504.js +++ b/test/sequential/test-net-GH-5504.js @@ -52,7 +52,7 @@ function server() { console.error('_socketEnd'); }); socket.write(content); - }).listen(common.PORT, common.localhostIPv4, function() { + }).listen(common.PORT, '127.0.0.1', function() { console.log('listening'); }); } @@ -60,7 +60,7 @@ function server() { function client() { const net = require('net'); const client = net.connect({ - host: common.localhostIPv4, + host: '127.0.0.1', port: common.PORT }, function() { client.destroy(); diff --git a/test/sequential/test-net-server-address.js b/test/sequential/test-net-server-address.js index 52a8c1ac820e24..7649ee5b991a62 100644 --- a/test/sequential/test-net-server-address.js +++ b/test/sequential/test-net-server-address.js @@ -31,9 +31,9 @@ const server_ipv4 = net.createServer(); server_ipv4.on('error', common.mustNotCall()); server_ipv4 - .listen(common.PORT + 1, common.localhostIPv4, common.mustCall(() => { + .listen(common.PORT + 1, '127.0.0.1', common.mustCall(() => { const address_ipv4 = server_ipv4.address(); - assert.strictEqual(address_ipv4.address, common.localhostIPv4); + assert.strictEqual(address_ipv4.address, '127.0.0.1'); assert.strictEqual(address_ipv4.port, common.PORT + 1); assert.strictEqual(address_ipv4.family, family_ipv4); server_ipv4.close();