mirror of
https://github.com/nodejs/node.git
synced 2026-10-14 10:26:26 -04:00
tls: reapply servername on happy eyeballs connect
When establishing a TLS connection to a server with `autoSelectFamily` set to `true`, the `net.Socket` will call `[kWrapConnectedHandle]()` to reinitialize the socket (in case if it got broken during previous connect attempts). Unfortunately, prior to this patch this resulted in a brand new `TLSWrap` instance being created for the socket. While most of the configuration of `TLSWrap` is restored, the `servername` was sadly dropped and not reinitalized. With this patch `servername` will be reinitialized if there are `tls.connect` options present on the `TLSSocket` instance, making it possible to connect with "Happy Eyeballs" to TLS servers that require the servername extension. PR-URL: https://github.com/nodejs/node/pull/48255 Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
This commit is contained in:
1 parent
5d685e4198
commit
2fca7ea2be
2 files changed
+16
-3
No files matched your search
@@ -832,6 +832,14 @@ TLSSocket.prototype._init = function(socket, wrap) {
|
||||
}
|
||||
}
|
||||
|
||||
// We can only come here via [kWrapConnectedHandle]() call that happens
|
||||
// if the connection is established with `autoSelectFamily` set to `true`.
|
||||
const connectOptions = this[kConnectOptions];
|
||||
if (!options.isServer && connectOptions) {
|
||||
if (connectOptions.servername) {
|
||||
this.setServername(connectOptions.servername);
|
||||
}
|
||||
}
|
||||
|
||||
if (options.handshakeTimeout > 0)
|
||||
this.setTimeout(options.handshakeTimeout, this._handleTimeout);
|
||||
|
||||
@@ -74,7 +74,8 @@ function createDnsServer(ipv6Addr, ipv4Addr, cb) {
|
||||
// Test that IPV4 is reached if IPV6 is not reachable
|
||||
{
|
||||
createDnsServer('::1', '127.0.0.1', common.mustCall(function({ dnsServer, lookup }) {
|
||||
const ipv4Server = createServer(options, common.mustCall((_, res) => {
|
||||
const ipv4Server = createServer(options, common.mustCall((req, res) => {
|
||||
assert.strictEqual(req.socket.servername, 'example.org');
|
||||
res.writeHead(200, { Connection: 'close' });
|
||||
res.end('response-ipv4');
|
||||
}));
|
||||
@@ -86,6 +87,7 @@ function createDnsServer(ipv6Addr, ipv4Addr, cb) {
|
||||
lookup,
|
||||
rejectUnauthorized: false,
|
||||
autoSelectFamily: true,
|
||||
servername: 'example.org',
|
||||
},
|
||||
(res) => {
|
||||
assert.strictEqual(res.statusCode, 200);
|
||||
@@ -111,12 +113,14 @@ function createDnsServer(ipv6Addr, ipv4Addr, cb) {
|
||||
// Test that IPV4 is NOT reached if IPV6 is reachable
|
||||
if (common.hasIPv6) {
|
||||
createDnsServer('::1', '127.0.0.1', common.mustCall(function({ dnsServer, lookup }) {
|
||||
const ipv4Server = createServer(options, common.mustNotCall((_, res) => {
|
||||
const ipv4Server = createServer(options, common.mustNotCall((req, res) => {
|
||||
assert.strictEqual(req.socket.servername, 'example.org');
|
||||
res.writeHead(200, { Connection: 'close' });
|
||||
res.end('response-ipv4');
|
||||
}));
|
||||
|
||||
const ipv6Server = createServer(options, common.mustCall((_, res) => {
|
||||
const ipv6Server = createServer(options, common.mustCall((req, res) => {
|
||||
assert.strictEqual(req.socket.servername, 'example.org');
|
||||
res.writeHead(200, { Connection: 'close' });
|
||||
res.end('response-ipv6');
|
||||
}));
|
||||
@@ -131,6 +135,7 @@ if (common.hasIPv6) {
|
||||
lookup,
|
||||
rejectUnauthorized: false,
|
||||
autoSelectFamily: true,
|
||||
servername: 'example.org',
|
||||
},
|
||||
(res) => {
|
||||
assert.strictEqual(res.statusCode, 200);
|
||||
|
||||
Reference in new issue
Block a user