Skip to content

[v6.x backport] net: fix abort on bad address input #14390

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

Closed
BridgeAR wants to merge 6 commits into from
Closed

[v6.x backport] net: fix abort on bad address input #14390

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fb1381
doc: document and test that methods return this
sam-github Jun 7, 2017
dce4a75
test: mark test-fs-readdir-ucs2 flaky
joaocgreis Jun 29, 2017
448c8d4
test: mark test-npm-install flaky on arm
refack Jul 2, 2017
3b2c791
build: run test-hash-seed at the end of test-v8
targos Jul 13, 2017
ddc8050
cluster, dns, repl, tls, util: fix RegExp nits
vsemozhetbyt Jun 7, 2017
17e00e3
net: fix abort on bad address input
BridgeAR Jun 16, 2017
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
net: fix abort on bad address input 
PR-URL: #13726
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@BridgeAR
BridgeAR committed Jul 20, 2017
commit 17e00e3a3c949363c98edfb8de09c48efdbe59bf
10 changes: 7 additions & 3 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,8 +912,9 @@ Socket.prototype.connect = function(options, cb) {
this._sockname = null;
}

var pipe = !!options.path;
debug('pipe', pipe, options.path);
const path = options.path;
var pipe = !!path;
debug('pipe', pipe, path);

if (!this._handle) {
this._handle = pipe ? new Pipe() : new TCP();
Expand All @@ -930,7 +931,10 @@ Socket.prototype.connect = function(options, cb) {
this.writable = true;

if (pipe) {
connect(this, options.path);
if (typeof path !== 'string') {
throw new TypeError('"path" option must be a string: ' + path);
}
connect(this, path);
} else {
lookupAndConnect(this, options);
}
Expand Down
23 changes: 16 additions & 7 deletions test/parallel/test-net-better-error-messages-path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,21 @@
const common = require('../common');
const net = require('net');
const assert = require('assert');
const fp = '/tmp/fadagagsdfgsdf';
const c = net.connect(fp);

c.on('connect', common.mustNotCall());
{
const fp = '/tmp/fadagagsdfgsdf';
const c = net.connect(fp);

c.on('error', common.mustCall(function(e) {
assert.strictEqual(e.code, 'ENOENT');
assert.strictEqual(e.message, `connect ENOENT ${fp}`);
}));
c.on('connect', common.mustNotCall());
c.on('error', common.mustCall(function(e) {
assert.strictEqual(e.code, 'ENOENT');
assert.strictEqual(e.message, `connect ENOENT ${fp}`);
}));
}

{
assert.throws(
() => net.createConnection({ path: {} }),
/"path" option must be a string: \[object Object]/
);
}