Commit Graph
1286 Commits
Author SHA1 Message Date
bincxz 82b58b31bc refactor(ssh): drop legacy connRef shape compatibility
Remove ensureTransportShape upgrade of bare { count, conn } descriptors.
Borrow requires a registry transport from createConnectionRef/createTransport.
Update tests to construct real transports instead of hand-rolled count objects.
2026-07-28 18:57:15 +08:00
bincxz efcc33e457 fix(ssh): preserve legacy connRef owner count when upgrading descriptors
Seed placeholder leases for pre-registry count so an existing terminal
owner is not lost when SFTP acquires a share; count correctly becomes 2.
2026-07-28 18:57:15 +08:00
bincxz 9711322c64 fix(ssh): upgrade legacy connRef descriptors before borrow
acquireConnectionRef / borrowTransport now ensure leases Map and registry
fields exist on pre-registry { count, conn } descriptors so older tests and
in-memory sessions do not throw on transport.leases.has.
2026-07-28 18:57:15 +08:00
bincxz 921002d70d fix(ssh): cover password-only auto auth in transport fingerprints
Password-only automatic login now digests the password so vault rotation
invalidates parked reuse, while multi-material auto keeps publicKey-based
matching so key-first transfer opens still find the shared transport.
2026-07-28 18:57:15 +08:00
bincxz 6b2648d687 fix(ssh): digest only selected-method credentials for reuse keys
Auth material fingerprints are method-scoped so key-first / password-retry
SFTP opens still match a parked multi-material transport. Password rotation
invalidates password auth; key/cert content rotation invalidates those methods.
2026-07-28 18:57:15 +08:00
bincxz 5328bba3b8 fix(ssh): fingerprint credential material for transport reuse invalidation
Digest password/privateKey/certificate/passphrase/identity paths into the
auth fingerprint so key or password rotation under the same keyId invalidates
parked transports. Secrets are not retained on the transport registry — only
the digest is indexed.
2026-07-28 18:57:15 +08:00
bincxz 96a096ffc7 fix(ssh): detach shared PF lifecycle before releasing the lease
Bind-failure cleanup must remove close/error handlers while conn is still
attached; releasing first cleared conn and left stale listeners on the
shared transport after local bind errors.
2026-07-28 18:57:15 +08:00
bincxz 1ac0ab767a fix(ssh): release managed PF leases on post-bind listener errors
Dedicated dials that registered a transport lease were leaving the lease
held after local/dynamic server errors. Always release managed leases so
authenticated connections are not orphaned until quit.
2026-07-28 18:57:14 +08:00
bincxz 9030dbb9ef fix(ssh): demote shared PF tunnels after post-bind listener errors
Local/dynamic server errors after start resolved still release the lease
and mark the tunnel inactive so restarts cannot reuse a zombie active entry.
2026-07-28 18:57:14 +08:00
bincxz 559206d4c9 fix(ssh): track pending remote forward and harden idle/error paths
Record remote bind target before forwardIn so cancel-during-listen always
unforwards (or discards). Shared PF transport errors discard instead of park;
identical idle TTL re-sends no longer reset idle deadlines.
2026-07-28 18:57:14 +08:00
bincxz 0d8a1bbfa1 fix(ssh): discard transport on unforward failure and attach PF lifecycle early
Remote unforward callback errors now discard the shared transport like
timeouts, so a half-open remote listen cannot be idle-parked. Shared
port-forward reuse attaches close/error lifecycle before bind so mid-listen
transport drops cannot leave zombie local listeners.
2026-07-28 18:57:14 +08:00
bincxz 20cfd39280 fix(ssh): require exact agentForwarding match for shell reuse
Shell and parked-shell lookup now use endpointAllowsReuse(..., "shell") so
disabling ForwardAgent cannot reattach to a warm conn that still exposes the
local agent. SFTP/port-forward keep asymmetric channel reuse so they can still
borrow a ForwardAgent-enabled terminal transport.
2026-07-28 18:57:14 +08:00
bincxz 9ecc9dbb04 fix(ssh): block transport reuse when agentForwarding is required
Store agentForwarding on the session/transport endpoint and apply an
asymmetric reuse check: opens that need ForwardAgent reject parked conns
that never enabled it, while SFTP/port-forward can still borrow a
ForwardAgent-enabled terminal transport.
2026-07-28 18:57:14 +08:00
bincxz 990bbe5f50 fix(ssh): match transfer source by endpoint and await late unforward
Transfer pool source sessions now require hostname/user/port parity so
multi-tab or overridden endpoints do not borrow the wrong shared transport.
Remote forward cancel-during-forwardIn and stop paths share one timed
unforward helper that discards the transport when the server listen stalls.
2026-07-28 18:57:14 +08:00
bincxz aaf597eb64 fix(ssh): include auth policy in transport keys and migrate TTL
Fingerprint auth type, key id, MFA, agent, and host-key verification so
parked transports cannot bypass profile security edits. Migrate legacy
transfer-pool idle TTL into the SSH keep-alive setting on upgrade.
2026-07-28 18:57:14 +08:00
bincxz 12fd9af5a7 fix(ssh): unique lease ids and discard on unforward timeout
Avoid shell/sftp lease id collisions across reconnect generations, and
discard the shared transport when remote unforward cannot be confirmed
within the stop timeout.
2026-07-28 18:57:14 +08:00
bincxz 6aaaaaeaae fix(ssh): bound remote unforwardIn wait during tunnel stop
Avoid hanging stopPortForward on half-open shared transports by racing
unforwardIn against a 5s timeout, then continuing lease cleanup.
2026-07-28 18:57:14 +08:00
bincxz 84c476ebf2 fix(ssh): ignore late PF bind after cancel on shared transport
If the user stops a shared local/dynamic/remote forward while listen or
forwardIn is still pending, close the listener and resolve cancelled
instead of re-registering the tunnel as active.
2026-07-28 18:57:14 +08:00
bincxz fde7d01e6d fix(ssh): destroy active PF pipes and harden idle/proxy identity
Track accepted forward sockets per tunnel and destroy them on stop, end
already-dead transports instead of parking them, and fingerprint
command-proxy routes so edits invalidate warm reuse.
2026-07-28 18:57:14 +08:00
bincxz 5ceba804db fix(ssh): guard PF bind registration and jump-route fingerprints
Catch transport registration failures inside async bind callbacks so a
dead shared socket cannot crash the main process, and fingerprint jump
hops by both vault id and effective endpoint/proxy.
2026-07-28 18:57:14 +08:00
bincxz da54ff8ea3 fix(ssh): harden shared-transport routing and lifecycle
Include proxy/jump profile identity in transport keys, normalize loopback
remote-forward addresses, detach shared listeners on cancel, and avoid
MFA-retrying dedicated dials for local bind failures.
2026-07-28 18:57:14 +08:00
bincxz 0c0bde9c1c fix(ssh): finish Codex review cleanups for shared tunnels
Attach error/close lifecycle to reused port-forward transports, match
wildcard remote binds by expected listen address, and end unusable
transports whose sockets are destroyed during lookup.
2026-07-28 18:57:14 +08:00
bincxz 0f01dbbf7d fix(ssh): address Codex review on transport reuse safety
Scope transport keys by vault hostId so different profiles cannot share
an authenticated connection. Fix createConnectionRef to preserve hostId.
Route remote-forward accepts by destPort/bind address, await unforwardIn
before success, return stopAllPortForwards as a promise, and update
async cancel tests.
2026-07-28 18:57:14 +08:00
bincxz 3f706abfeb feat(ssh): unify transport leases and converge transfer keep-alive
Introduce a main-process SSH transport registry (borrow/return leases,
ControlPersist-style idle park) shared by shell, SFTP, transfer, and
port-forward. Transfer pool becomes channel concurrency only; remove the
separate transfer-pool idle TTL UI in favor of a single SSH keep-alive
setting. Register dedicated SFTP dials, reuse parked transports, and fix
TTL 0 (park until quit), jump-host endpoint keys, and remote unforwardIn.
2026-07-28 18:57:14 +08:00
itzhang89andCursor 05f406ebab fix(ai): use writable temp workspace for Cursor CLI MCP (#2558)
Packaged Netcatty launched from Finder often has process.cwd() === "/", so
merging .cursor/mcp.json failed silently and netcatty-remote-hosts never
mounted. Point CLI turns at Netcatty temp and fail loudly on merge errors.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-28 11:35:17 +08:00
陈大猫 be99f9f2e5 Merge pull request #2529 from binaricat/fix/mosh-et-host-key-verification
fix(ssh): enforce vault host keys for Mosh and ET
2026-07-27 17:39:09 +08:00
bincxz 9b5c8d6828 fix(ssh): do not freeze ET jump HostName to the alias token
OpenSSH keeps the first HostName value. Setting HostName to the jump
alias under the forced -F session config blocked later Include of
~/.ssh/config from resolving HostName aliases, and could diverge from
the vault snapshot built via ssh -G against the real config.
2026-07-27 17:16:38 +08:00
bincxz 8b0aa62f5c fix(ssh): use per-connection ssh -G memo instead of process cache
Drop the process-lifetime ssh -G cache so HostName/HostKeyAlias and
known_hosts path edits are observed on the next connect. Keep a
per-prepare Map only so target and jump discovery in one session can
share probes.
2026-07-27 17:06:05 +08:00
bincxz a3a7301f78 fix(ssh): Match all before Include and preserve session PATH
Reset Host context with Match all so Included user/system ssh_config
applies to every hop, not only the trailing jump Host stanza. Prepend
the ssh -F wrapper onto the session PATH from options.env so custom
ProxyCommand helpers remain available.
2026-07-27 16:59:48 +08:00
bincxz d4ac289d7f fix(ssh): Include real OpenSSH configs under ET -F session file
-F replaces both the per-user and system-wide ssh_config. Append
Include directives for the real ~/.ssh/config and system ssh_config
after session Host blocks so HostName aliases and other user settings
still apply while session ProxyJump/vault overrides keep first-match
priority.
2026-07-27 16:54:27 +08:00
陈大猫 28ba165c3e Merge pull request #2532 from binaricat/codex/fix-stuck-lint-test
fix(ci): prevent lint-and-test hangs
2026-07-27 16:50:41 +08:00
bincxz 3f1e22ce43 fix(sftp): keep resume verification responsive 2026-07-27 16:41:47 +08:00
bincxz 3c31a644ce fix(ssh): only strip host aliases when vault pins the hop
Avoid removing the current target's system known_hosts entry when the
vault only contains unrelated pins, so strict ET stats probes keep
working for already-trusted hosts.
2026-07-27 16:32:09 +08:00
bincxz 4f4fc8eda9 fix(ssh): keep nondefault port form for resolved HostName pins
When rewriting vault pins under a resolved HostName, retain
[host]:port encoding for non-default ports so OpenSSH lookup finds the
vault key. HostKeyAlias continues to use the bare default-port form.
2026-07-27 16:28:13 +08:00
bincxz 7b3fbe4f07 fix(ssh): embed absolute OpenSSH path in ET ssh wrapper
Resolve the real ssh binary to an absolute path before prepending the
session wrapper directory to PATH, so the wrapper cannot recurse into
itself.
2026-07-27 16:22:29 +08:00
bincxz a9da03c414 fix(ssh): inject PATH ssh wrapper so ET loads session config
OpenSSH ignores $HOME for user config. When ET generates a private
config for ProxyJump and jump host-key policy, put a PATH-fronted ssh
wrapper that always passes -F so interactive ET and follow-up probes
both honor the vault-authoritative Host stanzas.
2026-07-27 16:18:17 +08:00
bincxz 0b6ddb6990 fix(ssh): rewrite vault pins under resolved HostName
When the connection target is an SSH-config alias, OpenSSH records and
looks up host keys under the resolved HostName. Rewrite the vault pin
and filter selectors accordingly so accept-new cannot ignore the vault.
2026-07-27 16:07:45 +08:00
netcatty-bot def83963fb fix: address Codex review on PR #2532 2026-07-27 08:02:01 +00:00
bincxz 86a7054a09 fix(ssh): force ET session config with -F and cache ssh -G
OpenSSH ignores $HOME for user config on POSIX, so pass -F to
execOnEtSession so ProxyJump host-key policy is actually loaded. Cache
real ssh -G probes briefly to limit main-process blocking.
2026-07-27 15:59:32 +08:00
bincxz a08e1fa841 fix(plugins): normalize provider stream exit reasons 2026-07-27 15:55:41 +08:00
bincxz 30c064132b fix(ssh): disable KnownHostsCommand and rewrite multi-host pins
Disable KnownHostsCommand when enforcing vault authority so dynamic trust
cannot override vault pins. Rewrite multi-host known_hosts lines instead
of dropping them so unpinned hop patterns remain trusted.
2026-07-27 15:54:03 +08:00
bincxz 198300b062 fix(ci): prevent lint-and-test hangs 2026-07-27 15:49:37 +08:00
bincxz 4e7996d806 fix(ssh): restore jump-host Host block known_hosts policy
ET --ssh-option applies only to the destination hop. Keep vault-authoritative
UserKnownHostsFile and StrictHostKeyChecking in the ProxyJump Host stanza so
the separate jump OpenSSH process still enforces key verification.
2026-07-27 15:47:59 +08:00
bincxz efff0c4d93 fix(ssh): enforce ET host-key policy via ssh-option on POSIX
Apply vault-authoritative known_hosts through --ssh-option so OpenSSH
enforces it even when a temp-HOME Host config is not read. Reject
fingerprint-only publicKey tokens when building vault pins.
2026-07-27 15:43:51 +08:00
bincxz 96b43092a2 fix(ssh): honor HostKeyAlias and pass port/user to ssh -G
Write vault pins under the effective HostKeyAlias when present, filter
system entries for both alias and hostname, and invoke ssh -G with -p/-l
so %p/%r known_hosts path tokens expand correctly.
2026-07-27 15:36:29 +08:00
bincxz 217627d5f7 chore(ssh): drop unused vault known_hosts import 2026-07-27 15:23:53 +08:00
bincxz 0465662d77 fix(ssh): per-hop ssh -G snapshots and vault-authoritative ET probes
Build separate authoritative known_hosts files for target and jump hops
using each hop's hostname for ssh -G discovery. Reuse the same vault
authority builder for requireTrustedHost exec probes so system pins
cannot override vault keys on stats/shell follow-ups.
2026-07-27 15:23:32 +08:00
bincxz 62be27efce fix(plugins): allow immediate provider reconnect 2026-07-27 15:20:03 +08:00
bincxz 29730a24a5 fix(ssh): per-hop ET host-key trust and effective user paths
Apply vault-authoritative known_hosts only on hops the vault pins, so
unpinned ET jump/target hops keep the persistent user known_hosts.
Also merge ssh -G UserKnownHostsFile paths and preserve spaced path
names when discovering configured trust files.
2026-07-27 15:14:35 +08:00
bincxz c5417663fc fix(ssh): merge effective GlobalKnownHostsFile into vault snapshot
Discover administrator-configured global known_hosts paths via ssh -G
when building the vault-authoritative snapshot, so replacing
GlobalKnownHostsFile does not drop custom admin pins or revocations.
2026-07-27 15:02:48 +08:00