GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-09-10 10:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid infinite loop on incorrect private key passphrase

Browse Source
This commit is contained in:
Eugene Pankov
2023-02-04 19:19:46 +01:00
parent 85bb7a2e95
commit e0181973f7
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tabby-ssh/src/session/ssh.ts
View File

@@ -616,16 +616,9 @@ export class SSHSession {
async loadPrivateKey (name: string, privateKeyContents: Buffer): Promise<string|null> {
this.emitServiceMessage(`Loading private key: ${name}`)
try {
const parsedKey = await this.parsePrivateKey(privateKeyContents.toString())
this.activePrivateKey = parsedKey.toString('openssh')
return this.activePrivateKey
} catch (error) {
this.emitServiceMessage(colors.bgRed.black(' X ') + ' Could not read the private key file')
this.emitServiceMessage(colors.bgRed.black(' X ') + ` ${error}`)
this.notifications.error('Could not read the private key file')
return null
}
const parsedKey = await this.parsePrivateKey(privateKeyContents.toString())
this.activePrivateKey = parsedKey.toString('openssh')
return this.activePrivateKey
}
async parsePrivateKey (privateKey: string): Promise<any> {
@@ -649,7 +642,10 @@ export class SSHSession {
modal.componentInstance.password = true
modal.componentInstance.showRememberCheckbox = true
const result = await modal.result
const result = await modal.result.catch(() => {
throw new Error('Passphrase prompt cancelled')
})
passphrase = result?.value
if (passphrase && result.remember) {
this.passwordStorage.savePrivateKeyPassword(keyHash, passphrase)