Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

http2: wait for secureConnect before initializing #32958

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/_tls_wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@ function TLSSocket(socket, opts) {
this._securePending = false;
this._newSessionPending = false;
this._controlReleased = false;
this.secureConnecting = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is never set to false on client sockets.
So if Http2Session constructor (in lib/internal/http2/core.js) is called after secureConnect is emitted, then secureConnecting is still true but it'll end up never calling setupHandle and connect will never be emitted.

this._SNICallback = null;
this.servername = null;
this.alpnProtocol = null;
Expand Down Expand Up @@ -1026,6 +1027,7 @@ function onServerSocketSecure() {

if (!this.destroyed && this._releaseControl()) {
debug('server emit secureConnection');
this.secureConnecting = false;
this._tlsOptions.server.emit('secureConnection', this);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/http2/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ class Http2Session extends EventEmitter {
socket.disableRenegotiation();

const setupFn = setupHandle.bind(this, socket, type, options);
if (socket.connecting) {
if (socket.connecting || socket.secureConnecting) {
const connectEvent =
socket instanceof tls.TLSSocket ? 'secureConnect' : 'connect';
socket.once(connectEvent, () => {
Expand Down
80 changes: 80 additions & 0 deletions test/internet/test-http2-issue-32922.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
'use strict';
const common = require('../common');
const assert = require('assert');

if (!common.hasCrypto)
common.skip('missing crypto');

const http2 = require('http2');
const net = require('net');

const {
HTTP2_HEADER_PATH,
} = http2.constants;

// Create a normal session, as a control case
function normalSession(cb) {
http2.connect('https://google.com', (clientSession) => {
let error = null;
const req = clientSession.request({ [HTTP2_HEADER_PATH]: '/' });
req.on('error', (err) => {
error = err;
});
req.on('response', (_headers) => {
req.on('data', (_chunk) => { });
req.on('end', () => {
clientSession.close();
return cb(error);
});
});
});
}
normalSession(common.mustCall(function(err) {
assert.ifError(err);
}));

// Create a session using a socket that has not yet finished connecting
function socketNotFinished(done) {
const socket2 = net.connect(443, 'google.com');
http2.connect('https://google.com', { socket2 }, (clientSession) => {
let error = null;
const req = clientSession.request({ [HTTP2_HEADER_PATH]: '/' });
req.on('error', (err) => {
error = err;
});
req.on('response', (_headers) => {
req.on('data', (_chunk) => { });
req.on('end', () => {
clientSession.close();
socket2.destroy();
return done(error);
});
});
});
}
socketNotFinished(common.mustCall(function(err) {
assert.ifError(err);
}));

// Create a session using a socket that has finished connecting
function socketFinished(done) {
const socket = net.connect(443, 'google.com', () => {
http2.connect('https://google.com', { socket }, (clientSession) => {
let error = null;
const req = clientSession.request({ [HTTP2_HEADER_PATH]: '/' });
req.on('error', (err) => {
error = err;
});
req.on('response', (_headers) => {
req.on('data', (_chunk) => { });
req.on('end', () => {
clientSession.close();
return done(error);
});
});
});
});
}
socketFinished(common.mustCall(function(err) {
assert.ifError(err);
}));