lib: fix validateport error message when allowZero is false

rickyes · targos · commit c822f12f0e8d · 2020-05-07T10:05:22.000+02:00
PR-URL: #32861 Fixes: #32857 Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -1310,8 +1310,12 @@ E('ERR_SERVER_NOT_RUNNING', 'Server is not running.', Error);
 E('ERR_SOCKET_ALREADY_BOUND', 'Socket is already bound', Error);
 E('ERR_SOCKET_BAD_BUFFER_SIZE',
   'Buffer size must be a positive integer', TypeError);
-E('ERR_SOCKET_BAD_PORT',
-  '%s should be >= 0 and < 65536. Received %s.', RangeError);
+E('ERR_SOCKET_BAD_PORT', (name, port, allowZero = true) => {
+  assert(typeof allowZero === 'boolean',
+         "The 'allowZero' argument must be of type boolean.");
+  const operator = allowZero ? '>=' : '>';
+  return `${name} should be ${operator} 0 and < 65536. Received ${port}.`;
+}, RangeError);
 E('ERR_SOCKET_BAD_TYPE',
   'Bad socket type specified. Valid types are: udp4, udp6', TypeError);
 E('ERR_SOCKET_BUFFER_SIZE',
diff --git a/lib/internal/validators.js b/lib/internal/validators.js
@@ -179,7 +179,7 @@ function validatePort(port, name = 'Port', { allowZero = true } = {}) {
       +port !== (+port >>> 0) ||
       port > 0xFFFF ||
       (port === 0 && !allowZero)) {
-    throw new ERR_SOCKET_BAD_PORT(name, port);
+    throw new ERR_SOCKET_BAD_PORT(name, port, allowZero);
   }
   return port | 0;
 }
diff --git a/test/parallel/test-dgram-connect.js b/test/parallel/test-dgram-connect.js
@@ -60,7 +60,7 @@ assert.throws(() => {
     client.connect(port);
   }, {
     name: 'RangeError',
-    message: /^Port should be >= 0 and < 65536/,
+    message: /^Port should be > 0 and < 65536/,
     code: 'ERR_SOCKET_BAD_PORT'
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ function validatePort(port, name = 'Port', { allowZero = true } = {}) {`
`179`	`179`	`+port !== (+port >>> 0) \|\|`
`180`	`180`	`port > 0xFFFF \|\|`
`181`	`181`	`(port === 0 && !allowZero)) {`
`182`		`- throw new ERR_SOCKET_BAD_PORT(name, port);`
	`182`	`+ throw new ERR_SOCKET_BAD_PORT(name, port, allowZero);`
`183`	`183`	`}`
`184`	`184`	`return port \| 0;`
`185`	`185`	`}`