tls: use validateNumber for options.minDHSize

If user sets invalid type for options.minDHSize in tls.connect(), it's not internal issue of Node.js. So validateNumber() is more proper than assert(). Plus, set min of validateNumber() as 1 to check minDHSize is positive. Refs: nodejs#49896 PR-URL: nodejs#49973 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
alexfernandez · Nov 1, 2023 · cf19def · cf19def
1 parent e46a76a
commit cf19def
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -1749,11 +1749,7 @@ exports.connect = function connect(...args) {
     options.singleUse = true;
 
   validateFunction(options.checkServerIdentity, 'options.checkServerIdentity');
-  assert(typeof options.minDHSize === 'number',
-         'options.minDHSize is not a number: ' + options.minDHSize);
-  assert(options.minDHSize > 0,
-         'options.minDHSize is not a positive number: ' +
-         options.minDHSize);
+  validateNumber(options.minDHSize, 'options.minDHSize', 1);
 
   const context = options.secureContext || tls.createSecureContext(options);
 

diff --git a/test/parallel/test-tls-client-mindhsize.js b/test/parallel/test-tls-client-mindhsize.js
@@ -74,16 +74,23 @@ testDHE1024();
 assert.throws(() => test(512, true, common.mustNotCall()),
               /DH parameter is less than 1024 bits/);
 
-let errMessage = /minDHSize is not a positive number/;
-[0, -1, -Infinity, NaN].forEach((minDHSize) => {
-  assert.throws(() => tls.connect({ minDHSize }),
-                errMessage);
-});
+for (const minDHSize of [0, -1, -Infinity, NaN]) {
+  assert.throws(() => {
+    tls.connect({ minDHSize });
+  }, {
+    code: 'ERR_OUT_OF_RANGE',
+    name: 'RangeError',
+  });
+}
 
-errMessage = /minDHSize is not a number/;
-[true, false, null, undefined, {}, [], '', '1'].forEach((minDHSize) => {
-  assert.throws(() => tls.connect({ minDHSize }), errMessage);
-});
+for (const minDHSize of [true, false, null, undefined, {}, [], '', '1']) {
+  assert.throws(() => {
+    tls.connect({ minDHSize });
+  }, {
+    code: 'ERR_INVALID_ARG_TYPE',
+    name: 'TypeError',
+  });
+}
 
 process.on('exit', function() {
   assert.strictEqual(nsuccess, 1);