tls: fix SNICallback without .server option
`options.server` only needs to be set when its contents are actually being inspected. PR-URL: https://github.com/nodejs/node/pull/17835 Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
9e5ccf0313
commit
46510f54be
@ -505,9 +505,8 @@ TLSSocket.prototype._init = function(socket, wrap) {
|
|||||||
if (process.features.tls_sni &&
|
if (process.features.tls_sni &&
|
||||||
options.isServer &&
|
options.isServer &&
|
||||||
options.SNICallback &&
|
options.SNICallback &&
|
||||||
options.server &&
|
|
||||||
(options.SNICallback !== SNICallback ||
|
(options.SNICallback !== SNICallback ||
|
||||||
options.server._contexts.length)) {
|
(options.server && options.server._contexts.length))) {
|
||||||
assert(typeof options.SNICallback === 'function');
|
assert(typeof options.SNICallback === 'function');
|
||||||
this._SNICallback = options.SNICallback;
|
this._SNICallback = options.SNICallback;
|
||||||
ssl.enableCertCb();
|
ssl.enableCertCb();
|
||||||
|
26
test/parallel/test-tls-socket-snicallback-without-server.js
Normal file
26
test/parallel/test-tls-socket-snicallback-without-server.js
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
// This is based on test-tls-securepair-fiftharg.js
|
||||||
|
// for the deprecated `tls.createSecurePair()` variant.
|
||||||
|
|
||||||
|
const common = require('../common');
|
||||||
|
if (!common.hasCrypto)
|
||||||
|
common.skip('missing crypto');
|
||||||
|
|
||||||
|
const assert = require('assert');
|
||||||
|
const tls = require('tls');
|
||||||
|
const fixtures = require('../common/fixtures');
|
||||||
|
const makeDuplexPair = require('../common/duplexpair');
|
||||||
|
|
||||||
|
const { clientSide, serverSide } = makeDuplexPair();
|
||||||
|
new tls.TLSSocket(serverSide, {
|
||||||
|
isServer: true,
|
||||||
|
SNICallback: common.mustCall((servername, cb) => {
|
||||||
|
assert.strictEqual(servername, 'www.google.com');
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
// captured traffic from browser's request to https://www.google.com
|
||||||
|
const sslHello = fixtures.readSync('google_ssl_hello.bin');
|
||||||
|
|
||||||
|
clientSide.write(sslHello);
|
Loading…
x
Reference in New Issue
Block a user