From 5584c8d6343caefec1bea35d54e7d5e29ed0dadd Mon Sep 17 00:00:00 2001 From: Paolo Insogna Date: Thu, 19 Nov 2026 09:39:34 +0100 Subject: [PATCH] tls: destroy socket when newSession listener throws Route exceptions thrown by `newSession` listeners to `socket.destroy(err)`, like the other handshake callback guards, instead of re-emitting them on the server. Update the regression test to run without a server `error` listener. Assisted-By: OpenAI GPT-5.6 Sol Signed-off-by: Paolo Insogna --- lib/internal/tls/wrap.js | 2 +- ...ls-psk-alpn-callback-exception-handling.js | 33 +++++++++---------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/lib/internal/tls/wrap.js b/lib/internal/tls/wrap.js index 9444652c66d4..2e8efc251282 100644 --- a/lib/internal/tls/wrap.js +++ b/lib/internal/tls/wrap.js @@ -508,7 +508,7 @@ function onnewsession(sessionId, session) { try { hasEmitted = owner.server.emit('newSession', sessionId, session, done); } catch (err) { - owner.server.emit('error', err); + return owner.destroy(err); } if (!hasEmitted) done(); diff --git a/test/parallel/test-tls-psk-alpn-callback-exception-handling.js b/test/parallel/test-tls-psk-alpn-callback-exception-handling.js index 50701b633e94..d00a3da6f130 100644 --- a/test/parallel/test-tls-psk-alpn-callback-exception-handling.js +++ b/test/parallel/test-tls-psk-alpn-callback-exception-handling.js @@ -114,7 +114,7 @@ describe('TLS callback exception handling', () => { await promise; }); - it('newSession synchronous error emits error', { + it('newSession synchronous error destroys the socket', { skip: isBoringSSL && 'BoringSSL does not trigger the TLS 1.3 newSession callback in this test', }, async (t) => { @@ -123,40 +123,37 @@ describe('TLS callback exception handling', () => { cert: fixtures.readKey('agent2-cert.pem'), sessionTimeout: 3600, }); - const agent = new https.Agent({ - keepAlive: false, - keepAliveMsecs: 10_000, - maxSockets: 5, - }); - t.after(() => { - agent.destroy(); server.close(); }); - const { promise, resolve } = createTestPromise(); + const { promise, resolve, reject } = createTestPromise(); const expectedError = new Error(); - server.on('newSession', common.mustCall(() => { - setImmediate(resolve); + server.on('newSession', common.mustCallAtLeast(() => { throw expectedError; - }, 2)); + })); - server.on('error', common.mustCall((e) => { - assert.strictEqual(e, expectedError); - }, 2)); + server.on('secureConnection', common.mustCall((socket) => { + socket.on('error', common.mustCall((err) => { + try { + assert.strictEqual(err, expectedError); + assert.strictEqual(socket.destroyed, true); + resolve(); + } catch (e) { + reject(e); + } + })); + })); await new Promise((res) => server.listen(0, res)); - // We might need one or two requests to trigger the `resumeSession` event const clientOptions = { port: server.address().port, host: '127.0.0.1', rejectUnauthorized: false, }; - // First connection: Establish a session const socket = tls.connect(clientOptions, common.mustCall(() => { - // Close immediately to allow session resumption on next connect socket.end(); }));