GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-08 05:20:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Unable to launch WinSCP for SSH sessions using private key (#10308)

Browse Source
This commit is contained in:
OpaqueGlass 2025-02-19 17:27:59 +08:00 committed by GitHub
parent 4be1e12559
commit 15f4182e0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tabby-ssh/src/services/ssh.service.ts
View File

@ -1,7 +1,8 @@
// import * as fs from 'fs/promises' import * as fs from 'fs/promises'
import * as crypto from 'crypto'
import * as tmp from 'tmp-promise' import * as tmp from 'tmp-promise'
import { Injectable } from '@angular/core' import { Injectable } from '@angular/core'
import { ConfigService, HostAppService, Platform, PlatformService } from 'tabby-core' import { ConfigService, FileProvidersService, HostAppService, Platform, PlatformService } from 'tabby-core'
import { SSHSession } from '../session/ssh' import { SSHSession } from '../session/ssh'
import { SSHProfile } from '../api' import { SSHProfile } from '../api'
import { PasswordStorageService } from './passwordStorage.service' import { PasswordStorageService } from './passwordStorage.service'
@ -15,6 +16,7 @@ export class SSHService {
private config: ConfigService, private config: ConfigService,
hostApp: HostAppService, hostApp: HostAppService,
private platform: PlatformService, private platform: PlatformService,
private fileProviders: FileProvidersService,
) { ) {
if (hostApp.platform === Platform.Windows) { if (hostApp.platform === Platform.Windows) {
this.detectedWinSCPPath = platform.getWinSCPPath() this.detectedWinSCPPath = platform.getWinSCPPath()
@ -47,14 +49,35 @@ export class SSHService {
const args = [await this.getWinSCPURI(session.profile, undefined, session.authUsername ?? undefined)] const args = [await this.getWinSCPURI(session.profile, undefined, session.authUsername ?? undefined)]
let tmpFile: tmp.FileResult|null = null let tmpFile: tmp.FileResult|null = null
if (session.activePrivateKey) { try {
if (session.activePrivateKey && session.profile.options.privateKeys && session.profile.options.privateKeys.length > 0) {
tmpFile = await tmp.file() tmpFile = await tmp.file()
// await fs.writeFile(tmpFile.path, session.activePrivateKey) let passphrase: string|null = null
for (const pk of session.profile.options.privateKeys) {
let privateKeyContent: string|null = null
const buffer = await this.fileProviders.retrieveFile(pk)
privateKeyContent = buffer.toString()
await fs.writeFile(tmpFile.path, privateKeyContent)
const keyHash = crypto.createHash('sha512').update(privateKeyContent).digest('hex')
// need to pass an default passphrase, otherwise it might get stuck at the passphrase input
passphrase = await this.passwordStorage.loadPrivateKeyPassword(keyHash) ?? 'tabby'
const winSCPcom = path.slice(0, -3) + 'com' const winSCPcom = path.slice(0, -3) + 'com'
await this.platform.exec(winSCPcom, ['/keygen', tmpFile.path, `/output=${tmpFile.path}`]) try {
await this.platform.exec(winSCPcom, ['/keygen', tmpFile.path, '-o', tmpFile.path, '--old-passphrase', passphrase])
} catch (error) {
console.warn('Could not convert private key ', error)
continue
}
break
}
args.push(`/privatekey=${tmpFile.path}`) args.push(`/privatekey=${tmpFile.path}`)
if (passphrase != null) {
args.push(`/passphrase=${passphrase}`)
}
} }
await this.platform.exec(path, args) await this.platform.exec(path, args)
} finally {
tmpFile?.cleanup() tmpFile?.cleanup()
} }
}
} }