tls: use `validateFunction` for `options.SNICallback` · nodejs/node@b71c8c4 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 632
• Pull requests 754
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit b71c8c4

Browse filesBrowse the repository at this point in the historyBrowse files

deokjinkim

authored and

targos

committed

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(). PR-URL: #50530 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

1 parent 5fa40be commit b71c8c4
Copy full SHA for b71c8c4

2 files changed

+17-7Lines changed: 17 additions & 7 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • _tls_wrap.js
• test/parallel
  • test-tls-snicallback-error.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/_tls_wrap.js‎

Copy file name to clipboardExpand all lines: lib/_tls_wrap.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -909,7 +909,7 @@ TLSSocket.prototype._init = function(socket, wrap) {
909	909	options.SNICallback &&
910	910	(options.SNICallback !== SNICallback ||
911	911	(options.server && options.server._contexts.length))) {
912		- assert(typeof options.SNICallback === 'function');
	912	+ validateFunction(options.SNICallback, 'options.SNICallback');
913	913	this._SNICallback = options.SNICallback;
914	914	ssl.enableCertCb();
915	915	}

Collapse file

‎test/parallel/test-tls-snicallback-error.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-tls-snicallback-error.js

+16-6Lines changed: 16 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -4,11 +4,21 @@ if (!common.hasCrypto)
4	4	common.skip('missing crypto');
5	5
6	6	const assert = require('assert');
	7	+ const net = require('net');
7	8	const tls = require('tls');
8	9
9		- ['fhqwhgads', 42, {}, []].forEach((testValue) => {
10		- assert.throws(
11		- () => { tls.createServer({ SNICallback: testValue }); },
12		- { code: 'ERR_INVALID_ARG_TYPE', message: /\boptions\.SNICallback\b/ }
13		- );
14		- });
	10	+ for (const SNICallback of ['fhqwhgads', 42, {}, []]) {
	11	+ assert.throws(() => {
	12	+ tls.createServer({ SNICallback });
	13	+ }, {
	14	+ code: 'ERR_INVALID_ARG_TYPE',
	15	+ name: 'TypeError',
	16	+ });
	17	+
	18	+ assert.throws(() => {
	19	+ new tls.TLSSocket(new net.Socket(), { isServer: true, SNICallback });
	20	+ }, {
	21	+ code: 'ERR_INVALID_ARG_TYPE',
	22	+ name: 'TypeError',
	23	+ });
	24	+ }

0 commit comments

Comments

0 (0)