Skip to content

agentHost: honor SSH ProxyJump when connecting #334849

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.

Sign up for GitHub

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

Open
Girish Konda (kondv) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

agentHost: honor SSH ProxyJump when connecting #334849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/vs/platform/agentHost/common/sshConfigParsing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,13 @@ export function parseSSHGOutput(stdout: string): ISSHResolvedConfig {
: strictHostKeyCheckingValue === 'false'
? 'no'
: strictHostKeyCheckingValue;
const proxyJump = map.get('proxyjump');

return {
hostname: map.get('hostname') ?? '',
user: map.get('user') || undefined,
port: parseInt(map.get('port') ?? '22', 10),
proxyJump: proxyJump?.toLowerCase() === 'none' ? undefined : proxyJump,
identityFile: identityFiles,
identityAgent: map.get('identityagent') || undefined,
forwardAgent: map.get('forwardagent') === 'yes',
Expand Down
2 changes: 2 additions & 0 deletions src/vs/platform/agentHost/common/sshRemoteAgentHost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export interface ISSHAgentHostConfig {
readonly name: string;
/** SSH config host alias (e.g. "robfast2") for reconnection on restart. */
readonly sshConfigHost?: string;
readonly proxyJump?: string;
/** Dev override: custom command to start the remote agent host instead of the default CLI. */
readonly remoteAgentHostCommand?: string;
/** When true, enables OpenSSH agent forwarding (auth-agent@openssh.com) for this connection. Requires {@link authMethod} to be Agent. */
Expand Down Expand Up @@ -273,6 +274,7 @@ export interface ISSHResolvedConfig {
readonly hostname: string;
readonly user: string | undefined;
readonly port: number;
readonly proxyJump?: string;
readonly identityFile: string[];
readonly identityAgent: string | undefined;
readonly forwardAgent: boolean;
Expand Down
Loading
Loading