From 4a0466f23a67a8b17d652ea5c5b89dd202f3160c Mon Sep 17 00:00:00 2001
From: Yaniv Friedensohn <yaniv.friedensohn@gmail.com>
Date: Thu, 2 Aug 2018 13:28:14 +0300
Subject: [PATCH] net: throw error if port/path does not exist in options

Throw error ERR_INVALID_ARG_VALUE if the port and path properties
do not exist in the options object argument when calling
server.listen().

Refs: https://github.com/nodejs/node/issues/16712

PR-URL: https://github.com/nodejs/node/pull/22085
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
---
 lib/net.js                                    |  6 ++++
 .../test-net-server-listen-options.js         | 30 ++++++++++++++-----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/net.js b/lib/net.js
index 090ab9f0234dc0..e78e1b6f3fb942 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -68,6 +68,7 @@ const errors = require('internal/errors');
 const {
   ERR_INVALID_ADDRESS_FAMILY,
   ERR_INVALID_ARG_TYPE,
+  ERR_INVALID_ARG_VALUE,
   ERR_INVALID_FD_TYPE,
   ERR_INVALID_IP_ADDRESS,
   ERR_INVALID_OPT_VALUE,
@@ -1496,6 +1497,11 @@ Server.prototype.listen = function(...args) {
     return this;
   }
 
+  if (!(('port' in options) || ('path' in options))) {
+    throw new ERR_INVALID_ARG_VALUE('options', options,
+                                    'must have the property "port" or "path"');
+  }
+
   throw new ERR_INVALID_OPT_VALUE('options', util.inspect(options));
 };
 
diff --git a/test/parallel/test-net-server-listen-options.js b/test/parallel/test-net-server-listen-options.js
index 4f7a6bd28f561a..41cc07d40d4d6e 100644
--- a/test/parallel/test-net-server-listen-options.js
+++ b/test/parallel/test-net-server-listen-options.js
@@ -57,12 +57,23 @@ const listenOnPort = [
     const block = () => {
       net.createServer().listen(options, common.mustNotCall());
     };
-    common.expectsError(block,
-                        {
-                          code: 'ERR_INVALID_OPT_VALUE',
-                          type: TypeError,
-                          message: /^The value "{.*}" is invalid for option "options"$/
-                        });
+
+    if (typeof options === 'object' &&
+      !(('port' in options) || ('path' in options))) {
+      common.expectsError(block,
+                          {
+                            code: 'ERR_INVALID_ARG_VALUE',
+                            type: TypeError,
+                            message: /^The argument 'options' must have the property "port" or "path"\. Received .+$/,
+                          });
+    } else {
+      common.expectsError(block,
+                          {
+                            code: 'ERR_INVALID_OPT_VALUE',
+                            type: TypeError,
+                            message: /^The value "{.*}" is invalid for option "options"(?:\. .+)?$/,
+                          });
+    }
   }
 
   shouldFailToListen(false, { port: false });
@@ -73,6 +84,11 @@ const listenOnPort = [
   shouldFailToListen({ fd: -1 });
   // Invalid path in listen(options)
   shouldFailToListen({ path: -1 });
-  // Host without port
+
+  // Neither port or path are specified in options
+  shouldFailToListen({});
   shouldFailToListen({ host: 'localhost' });
+  shouldFailToListen({ host: 'localhost:3000' });
+  shouldFailToListen({ host: { port: 3000 } });
+  shouldFailToListen({ exclusive: true });
 }