fix: add ProxyCommand support for SSH connections#6
Merged
Conversation
WaveTerm previously ignored the ProxyCommand directive in ~/.ssh/config, causing connections via SSH config Host entries with ProxyCommand to fail with 'Disconnected from xxx'. This change: - Parses ProxyCommand from SSH config in findSshConfigKeywords - Executes the proxy command via os/exec with %h/%p/%r expansion - Wraps command stdin/stdout as net.Conn via net.Pipe() - Cleans up the subprocess on connection close via proxyCommandConn Affects: pkg/wconfig/settingsconfig.go, pkg/remote/sshclient.go, frontend/types/gotypes.d.ts
- Change 'providedInputRef' to 'searchInputRef' in search.tsx - Add ssh:proxycommand to schema/connections.json - Run go mod tidy
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
When SSH config has ProxyCommand like 'ssh -W %h:%p jump-host', parse and convert it to ProxyJump internally. Falls back to subprocess-based execution for non-convertible ProxyCommands.
Remove expandProxyCommand, proxyCommandConn type, and ProxyCommand execution from connectInternal. ProxyCommand is now solely handled by parseProxyCommandAsJump conversion to ProxyJump.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #5
WaveTerm previously ignored the
ProxyCommanddirective in ~/.ssh/config, causing connections via SSH config Host entries with ProxyCommand to fail with"Disconnected from xxx".This change:
findSshConfigKeywordsos/execwith%h/%p/%rexpansionnet.Connvianet.Pipe()proxyCommandConnFiles Changed
pkg/wconfig/settingsconfig.go- AddedSshProxyCommand *stringfieldpkg/remote/sshclient.go- Parsing, execution, and connection wrappingfrontend/types/gotypes.d.ts- TypeScript type definition