Repository navigation
Conversation
tls.connect({ socket }) over a net.Socket that has not connected yet only
waited for the socket's 'connect' before upgrading it. If that connect
failed, the plain socket emitted 'error' and 'close' but the TLSSocket
never emitted anything, so callers waiting on it hung. Node re-emits the
wrapped socket's 'error' on the TLSSocket and destroys the TLSSocket when
the wrapped socket closes; do the same while waiting for 'connect', and
drop the listeners once the upgrade happens.
|
Warning Review limit reached
Next review available in: 26 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Run ID: 📒 Files selected for processing (2)
Comment |
|
Updated 2:38 PM PT - Aug 13th, 2026
✅ @robobun, your commit 9c8e832106d8afac57a1903601520e1227c9946a passed in 🧪 To try this PR locally: bunx bun-pr 38122That installs a local version of the PR into your bun-38122 --bun |
|
Status: reproduced and fixed, waiting on CI.
|
There was a problem hiding this comment.
LGTM — focused Node compat fix wiring the wrapped socket's error/close to the waiting TLSSocket.
What was reviewed:
- Traced listener lifecycle:
onConnectremoves error+close before upgrading;onCloseremoves connect+error then destroys;onErroris absorbed (no re-emit) once the TLSSocket is already destroyed — no leaked listeners on any path. - Confirmed
_emitTLSErroris onTLSSocket.prototypeand_releaseControl()runs intls.connectbefore these can fire, so the error reaches user listeners. - Checked the four new tests: hermetic (127.0.0.1,
refusedPort()holds a live local port so no listen(0) race), await the actualclose, and cover connect-in-flight / connect-after-wrap / raw.destroy() / tlssock.destroy() variants.
Extended reasoning...
Overview
Adds error and close listeners on the wrapped net.Socket for the wait-for-connect arm of Socket.prototype.connect in src/js/node/net.ts (~22 lines), so a failed underlying connect reaches the TLSSocket instead of leaving it pending or surfacing as an uncaught exception. Four new tests in test/js/node/tls/node-tls-connect.test.ts assert the exact event sequences node v26.3.0 produces.
Security risks
None. This is error/close event forwarding during the pre-handshake window; it does not touch certificate verification, rejectUnauthorized, trust stores, or any handshake logic. The only new call is to the existing _emitTLSError, which routes through node's _tlsError/_controlReleased semantics already in tls.ts.
Level of scrutiny
Moderate — TLS-adjacent networking code, but the change is a small, additive event-listener wiring in a single well-understood branch. The already-connected (upgradeTLSDeferred) and duplex (upgradeDuplexToTLS) arms are untouched; the PR description correctly notes those already have equivalent linkage. I traced each path: on connect the new listeners are removed before the (unchanged) upgrade runs; on close the connect/error listeners are removed and this.destroy() is called (idempotent if already destroyed); onError is guarded by !this.destroyed so a post-destroy connect failure is absorbed but not re-emitted, matching node and the fourth test. The arrow functions correctly bind this to the TLSSocket, and this branch is only reachable when bunTlsSymbol is a function (so _emitTLSError exists on the prototype).
Other factors
- Tests follow the repo's guidance: no sleeps, await the observable
close, wire failure paths explicitly (closed()helper avoidsevents.oncerejecting on the expectederror),await usingdisposes the port holder. TherefusedPort()helper avoids the bind-then-release race by using a held ephemeral local port. - PR description reports all four tests fail on main / with
USE_SYSTEM_BUN=1and pass with the fix over 10 repeated runs, plus a broad set of adjacent tls/net tests remain green. - No CODEOWNERS entry for
src/js/node/net.ts. Matches local style (plain.on/.once/.removeListener, same as neighboring lines 1999–2002).
There was a problem hiding this comment.
Automated review ran and found no bugs. The fix is small and well-tested, but it adds interacting event listeners to the TLS wrap's wait-for-connect state machine in src/js/node/net.ts — a human look at the socket-lifecycle interactions would still be worthwhile.
Checked: listener add/remove pairing (onConnect/onClose each remove the others; .once self-removes), _emitTLSError exists on TLSSocket.prototype and matches node's _controlReleased gating, this.destroy() in onClose is idempotent when the TLSSocket was already destroyed, and .on (not .once) for error matches node's _init. The five new tests cover the variant matrix (connect-in-flight, connect-after-wrap, raw.destroy(), client.destroy(), reconnect-after-failure) and each awaits an actual close rather than sleeping.
Extended reasoning...
Overview
The PR fixes tls.connect({ socket }) when the wrapped net.Socket is still connecting: previously only a connect listener was registered on the underlying connection, so a failed connect (ECONNREFUSED) never reached the TLSSocket — callers waiting on secureConnect/error/close would hang, and the plain socket's error could become an uncaught exception. The fix adds error (routed through _emitTLSError) and close (destroys the TLSSocket) listeners for the waiting period, each removing the others when it fires. This mirrors node's internal/tls/wrap.js _init/_wrapHandle. Two files touched: ~15 net lines in src/js/node/net.ts:2030-2091 and five new tests in test/js/node/tls/node-tls-connect.test.ts.
Security risks
None identified. The change is error-propagation plumbing during the pre-handshake wait; it doesn't touch certificate verification, rejectUnauthorized, or any crypto path. The onError guard (if (!this.destroyed)) prevents emitting on a dead socket rather than suppressing anything security-relevant.
Level of scrutiny
Moderate-to-high. src/js/node/net.ts is core networking infrastructure that underpins TLS/HTTP/HTTPS. The change itself is small and the listener add/remove pairing checks out, but socket-lifecycle state machines in the TLS wrap are subtle — the interaction between onConnect removing onClose, onClose removing onConnect, and the this.destroyed guard in onError deserves a look from someone with deep knowledge of bun's upgrade paths (upgradeTLSDeferred / upgradeDuplexToTLS). Not a mechanical config/typo change.
Other factors
- The PR description is unusually thorough: cites the exact node source lines being mirrored, explains why listeners are scoped to the waiting period (post-upgrade the native handle already reports errors), and documents which existing tests were re-run.
- Test coverage is strong: five cases covering connect-in-flight, connect-after-wrap,
raw.destroy(),client.destroy(), and socket reuse after failure. Tests await realcloseevents (not sleeps), use arefusedPort()helper that holds a live connection's local port to guaranteeECONNREFUSED, and assert exact event sequences includinghadErrorvalues matched against node v26.3.0. - The comment-cop bot's feedback about long comments was addressed in 9c8e832 and both threads are resolved.
- No CODEOWNERS entry covers these paths.
- Verified
_emitTLSErrorexists onTLSSocket.prototype(src/js/node/tls.ts:853) and its semantics (emits_tlsError, thenerrorif_controlReleased) match what the PR description claims.
Builds on #42176, which is merged. The base of this PR is `main`. Consolidates #42240 (the same fix). ### Problem - A TLS upgrade over a generic `Duplex` listens for the transport's `data`, `end`, `drain` and `close`, but not its `error`. So `transport.destroy(err)` after the upgrade throws `err` as an uncaught exception. Node emits it on the TLS socket. - `transport.listenerCount('error')` is 0 in bun and 1 in node v26.3.0. An `https.request` over such a socket kills the process and does not fail the request. ### Fix - `forwardUpgradedError` (`src/js/node/net.ts`) forwards the transport's `error` through `_emitTLSError`. The four stream-engine attach sites call it. A client sees `'error'`. A server wrap keeps it on `'_tlsError'` (`'tlsClientError'` on a `tls.Server`). The transport's `'close'` then ends the socket (#42176). - A `net.Socket` transport (a named pipe, unflushed writes, TLS over TLS) is excluded. Its close paths synthesize a read `ECONNRESET` as soon as anything listens for `'error'`. See Notes. - Verified: `test/js/node/tls/node-tls-connect.test.ts`, 5 new tests. One runs `node-tls-duplex-transport-error-fixture.ts` through `bunRun` (six wrap cases in one subprocess). All 5 fail on `main`. Also `test/js/node/tls` and 9 vendored `test-tls-*` tests. ### Background - A stream with no fd cannot use the kernel TLS path. `upgradeDuplexToTLS` runs a BoringSSL engine over the stream, driven by four native thunks on the stream's events. None is an error thunk. - Node wraps the stream in a `JSStreamSocket`, which re-emits the stream's `'error'`. `TLSSocket._init` forwards that error with `_emitTLSError`. - `_emitTLSError` already exists in `src/js/node/tls.ts`. It emits `'_tlsError'` always, and `'error'` only once `_releaseControl` has run. `tls.connect()` releases control at once, a server socket on `'secure'`. <details><summary>Notes</summary> #### Measurements Each case wraps a `Duplex`, then calls `transport.destroy(new Error("transport failed"))`. Events on the TLS socket (or the request), linux x64, debug+ASAN. The first six rows are `node-tls-duplex-transport-error-fixture.ts`, and the node column is v26.3.0 with the same fixture. The `https.request` row runs in the test process. | case | `main` (has #42176) | this branch | node v26.3.0 | | --- | --- | --- | --- | | `tls.connect({ socket })`, destroy in the same tick | uncaught `transport failed`, non-zero exit | `_tlsError`, `error`, `close:false` | same | | `tls.connect({ socket })`, destroy after the ClientHello | uncaught, non-zero exit | `_tlsError`, `error`, `close:false` | same | | server wrap, destroy in the same tick | uncaught, non-zero exit | `_tlsError`, `close:false` | same | | server wrap, destroy after the engine started | uncaught, non-zero exit | `_tlsError`, `close:false` | same | | `tlsServer.emit("connection", duplex)`, destroy in the same tick | uncaught, non-zero exit | `tlsClientError` with the `TLSSocket`, `close:false` | same | | `tlsServer.emit("connection", duplex)`, destroy after the engine started | uncaught, non-zero exit | `tlsClientError` with the `TLSSocket`, `close:false` | same | | `https.request` over the wrap | uncaught, non-zero exit | `req.error`, `req.close` with `req.destroyed === true` | same | A transport that errors without closing also matches node: the error reaches the TLS socket and the socket stays alive (`destroyed === false`). Two more cases from #42240, measured by hand on this branch (no test): | case | bun 1.4.3-canary.1 | this branch | node v26.3.0 | | --- | --- | --- | --- | | `tlsSocket.destroy()` over `Duplex.from({ readable, writable })` | uncaught `ABORT_ERR` | `error:ABORT_ERR`, `close:false` | same | | transport whose `write` calls back with an error, `s.write(data, cb)` queued | uncaught `EBOOM`, `cb` never called, no `'close'` | `error:EBOOM`, `cb(ERR_SOCKET_CLOSED)`, `close:false` | `error:EBOOM`, `cb(ECANCELED)`, `close:false` | The callback code in the last row differs because node cancels the queued write through `JSStreamSocket.doClose`. #35386 covers `ECANCELED` for cancelled TLS writes. #### Consolidation of #42240 #42240 carried the same listener with the same `net.Socket` guard. This branch keeps the test shape the review here asked for (`bunRun`, a fixture file, a one-line comment plus the node links). The cases that only #42240 had are now in the fixture: a server wrap at both timings, `https.request` over the wrap, `'_tlsError'`, and the `'close'` `hadError` flag. #42176 dropped the `attachUpgradedDuplex` helper that both PRs had patched. It now attaches the four thunks inline at each site. So the listener moved to `forwardUpgradedError`, which each site calls after it attaches the four thunks. #### Scope: every `net.Socket` transport is left out Two arms wrap a `net.Socket`, and neither gets the listener: - The fd-adoption arm. `tls.connect({ socket: connectedNetSocket })` with no queued writes hands the fd to a native TLS pair (`upgradeTLS`) and attaches nothing to the `net.Socket`. - The stream-level engine over a `net.Socket`: TLS over TLS, a named pipe, or a socket with queued plain writes. These reach `forwardUpgradedError` and the `instanceof Socket` check skips them. Node attaches the same listener in both, so `sock.destroy(err)` on such a transport is still uncaught in bun. The reason is one mechanism. `SocketEmitEndNT`, `SocketHandlers2.close`, `failWrite` and `ServerHandlers.error` turn a peer reset into `destroy(ECONNRESET)` only when the socket has an `'error'` listener, and stay silent otherwise. A forwarder counts as a listener. The first push of #42240 attached it to every transport. `test-tls-inception.js` (TLS over TLS, no `'error'` listener anywhere) then failed on Windows x64, Windows arm64 and macOS arm64 with an uncaught `read ECONNRESET`. On Windows x64 the base passed 5 of 5 runs, that push failed 5 of 5, and the narrowed listener passed 6 of 6. Those arms also have a second route to the same failure (the raw socket's own dispatch), so they need the de-duplication that #36534 and #38122 are about. `new tls.TLSSocket(stream)` with no `connect()` wraps nothing today, so nothing reaches it there either. That is #37664's subject. `_http2_upgrade.ts` has a fifth copy of the same four `.on()` calls. #38124 routes its transport error to the h2 session. #### Fixture startup The fixture runs its six cases in one subprocess and takes the key and the cert from `KEY` and `CERT`, which the test sets. An earlier shape ran five subprocesses at once, and each imported `harness`. A debug build needs about 1.5 s to load `node:tls` and about 1 s more for `harness`, so on a loaded machine (load average 150 on 16 cores) two of the five reached the 5 s test timeout. The one subprocess takes 2.1 to 2.8 s on the same machine. #### Suites `test/js/node/tls/node-tls-connect.test.ts`: 84 pass, 0 fail. `test/js/node/tls/`: 391 pass, 3 fail, none on the Duplex wrap path. `SNICallback runs even when the requested servername matches the bind hostname` binds `localhost` and connects to `127.0.0.1`, and fails the same way on the released binary in this container. `tls.Server socket destroySoon > delivers the whole stream when destroySoon follows end` (64 rounds of 2 MB) times out at 5 s on this debug build, and does the same with `main`'s `net.ts`. `root certificate initialization > concurrent Workers all see the same CA certificate lists` times out in some runs on this loaded machine. Vendored, all exit 0: `test-tls-inception`, `test-tls-js-stream`, `test-tls-connect-given-socket`, `test-tls-delayed-attach-error`, `test-tls-socket-failed-handshake-emits-error`, `test-tls-over-http-tunnel`, `test-tls-starttls-server`, `test-tls-destroy-stream`, `test-https-agent-create-connection`. </details> <!-- robobun:evidence:begin --> --- **[human-review]** gate passed · iteration 0 · 3 files touched <details><summary>fails on main (without fix)</summary> ```console ASAN without fix: 7 failed, 18 skipped $ BUN_DEBUG_QUIET_LOGS=1 bun scripts/build.ts --profile=debug --quiet test "--reporter=junit" "--reporter-outfile=/tmp/pr_gate.xml" test/js/node/tls/node-tls-connect.test.ts bun test v1.4.3 (367d939) test/js/node/tls/node-tls-connect.test.ts: (pass) should have checkServerIdentity [4.73ms] (pass) should thow ECONNRESET if FIN is received before handshake [534.04ms] (pass) initializes authorizationError to null in the TLSSocket constructor [6.87ms] (pass) setMaxSendFragment mirrors OpenSSL's [512, 16384] acceptance without throwing [120.38ms] (pass) should be able to grab the JSStreamSocket constructor [14.03ms] (skip) tls.connect > should work with alpnProtocols (pass) tls.connect > Bun.serve() should work with tls and Bun.file() [116.64ms] (pass) tls.connect > should have peer certificate when using self asign certificate [150.83ms] (skip) tls.connect > should have peer certificate (skip) tls.connect > getCipher, getProtocol, getEphemeralKeyInfo, getSharedSigalgs, getSession, exportKeyingMaterial and isSessionReused should work (skip) tls.connect > should process options correctly when connect is called with only options (skip) tls.connect > should process port ... (truncated) release without fix: 11 failed, 18 skipped bun test v1.4.3-canary.1 (367d939) test/js/node/tls/node-tls-connect.test.ts: (pass) should have checkServerIdentity [0.03ms] (pass) should thow ECONNRESET if FIN is received before handshake [6.17ms] (pass) initializes authorizationError to null in the TLSSocket constructor [0.16ms] (pass) setMaxSendFragment mirrors OpenSSL's [512, 16384] acceptance without throwing [3.30ms] (pass) should be able to grab the JSStreamSocket constructor [0.21ms] (skip) tls.connect > should work with alpnProtocols (pass) tls.connect > Bun.serve() should work with tls and Bun.file() [5.48ms] (pass) tls.connect > should have peer certificate when using self asign certificate [4.83ms] (skip) tls.connect > should have peer certificate (skip) tls.connect > getCipher, getProtocol, getEphemeralKeyInfo, getSharedSigalgs, getSession, exportKeyingMaterial and isSessionReused should work (skip) tls.connect > should process options correctly when connect is called with only options (skip) tls.connect > should process port and host correctly (skip) tls.connect > should process port, host, and callback correctly (skip) tls.connect > should handle the absence of a callback gracefully (skip) tls.c ... (truncated) ``` </details> <details><summary>passes on PR (with fix)</summary> ```console ASAN with fix: 18 skipped $ BUN_DEBUG_QUIET_LOGS=1 bun scripts/build.ts --profile=debug --quiet test "--reporter=junit" "--reporter-outfile=/tmp/pr_gate.xml" test/js/node/tls/node-tls-connect.test.ts bun test v1.4.3 (367d939) test/js/node/tls/node-tls-connect.test.ts: (pass) should have checkServerIdentity [3.79ms] (pass) should thow ECONNRESET if FIN is received before handshake [386.28ms] (pass) initializes authorizationError to null in the TLSSocket constructor [6.71ms] (pass) setMaxSendFragment mirrors OpenSSL's [512, 16384] acceptance without throwing [102.58ms] (pass) should be able to grab the JSStreamSocket constructor [15.93ms] (skip) tls.connect > should work with alpnProtocols (pass) tls.connect > Bun.serve() should work with tls and Bun.file() [97.47ms] (pass) tls.connect > should have peer certificate when using self asign certificate [122.29ms] (skip) tls.connect > should have peer certificate (skip) tls.connect > getCipher, getProtocol, getEphemeralKeyInfo, getSharedSigalgs, getSession, exportKeyingMaterial and isSessionReused should work (skip) tls.connect > should process options correctly when connect is called with only options (skip) tls.connect > should process port a ... (truncated) release with fix: 18 skipped $ bun scripts/build.ts --profile=release [configured] bun-profile → bun (stripped) target linux-x64-gnu build type Release build dir ./build/release revision 9098c05 features lto, baseline 23 deps, 136 codegen, 1176 objects in 977ms ninja: Entering directory `/workspace/bun/build/release' [1/4] fetch lolhtml [lolhtml] up to date [2/4] fetch rust-argon2 [rust-argon2] up to date [2/4] cargo plan → /workspace/bun/build/release/rust-target/plan.json 244 units: 172 lib, 16 proc-macro (host), 19 custom-build (host), 15 run custom-build, 17 lib (host), 4 run custom-build (host), 1 rlib [3/4] reconfigure [1/1499] mkdir codegen [2/1499] mkdir stamps [3/1499] install /workspace/bun bun install v1.4.3-canary.1 (367d939) Checked 26 installs across 65 packages (no changes) [15.00ms] [4/1499] install /workspace/bun/packages/bun-error bun install v1.4.3-canary.1 (367d939) Checked 1 install across 2 packages (no changes) [4.00ms] [5/1499] install /workspace/bun/src/node-fallbacks bun install v1.4.3-canary.1 (367d939) Checked 111 installs across 104 packages (no changes) [6.00ms] [6/1499] rustc unicode_ident [7/1499] gen node-fallbacks ... (truncated) ``` </details> <details><summary>diff hotspot</summary> ``` src/js/node/net.ts | 10 ++++ test/js/node/tls/node-tls-connect.test.ts | 45 ++++++++++++++++- .../tls/node-tls-duplex-transport-error-fixture.ts | 58 ++++++++++++++++++++++ 3 files changed, 112 insertions(+), 1 deletion(-) ``` </details> **gate history** · 5 passed · 0 rejected · iteration 0 <details><summary>evidence per changed file</summary> ``` file reads edits tests src/js/node/net.ts 13 12 41 test/js/node/tls/node-tls-connect.test.ts 3 4 39 …/js/node/tls/node-tls-duplex-transport-error-fixture.ts 1 3 44 ``` </details> <!-- robobun:evidence:end --> --------- Co-authored-by: robobun <robobun@bun.sh> Co-authored-by: Ciro Spaciari <ciro.spaciari@gmail.com>
…t wraps (#37664) ### Problem - `new tls.TLSSocket(socket)` on the client side (STARTTLS) does nothing on main. A write throws `TypeError: socket.@Write is not a function`. `_start()` throws `ERR_MISSING_ARGS`. - Since #42181 (not released), `end()` throws an uncaught `TypeError: socket.shutdown is not a function` at `endNT (node:net)`. - Cause: the constructor stored the wrapped stream as `_handle` (`src/js/node/tls.ts`). Nothing replaced it with a TLS handle. ### Fix - The constructor runs the upgrade of `tls.connect({ socket })` (`kUpgradeClientTLS`, `src/js/node/net.ts`). `_handle` is never the stream. `_start()` is a no-op. - The wrap completes like node's `_finishInit`: `'secure'` and `ssl.verifyError()`. It gets no hostname check and no `'secureConnect'`, and `authorized` stays `false`. - Verified: `test/js/node/tls/node-tls-connect.test.ts`. 16 of its 21 new tests fail on main. Also `test/js/node/tls/` and 657 vendored node tests. ### Background - STARTTLS changes a plaintext connection to TLS in place. The `mysql` driver 2.18.1 does it with this constructor. No user filed an issue for it. - In `node:net`, `_write`, `_final` and `_destroy` call into `_handle` as a native handle. - Only `tls.connect()` adds node's `onConnectSecure` (hostname check, `authorized`, `'secureConnect'`). A wrap gets `_finishInit` only. - Considered a start on `_start()`, as in node. Each handle call then needs a guard. ### Downsides - An unused wrap now sends a ClientHello of 1450 bytes (main and node: 0). `setServername()` and `setSession()` after construction have no effect on that handshake. - Unlike node, a wrap rejects an untrusted certificate unless the caller passes `rejectUnauthorized: false`. An app that does its own check must pass `false`. <details><summary>Notes</summary> **Scope.** This head is the core only, as the review of 2026-09-24 asked. The same review decided that a wrap rejects an untrusted certificate by default. Two parts of the earlier head are gone, because other changes own them. #42235 landed the forwarding of the `'error'` of a `Duplex`, and #43791 owns it for a `net.Socket`. #38028 owns the destroy of a wrapped socket that has not connected yet. The `UpgradedDuplex.rs` hunk landed with #36909. The review of 2026-09-25 asked for three more changes: commits 6657bc3 and ae669bf, and this body. The review of 2026-09-30 asked for one more: commit a460a9d. **Changes since the earlier head that the review did not list.** - The `open` handler of an upgraded socket applies the `session` option on the native socket. See "Sessions" below. - A wrap gives the `NODE_TLS_REJECT_UNAUTHORIZED=0` warning of `tls.connect()`. - `authorized` and `authorizationError` keep their initial values on a wrap, as in node. The earlier head set `authorized = true` for a good chain. The wrap checks no host name, so that value accepted a certificate of any host. The verdict is `ssl.verifyError()`. - A wrap does not get `onConnectEnd`. A peer that closes during the handshake gives `'end'`, `'finish'`, `'close'` and no `ECONNRESET`, as in node. `tls.connect({ socket })` keeps its `ECONNRESET`. - `servername` is passed into the upgrade. Before, it reached the ClientHello only when the caller gave no `secureContext`. - `kStandaloneWrap` is initialised in the `Socket` constructor. **Differences from node v26.3.0 that stay.** The review kept the start of the handshake in the constructor. The `mysql` driver, the main user of this API, calls `_start()` right after the constructor, so it sees no difference. | shape | node | this PR | | --- | --- | --- | | wrap that is never used | sends nothing | sends a ClientHello (1450 bytes) | | `setServername()` after the constructor | applies, the handshake starts later | too late. Pass `servername` as an option. | | `setSession()` after the constructor | applies | no effect. Pass `session` as an option. | | untrusted certificate, `rejectUnauthorized` absent or `true` | `'secure'`, the caller must read `ssl.verifyError()` | destroy with the verify error, `'_tlsError'`, no `'secure'` | | untrusted certificate, `rejectUnauthorized: false` | `'secure'`, data flows | the same | | `new TLSSocket(raw)`, then `tls.connect({ socket: raw })` | `EALREADY` on the wrap | `Invalid socket` on the `tls.connect` client (main: works, because its wrap does nothing) | Node never rejects a certificate on a wrap. It leaves the check to the app, so an app that forgets the check accepts any certificate. Here the wrap uses the rule of `tls.connect()`: it rejects unless the caller passes `rejectUnauthorized: false`, or `NODE_TLS_REJECT_UNAUTHORIZED` is `0`. Before commit 4d8b9e5, only `rejectUnauthorized: true` rejected, and a wrap with default options accepted each certificate, as in node. The `mysql` driver listens to `'secure'` and to `'_tlsError'`. If the wrap emitted `'secure'` and then destroyed itself, the driver would report a bad chain two times. The replay test asserts one report. **Sessions.** BoringSSL's `SSL_set_session` calls `abort()` when the handshake has started, in release builds too. `TLSSocket.prototype.setSession()` calls the native function at once, on main and on this head. #41671 puts the guard in the native function, for each caller: a late `setSession()` then throws `Already started.`. An earlier head of this PR made `setSession()` only store the session. The review asked to take that rule out, and commit ae669bf did. For a client-side wrap the review then asked for one narrow rule, in commit a460a9d: the `TLSSocket` constructor sets `kStandaloneWrap`, and `setSession()` returns at once when it is set. | shape | node | main | this PR | | --- | --- | --- | --- | | `new TLSSocket(raw)`, `setSession()`, `_start()` | resumes | throws `ERR_MISSING_ARGS` | no effect, full handshake | | `tls.connect({ socket })`, then `setSession()` | no effect | process aborted | process aborted | | `setSession()` inside `'secureConnect'` | no effect | process aborted | process aborted | | `tls.connect({ port })`, then `setSession()` before it connects | resumes | resumes | resumes | | `tls.connect({ port })`, then `setSession()` in the `'connect'` listener | full handshake | resumes | resumes | | `tls.connect({ socket, session })` | resumes | full handshake | resumes | | `new TLSSocket(raw, { session })` | resumes | throws `ERR_MISSING_ARGS` | resumes | In the first row, the wrap has sent its ClientHello when `setSession()` runs. Without the check in `setSession()`, that row aborts the process (exit 134). The rule also holds for a wrap over a socket that is still connecting: node resumes there, and this PR runs a full handshake. The last two rows come from one hunk that stays. `SocketHandlers2.open` applies the `session` option on the native socket. An fd upgrade assigns `_handle` after `open`, so `self.setSession()` dropped the option there. **Two bugs of main that this PR does not fix. An open PR owns each.** - The native `setSession()` has no check of the handshake state. `socket.setSession()` in the `handshake` callback of a `Bun.connect` socket aborts the process (exit 134, release build of main). #41671 fixes it in `set_session` in `src/runtime/socket/tls_socket_functions.rs`, for each caller. It makes a late `setSession()` throw `Already started.`. - Over a `Duplex`, TLS inside TLS, or a named pipe, a handshake that fails is reported as success. A peer that answers the ClientHello with plaintext gives `'secureConnect'` for `tls.connect({ socket: duplex, rejectUnauthorized: false })` on main, and `'secure'` for a wrap with `rejectUnauthorized: false` here. Node gives `ERR_SSL_WRONG_VERSION_NUMBER`. Over a TCP socket the result is correct. The stream engine in `src/uws/lib.rs` reports no protocol error. #32929 fixes it there. One more door of the same bug: with `rejectUnauthorized: true` and the `session` of an earlier verified connection, `tls.connect({ socket: duplex })` emits `'secureConnect'` with `authorized` true on main, and a wrap emits `'secure'` with `ssl.verifyError()` null here. A write after that fails with `ERR_SOCKET_CLOSED`, and no byte reaches the transport. Reproduction for the first one (needs a key and a certificate, for example `test/js/node/tls/fixtures/agent1-*.pem`): ```ts const server = Bun.listen({ hostname: "127.0.0.1", port: 0, tls: { key, cert }, socket: { data() {}, open() {}, error() {} } }); await Bun.connect({ hostname: "127.0.0.1", port: server.port, tls: { rejectUnauthorized: false }, socket: { data() {}, error() {}, handshake(socket) { socket.setSession(socket.getSession()); /* the process aborts here */ } }, }); ``` Reproduction for the second one: ```js const tls = require("tls"), { Duplex } = require("stream"); let answered = false; const raw = new Duplex({ read() {}, write(chunk, encoding, callback) { callback(); if (!answered) { answered = true; setImmediate(() => this.push(Buffer.from("HTTP/1.1 400 Bad Request\r\n\r\n"))); } }, }); const socket = tls.connect({ socket: raw, rejectUnauthorized: false }); socket.on("secureConnect", () => console.log("secureConnect")); // main prints this socket.on("error", error => console.log(error.code)); // node prints ERR_SSL_WRONG_VERSION_NUMBER ``` **Gaps that this PR does not close.** Each one also exists on main for `tls.connect({ socket })`, with the same result. | shape | node | this PR | owner | | --- | --- | --- | --- | | `end()` or `destroySoon()` before the socket connects | waits for `'connect'`, then sends the FIN | `'finish'` at once, no FIN | #42339 | | refused connection under a wrap | `'_tlsError'`, `'close'` | uncaught `ECONNREFUSED`, the wrap stays open | #38122 | | `end()` over a `Duplex` before the handshake completes | runs the `final()` of the `Duplex` | `'finish'`, no `final()` | #42350 | A wrapped `Duplex` that fails when it is read was in this list. #42235 landed, and the wrap now reports `'_tlsError'` and then `'close'`, as node does (measured on d31efd7). **Inherited options.** `kUpgradeClientTLS` passed a plain `{ socket, servername }` object to `Socket.prototype.connect`, and that function reads `rejectUnauthorized` through the prototype chain. With `Object.prototype.rejectUnauthorized = false`, the wrap accepted an untrusted certificate, also with an explicit `rejectUnauthorized: true`. Commit 6657bc3 passes the decision of the constructor as an own property, as `tls.connect()` does. Measured on this head under that pollution: a wrap with default options, with `{}` and with an explicit `true` rejects, and an own `false` accepts. `new TLSSocket(raw, { rejectUnauthorized: undefined })` with `NODE_TLS_REJECT_UNAUTHORIZED=0` rejects. **`'finish'`.** `new TLSSocket(new PassThrough()).end()` emits `'finish'` and `'close'` on this head. The shutdown cells do not assert `'finish'`. A separate check reports that `'finish'` is lost there when #43962 is applied on top of this PR. This session did not build that combination. Cell by cell for the 21-cell matrix of #42330 on the earlier head: #37664 (comment) **Releases.** Earlier comments in this thread measured the same failures on Bun 1.4.0 and 1.4.3. This session measured main only. **User.** `Connection.prototype._startTLS` in mysql 2.18.1 (`lib/Connection.js`) is the known caller of the client-side constructor. The replay test matches that function line by line, and `lib/protocol/sequences/Handshake.js` sends the SSLRequest and starts TLS with no reply in between. The xmpp report in this thread is for `tls.connect({ socket })`, a different path. A search of the open and closed issues finds no report for the constructor. **Guard design.** #42330 kept the stream as `_handle` and added a guard at 2 of the 6 places that call it as a native handle. **Signatures on main.** `destroy()` on the wrap fails with `handle.close is not a function`. `end()`, `end(cb)` and `destroySoon()` throw `socket.shutdown is not a function` from `process.nextTick`. **Tests.** All are in `test/js/node/tls/node-tls-connect.test.ts`, block `new tls.TLSSocket(socket) on the client side`. - Four reports come from `node-tls-client-wrap-fixture.mjs`. Bun calls its functions in the test process. Node runs the same file as a script. The expected report is the same for both. - `shutdown`: 16 cells. The methods are `end()`, `end(cb)`, `destroySoon()` and `destroy()`. The streams are a connected, a connecting and a never-connected `net.Socket`, and a `Duplex`. Each cell calls the method and then `destroy()`. It asserts no throw, no `'error'` and `'close'`. The cells run together. On main each cell fails with `socket.shutdown is not a function` or `handle.close is not a function`. - `mysql`: the calls of `Connection.prototype._startTLS` in mysql 2.18.1, in the driver's order and at its time. The driver writes the SSLRequest and starts TLS in the same turn, and the server sends no reply in between. Three configurations: `rejectUnauthorized: false`, the CA of the server, no CA. `onSecure` runs one time in each. - `peerCloses`: the peer closes when the ClientHello arrives. - `session`: the `session` option on the three paths, and `setSession()` before the socket connects. Each one resumes. - Both sides of `rejectUnauthorized` run in the test process only, because node accepts in each case. `unlike node, an untrusted certificate destroys the wrap with the verify error` has one case for default options and one for `true`. `with rejectUnauthorized: false, 'secure' fires for an untrusted certificate and a write goes out over TLS` is the other side. `NODE_TLS_REJECT_UNAUTHORIZED=0 turns the default off, as for tls.connect()` pins the environment variable. - `an inherited rejectUnauthorized cannot turn the check of a wrap off` runs in a child process with `Object.prototype.rejectUnauthorized = false`: default options and an own `true` reject, an own `false` accepts. It fails on d31efd7. ``an own `rejectUnauthorized: undefined` still rejects with NODE_TLS_REJECT_UNAUTHORIZED=0, as for tls.connect()`` pins that rule. - `setSession() on a wrap has no effect: it does not abort the process and does not throw` runs in a child process, because the failure is a process abort. Without the check it gets exit code 134. No test covers a late `setSession()` on a `tls.connect()` socket: it aborts the process until #41671 lands. - On main (canary 367d939, release build), 16 of the 21 tests in the block fail. 8 fail at once, and 8 fail by the timeout, because main starts no handshake. The 5 that pass are the http2-wrapper guard and the 4 rows that run node. - The SNI test fails when only the `servername` argument is reverted (`Expected: "sni.example"`, `Received: undefined`). **Cost for callers that never wrap a socket,** from the diff: - per `net.Socket`: one more property store in the constructor. - per TLS `connect()`, per client handshake and per `setSession()`: one more property read and branch. - per `internalConnect` and `internalConnectMultiple`: two property reads and branches fewer. Each `[buntls]` options object has one property fewer. - `tls.connect({ socket })` puts the same bytes on the wire as on main (1452). - This session did not measure instructions, syscalls or binary size: `perf`, `valgrind`, `strace` and `bloaty` are not in the test container. A separate differential check of d31efd7 merged onto main reports equal instruction counts: 10,162,756 (main) and 10,159,922 (this PR) for each TLS connection, and 2,195 and 2,200 for `new net.Socket()`. **Suites run with a debug build of this head.** - On the head a460a9d: `test/js/node/tls/node-tls-connect.test.ts` gives 107 pass, 18 skip, 0 fail with a 30 s limit, in 2 of 2 runs. With the default 5 s limit, 4 to 8 tests reach the timeout in each run on this machine, and the set differs from run to run. Most of them came from main. The load average was 450 to 970 on 16 cores. - One of those tests from main (`server write() and end(data) from inside ALPNCallback`) takes the same time with the source of main and with this PR: 3.9 to 6.4 s and 3.8 to 6.0 s, 10 runs each. - `tsc --noEmit -p src/js/tsconfig.json` and `bun lint` pass on a460a9d. - The suites below ran on the head c81cee3, before the merge of main. - `test/js/node/tls/` (28 files): 2 failures in each run, and this change causes neither. `SNICallback runs even when the requested servername matches the bind hostname` fails on the release build of main too. `concurrent Workers all see the same CA certificate lists` fails 5 of 5 times with the `net.ts` and `tls.ts` of main on the same debug build. In the last run the machine was overloaded, and 2 more tests reached the 5 s timeout. Both pass alone in 3 of 3 runs, and neither builds a client-side wrap. - `test-tls-*`, `test-https-*`, `test-net-*`, `test-http2-*` in `test/js/node/test/parallel` (657 files): no failure from this change. 10 files fail on main too (`test-https-proxy-request*.mjs`, `test-https-request-proxy-post.mjs`, `test-tls-client-allow-partial-trust-chain.js`). `test-https-timeout.js` hangs on a debug build, with the source of main too. - `test/js/bun/net/socket.test.ts`: 94 pass, 1 fail. The failure needs DNS for `www.example.com` and fails on main too. </details> <!-- robobun:evidence:begin --> --- **[human-review]** gate passed · iteration 0 · 5 files touched <details><summary>fails on main (without fix)</summary> ```console ASAN without fix: 16 failed, 18 skipped $ BUN_DEBUG_QUIET_LOGS=1 bun scripts/build.ts --profile=debug --quiet test "--reporter=junit" "--reporter-outfile=/tmp/pr_gate.xml" test/js/node/tls/node-tls-connect.test.ts bun test v1.4.3 (367d939) test/js/node/tls/node-tls-connect.test.ts: (pass) should have checkServerIdentity [3.32ms] (pass) should thow ECONNRESET if FIN is received before handshake [351.98ms] (pass) initializes authorizationError to null in the TLSSocket constructor [9.71ms] (pass) setMaxSendFragment mirrors OpenSSL's [512, 16384] acceptance without throwing [175.18ms] (pass) should be able to grab the JSStreamSocket constructor [18.49ms] (skip) tls.connect > should work with alpnProtocols (pass) tls.connect > Bun.serve() should work with tls and Bun.file() [114.28ms] (pass) tls.connect > should have peer certificate when using self asign certificate [269.78ms] (skip) tls.connect > should have peer certificate (skip) tls.connect > getCipher, getProtocol, getEphemeralKeyInfo, getSharedSigalgs, getSession, exportKeyingMaterial and isSessionReused should work (skip) tls.connect > should process options correctly when connect is called with only options (skip) tls.connect > should process port ... (truncated) release without fix: 34 failed, 18 skipped bun test v1.4.3-canary.1 (367d939) test/js/node/tls/node-tls-connect.test.ts: (pass) should have checkServerIdentity [20.95ms] (pass) should thow ECONNRESET if FIN is received before handshake [48.67ms] (pass) initializes authorizationError to null in the TLSSocket constructor [0.39ms] (pass) setMaxSendFragment mirrors OpenSSL's [512, 16384] acceptance without throwing [5.88ms] (pass) should be able to grab the JSStreamSocket constructor [0.30ms] (skip) tls.connect > should work with alpnProtocols (pass) tls.connect > Bun.serve() should work with tls and Bun.file() [5.44ms] (pass) tls.connect > should have peer certificate when using self asign certificate [24.26ms] (skip) tls.connect > should have peer certificate (skip) tls.connect > getCipher, getProtocol, getEphemeralKeyInfo, getSharedSigalgs, getSession, exportKeyingMaterial and isSessionReused should work (skip) tls.connect > should process options correctly when connect is called with only options (skip) tls.connect > should process port and host correctly (skip) tls.connect > should process port, host, and callback correctly (skip) tls.connect > should handle the absence of a callback gracefully (skip) tl ... (truncated) ``` </details> <details><summary>passes on PR (with fix)</summary> ```console ASAN with fix: 18 skipped $ BUN_DEBUG_QUIET_LOGS=1 bun scripts/build.ts --profile=debug --quiet test "--reporter=junit" "--reporter-outfile=/tmp/pr_gate.xml" test/js/node/tls/node-tls-connect.test.ts bun test v1.4.3 (367d939) test/js/node/tls/node-tls-connect.test.ts: (pass) should have checkServerIdentity [3.27ms] (pass) should thow ECONNRESET if FIN is received before handshake [394.13ms] (pass) initializes authorizationError to null in the TLSSocket constructor [8.43ms] (pass) setMaxSendFragment mirrors OpenSSL's [512, 16384] acceptance without throwing [196.56ms] (pass) should be able to grab the JSStreamSocket constructor [33.22ms] (skip) tls.connect > should work with alpnProtocols (pass) tls.connect > Bun.serve() should work with tls and Bun.file() [298.86ms] (pass) tls.connect > should have peer certificate when using self asign certificate [101.96ms] (skip) tls.connect > should have peer certificate (skip) tls.connect > getCipher, getProtocol, getEphemeralKeyInfo, getSharedSigalgs, getSession, exportKeyingMaterial and isSessionReused should work (skip) tls.connect > should process options correctly when connect is called with only options (skip) tls.connect > should process port ... (truncated) release with fix: 18 skipped $ bun scripts/build.ts --profile=release [configured] bun-profile → bun (stripped) target linux-x64-gnu build type Release build dir ./build/release revision d31efd7 features lto, baseline 23 deps, 136 codegen, 1176 objects in 6018ms ninja: Entering directory `/workspace/bun/build/release' [1/4] fetch lolhtml [lolhtml] up to date [2/4] fetch rust-argon2 [rust-argon2] up to date [2/4] cargo plan → /workspace/bun/build/release/rust-target/plan.json 244 units: 172 lib, 16 proc-macro (host), 19 custom-build (host), 15 run custom-build, 17 lib (host), 4 run custom-build (host), 1 rlib [3/4] reconfigure [1/1499] mkdir stamps [2/1499] mkdir codegen [3/1499] install /workspace/bun bun install v1.4.3-canary.1 (367d939) Checked 26 installs across 65 packages (no changes) [231.00ms] [4/1499] rustc unicode_xid [5/1499] rustc heck [6/1499] rustc build_script_build [7/1499] rustc build_script_build [8/1499] rustc unicode_ident [9/1499] rustc build_script_build [10/1499] rustc build_script_build [11/1499] install /workspace/bun/packages/bun-error bun install v1.4.3-canary.1 (367d939) Checked 1 install across 2 packages (no changes ... (truncated) ``` </details> <details><summary>diff hotspot</summary> ``` src/js/internal/net/symbols.ts | 2 + src/js/node/net.ts | 68 ++-- src/js/node/tls.ts | 47 +-- test/js/node/tls/node-tls-client-wrap-fixture.mjs | 387 ++++++++++++++++++++++ test/js/node/tls/node-tls-connect.test.ts | 356 +++++++++++++++++++- 5 files changed, 806 insertions(+), 54 deletions(-) ``` </details> **gate history** · 2 passed · 0 rejected · iteration 0 <details><summary>evidence per changed file</summary> ``` file reads edits tests src/js/internal/net/symbols.ts 0 0 72 src/js/node/net.ts 8 0 73 src/js/node/tls.ts 1 0 74 test/js/node/tls/node-tls-client-wrap-fixture.mjs 2 3 77 test/js/node/tls/node-tls-connect.test.ts 0 0 69 ``` </details> <!-- robobun:evidence:end -->
|
Superseded by #44618, which consolidates the open TLS pull requests. This fix and its tests are in there, either as written, rewritten smaller, or merged with the other PRs that patched the same cause (see the "By area" list in that PR). Closing in favor of it. |
…t when an engine is attached (#38028, #38122, #38076) Node ties the two sockets together in the TLSSocket constructor, whatever state the wrapped one is in: its 'close' destroys the wrap, its 'error' is re-emitted, and closing the TLS handle destroys it. Bun made those links at the moment a TLS engine was attached, in six copies, and the last one only for a generic Duplex or an adopted fd. So a wrap with no engine yet (a client waiting for 'connect', the server's one-tick deferral, a server over a connecting socket) and every stream-level wrap over a net.Socket had none: the fd leaked and server.close() never called back, a refused connect was uncaught or reported nowhere, a socket dialed again was upgraded by its dead wrap, and a server wrap adopted a half-connected socket, which kept the process alive. linkUpgraded() makes the links once, before any branching. The client and server attach code is one function each over two shared helpers. _destroy takes down any transport that is not the raw twin of an adopted fd, where node does it, next to the handle close, so it is still intact inside 'error'. A server wrap over a connecting socket waits for 'connect', and named pipes take the stream-level engine there as they do on the client. The constructor refuses a secureContext that is not one (ERR_TLS_INVALID_CONTEXT) instead of throwing out of nextTick.
Problem
tls.connect({ socket })over anet.Socketwhose connect is still in flight (net.connect(...)passed straight in, or anew net.Socket()connected after being wrapped) never reports a failed connect: the plain socket emitserror+close, the TLSSocket emits nothing, and a caller waiting on itssecureConnect/error/closehangs.ECONNREFUSEDis an uncaught exception instead. Same aftertls.connect({ socket }).destroy()while the socket was still connecting.connectlistener also stays armed after the failure: anet.Socketthat is reconnected afterwards (retry logic reusing the socket) is upgraded to TLS by the dead wrap, so a plain server gets a ClientHello and the orphaned TLSSocket reportsERR_SSL_WRONG_VERSION_NUMBER.Socket.prototype.connect(src/js/node/net.ts, around line 2030) only registersconnection.once("connect", ...). Nothing links the two sockets until that upgrade runs, so the connection'serror/closego nowhere. The already-connected arm (upgradeTLSDeferred) and the duplex arm (upgradeDuplexToTLSwiresclose) do not have this gap.raw error ECONNREFUSED,tls error ECONNREFUSED,raw close,tls closefor the repro; bun printed only the tworawlines.Fix
connect, also listen for the connection'serror(re-emitted on the TLSSocket through_emitTLSError) andclose(destroys the TLSSocket).connectremoves both listeners before upgrading;closeremoves theconnectlistener, which is what stops the dead wrap from upgrading a later reconnect._initdoeswrap.on('error', err => this._emitTLSError(err))and_wrapHandledoeswrap.on('close', () => this.destroy())(lib/internal/tls/wrap.js L977 / L740 in v26.3.0). Going through_emitTLSErrorkeeps node's_controlReleasedsemantics, and the resulting events (errorcarrying the connection's own error object, thenclosewithhadError === false) are exactly node's.net.Socketcan be reconnected after it closes, so listeners left behind would act on a TLSSocket that has moved on.erroris ignored once the TLSSocket is already destroyed: bun keeps the connection connecting untilconnectfires aftertls.connect({ socket }).destroy(), and its failure must not surface as anerrorafter the TLSSocket'sclose. The listener still absorbs it, so it is no longer an uncaught exception either.new tls.TLSSocket(socket)and then explicitlyconnect({ socket })ed keeps the stream as its_handle, anddestroy()on such a socket throwshandle.close is not a functionon main today (node:tls: handle destroy() on a TLSSocket wrapping an unconnected stream #35842 fixes that);tls.connect({ socket }), the path this PR is about, has no_handlewhile waiting.describe("tls.connect({ socket }) over a net.Socket whose connect has not completed yet")): connect in flight, connect started after wrapping with listeners on the TLSSocket only,raw.destroy()while connecting,tlsSocket.destroy()while connecting, and reconnecting the socket after the failure. All five fail without the src change (two time out, two die on the unhandledECONNREFUSED, the reconnect one getsERR_SSL_WRONG_VERSION_NUMBER; checked withUSE_SYSTEM_BUN=1for all five and with abun bdbuild of main for the first four), pass with the fix, and stayed green over repeated runs.localhostto::1for the server and127.0.0.1for the client; node behaves the same here).Background
tls.connect({ socket })builds a TLSSocket over a transport the caller owns instead of opening its own TCP connection. In bun the TLS layer is attached inSocket.prototype.connect, in one of three ways: a connectednet.Sockethas its native handle adopted on the spot (upgradeTLSDeferred), a generic duplex / named pipe gets a stream-level TLS engine (upgradeDuplexToTLS), and anet.Socketthat has no handle yet or is still connecting waits for itsconnectevent and then takes one of the first two paths. Only that third, waiting state had no link between the two sockets._emitTLSErroris node's routing for errors that happen on a TLSSocket's underlying transport: it emits_tlsErrorand, once_releaseControl()has handed the socket to the user (whichtls.connect()does right away), emitserror. It does not destroy the socket; in node the socket is destroyed by the transport'sclose, which is why the TLSSocket'sclosecarrieshadError === falsein this flow.Repro and node / bun output
node v26.3.0 and bun with this change:
bun 1.4.0 (and a debug build of main):
The same probe with
raw.destroy()right after wrapping printsraw close false/tls close falseon node and with this change, onlyraw close falsebefore. Withc.destroy()right after wrapping and no listeners onraw, bun before this change exits with an uncaughtECONNREFUSED; node and bun with this change printtls close falseand exit cleanly.