net: fix abort on bad address input

BridgeAR · MylesBorins · commit 792acc17bf0f · 2017-09-19T09:09:09.000-04:00
Backport-PR-URL: #14390 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>
diff --git a/lib/net.js b/lib/net.js
@@ -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();
@@ -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);
 }
diff --git a/test/parallel/test-net-better-error-messages-path.js b/test/parallel/test-net-better-error-messages-path.js
@@ -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]/
+ );
+}

-Original file line number
+Diff line change
 this._sockname=null;
+}
 -varpipe=!!options.path;
 -debug('pipe',pipe,options.path);
 +constpath=options.path;
 +varpipe=!!path;
 +debug('pipe',pipe,path);
 if(!this._handle){
 this._handle=pipe ? newPipe() : newTCP();
 this.writable=true;
 if(pipe){
 -connect(this,options.path);
 +if(typeofpath!=='string'){
 +thrownewTypeError('"path" option must be a string: '+path);
 +}
 +connect(this,path);
 }else{
 lookupAndConnect(this,options);
+}
-Original file line number
+Diff line change
 constcommon=require('../common');
 constnet=require('net');
 constassert=require('assert');
 -constfp='/tmp/fadagagsdfgsdf';
 -constc=net.connect(fp);
 -c.on('connect',common.mustNotCall());
 +{
 +constfp='/tmp/fadagagsdfgsdf';
 +constc=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"optionmustbeastring:\[objectObject]/
 +);
 +}