net: throw error if port does not exist in options

Throw error ERR_PROPERTY_NOT_IN_OBJECT if the port property does not exist in the options object argument when calling server.listen(). Refs: nodejs#16712
yanivfriedensohn · Aug 22, 2018 · 6a90ec5 · 6a90ec5
1 parent 36468ca
commit 6a90ec5
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/doc/api/errors.md b/doc/api/errors.md
@@ -1455,6 +1455,11 @@ A Node.js API was called in an unsupported manner, such as
 
 A given value is out of the accepted range.
 
+<a id="ERR_PROPERTY_NOT_IN_OBJECT"></a>
+### ERR_PROPERTY_NOT_IN_OBJECT
+
+A property does not exist in an object.
+
 <a id="ERR_REQUIRE_ESM"></a>
 ### ERR_REQUIRE_ESM
 

diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -773,6 +773,7 @@ E('ERR_OUT_OF_RANGE',
     msg += ` Received ${value}`;
     return msg;
   }, RangeError);
+E('ERR_PROPERTY_NOT_IN_OBJECT', '%s does not exist in %s', TypeError);
 E('ERR_REQUIRE_ESM', 'Must use import to load ES Module: %s', Error);
 E('ERR_SCRIPT_EXECUTION_INTERRUPTED',
   'Script execution was interrupted by `SIGINT`', Error);

diff --git a/lib/net.js b/lib/net.js
@@ -71,6 +71,7 @@ const {
   ERR_INVALID_FD_TYPE,
   ERR_INVALID_IP_ADDRESS,
   ERR_INVALID_OPT_VALUE,
+  ERR_PROPERTY_NOT_IN_OBJECT,
   ERR_SERVER_ALREADY_LISTEN,
   ERR_SERVER_NOT_RUNNING,
   ERR_SOCKET_BAD_PORT,
@@ -1496,6 +1497,10 @@ Server.prototype.listen = function(...args) {
     return this;
   }
 
+  if (typeof options === 'object' && !('port' in options)) {
+    throw new ERR_PROPERTY_NOT_IN_OBJECT('port', 'options');
+  }
+
   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
@@ -57,12 +57,22 @@ 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)) {
+      common.expectsError(block,
+                          {
+                            code: 'ERR_PROPERTY_NOT_IN_OBJECT',
+                            type: TypeError,
+                            message: 'port does not exist in options',
+                          });
+    } else {
+      common.expectsError(block,
+                          {
+                            code: 'ERR_INVALID_OPT_VALUE',
+                            type: TypeError,
+                            message: /^The value "{.*}" is invalid for option "options"$/
+                          });
+    }
   }
 
   shouldFailToListen(false, { port: false });