From 0a3517f9b09af3f6827ca436be8ffc2f62d6e02c Mon Sep 17 00:00:00 2001 From: LukeGus Date: Tue, 26 May 2026 15:28:44 -0500 Subject: [PATCH] fix: jump hosts failing --- src/backend/ssh/docker-console.ts | 4 +++- src/backend/ssh/docker.ts | 6 ++++-- src/backend/ssh/file-manager.ts | 2 +- src/backend/ssh/server-stats.ts | 2 +- src/backend/ssh/terminal.ts | 2 +- src/backend/ssh/tunnel.ts | 4 +++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/backend/ssh/docker-console.ts b/src/backend/ssh/docker-console.ts index 270ce437..9b846b80 100644 --- a/src/backend/ssh/docker-console.ts +++ b/src/backend/ssh/docker-console.ts @@ -140,7 +140,9 @@ async function createJumpHostChain( const credential = credentials[0]; resolvedCredentials = { password: credential.password as string | undefined, - sshKey: credential.privateKey as string | undefined, + sshKey: (credential.key || credential.privateKey) as + | string + | undefined, keyPassword: credential.keyPassword as string | undefined, authType: credential.authType as string | undefined, }; diff --git a/src/backend/ssh/docker.ts b/src/backend/ssh/docker.ts index 201ab6e1..0122e5fe 100644 --- a/src/backend/ssh/docker.ts +++ b/src/backend/ssh/docker.ts @@ -199,7 +199,7 @@ async function resolveJumpHost( return { ...host, password: credential.password as string | undefined, - key: credential.privateKey as string | undefined, + key: (credential.key || credential.privateKey) as string | undefined, keyPassword: credential.keyPassword as string | undefined, keyType: credential.keyType as string | undefined, authType: credential.authType as string | undefined, @@ -740,7 +740,9 @@ app.post("/docker/ssh/connect", async (req, res) => { const credential = credentials[0]; resolvedCredentials = { password: credential.password as string | undefined, - sshKey: credential.privateKey as string | undefined, + sshKey: (credential.key || credential.privateKey) as + | string + | undefined, keyPassword: credential.keyPassword as string | undefined, authType: credential.authType as string | undefined, }; diff --git a/src/backend/ssh/file-manager.ts b/src/backend/ssh/file-manager.ts index f95c45b0..d488a320 100644 --- a/src/backend/ssh/file-manager.ts +++ b/src/backend/ssh/file-manager.ts @@ -211,7 +211,7 @@ async function resolveJumpHost( return { ...host, password: credential.password as string | undefined, - key: credential.privateKey as string | undefined, + key: (credential.key || credential.privateKey) as string | undefined, keyPassword: credential.keyPassword as string | undefined, keyType: credential.keyType as string | undefined, authType: credential.authType as string | undefined, diff --git a/src/backend/ssh/server-stats.ts b/src/backend/ssh/server-stats.ts index cf400a5a..84b25433 100644 --- a/src/backend/ssh/server-stats.ts +++ b/src/backend/ssh/server-stats.ts @@ -135,7 +135,7 @@ async function resolveJumpHost( return { ...host, password: credential.password as string | undefined, - key: credential.privateKey as string | undefined, + key: (credential.key || credential.privateKey) as string | undefined, keyPassword: credential.keyPassword as string | undefined, keyType: credential.keyType as string | undefined, authType: credential.authType as string | undefined, diff --git a/src/backend/ssh/terminal.ts b/src/backend/ssh/terminal.ts index bee1202d..0115df18 100644 --- a/src/backend/ssh/terminal.ts +++ b/src/backend/ssh/terminal.ts @@ -249,7 +249,7 @@ async function resolveJumpHost( return { ...host, password: credential.password as string | undefined, - key: credential.privateKey as string | undefined, + key: (credential.key || credential.privateKey) as string | undefined, keyPassword: credential.keyPassword as string | undefined, keyType: credential.keyType as string | undefined, authType: credential.authType as string | undefined, diff --git a/src/backend/ssh/tunnel.ts b/src/backend/ssh/tunnel.ts index d9c1a736..5391cd41 100644 --- a/src/backend/ssh/tunnel.ts +++ b/src/backend/ssh/tunnel.ts @@ -1674,7 +1674,9 @@ async function connectSSHTunnel( const credential = credentials[0]; resolvedEndpointCredentials = { password: credential.password as string | undefined, - sshKey: credential.privateKey as string | undefined, + sshKey: (credential.key || credential.privateKey) as + | string + | undefined, keyPassword: credential.keyPassword as string | undefined, keyType: credential.keyType as string | undefined, authMethod: credential.authType as string,