tls: use validateFunction for options.SNICallback

If user uses invalid type for `options.SNICallback` in TLSSocket(), it's not internal issue of Node.js. So validateFunction() is more proper than assert().
nodejs · Nov 2, 2023 · f8d52de · f8d52de
1 parent 45f5c9b
commit f8d52de
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -909,7 909,7 @@ TLSSocket.prototype._init = function(socket, wrap) {
  options.SNICallback &&
  (options.SNICallback !== SNICallback ||
  (options.server && options.server._contexts.length))) {
- assert(typeof options.SNICallback === 'function');
  validateFunction(options.SNICallback, 'options.SNICallback');
  this._SNICallback = options.SNICallback;
  ssl.enableCertCb();
  }

diff --git a/test/parallel/test-tls-snicallback-error.js b/test/parallel/test-tls-snicallback-error.js
@@ -4,11 4,22 @@ if (!common.hasCrypto)
  common.skip('missing crypto');
 
 const assert = require('assert');
 const net = require('net');
 const tls = require('tls');
 
-['fhqwhgads', 42, {}, []].forEach((testValue) => {
- assert.throws(
- () => { tls.createServer({ SNICallback: testValue }); },
- { code: 'ERR_INVALID_ARG_TYPE', message: /\boptions\.SNICallback\b/ }
- );
-});
 for (const SNICallback of ['fhqwhgads', 42, {}, []]) {
  assert.throws(() => {
  tls.createServer({ SNICallback });
  }, {
  code: 'ERR_INVALID_ARG_TYPE',
  name: 'TypeError',
  });
 
  assert.throws(() => {
  new tls.TLSSocket(new net.Socket(), { isServer: true, SNICallback });
  }, {
  code: 'ERR_INVALID_ARG_TYPE',
  name: 'TypeError',
  });
 }