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

added the vault

Browse Source
This commit is contained in:
Eugene Pankov
2021-06-05 17:38:11 +02:00
parent 17471096f2
commit 7f18396926
17 changed files with 867 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
terminus-ssh/src/components/sshTab.component.ts
View File

@@ -152,7 +152,7 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
) {
// User closed the session
this.destroy()
} else {
} else if (this.frontend) {
// Session was closed abruptly
this.write('\r\n' + colors.black.bgWhite(' SSH ') + ` ${session.connection.host}: session closed\r\n`)
if (!this.reconnectOffered) {

78
terminus-ssh/src/services/passwordStorage.service.ts
View File

@@ -1,40 +1,76 @@
import * as keytar from 'keytar'
import { Injectable } from '@angular/core'
import { SSHConnection } from '../api'
import * as keytar from 'keytar'
import { VaultService } from 'terminus-core'
export const VAULT_SECRET_TYPE_PASSWORD = 'ssh:password'
export const VAULT_SECRET_TYPE_PASSPHRASE = 'ssh:key-passphrase'
@Injectable({ providedIn: 'root' })
export class PasswordStorageService {
constructor (private vault: VaultService) { }
async savePassword (connection: SSHConnection, password: string): Promise<void> {
const key = this.getKeyForConnection(connection)
return keytar.setPassword(key, connection.user, password)
if (this.vault.enabled) {
const key = this.getVaultKeyForConnection(connection)
this.vault.addSecret({ type: VAULT_SECRET_TYPE_PASSWORD, key, value: password })
} else {
const key = this.getKeytarKeyForConnection(connection)
return keytar.setPassword(key, connection.user, password)
}
}
async deletePassword (connection: SSHConnection): Promise<void> {
const key = this.getKeyForConnection(connection)
await keytar.deletePassword(key, connection.user)
if (this.vault.enabled) {
const key = this.getVaultKeyForConnection(connection)
this.vault.removeSecret(VAULT_SECRET_TYPE_PASSWORD, key)
} else {
const key = this.getKeytarKeyForConnection(connection)
await keytar.deletePassword(key, connection.user)
}
}
async loadPassword (connection: SSHConnection): Promise<string|null> {
const key = this.getKeyForConnection(connection)
return keytar.getPassword(key, connection.user)
if (this.vault.enabled) {
const key = this.getVaultKeyForConnection(connection)
return (await this.vault.getSecret(VAULT_SECRET_TYPE_PASSWORD, key))?.value ?? null
} else {
const key = this.getKeytarKeyForConnection(connection)
return keytar.getPassword(key, connection.user)
}
}
async savePrivateKeyPassword (id: string, password: string): Promise<void> {
const key = this.getKeyForPrivateKey(id)
return keytar.setPassword(key, 'user', password)
if (this.vault.enabled) {
const key = this.getVaultKeyForPrivateKey(id)
this.vault.addSecret({ type: VAULT_SECRET_TYPE_PASSPHRASE, key, value: password })
} else {
const key = this.getKeytarKeyForPrivateKey(id)
return keytar.setPassword(key, 'user', password)
}
}
async deletePrivateKeyPassword (id: string): Promise<void> {
const key = this.getKeyForPrivateKey(id)
await keytar.deletePassword(key, 'user')
if (this.vault.enabled) {
const key = this.getVaultKeyForPrivateKey(id)
this.vault.removeSecret(VAULT_SECRET_TYPE_PASSPHRASE, key)
} else {
const key = this.getKeytarKeyForPrivateKey(id)
await keytar.deletePassword(key, 'user')
}
}
async loadPrivateKeyPassword (id: string): Promise<string|null> {
const key = this.getKeyForPrivateKey(id)
return keytar.getPassword(key, 'user')
if (this.vault.enabled) {
const key = this.getVaultKeyForPrivateKey(id)
return (await this.vault.getSecret(VAULT_SECRET_TYPE_PASSPHRASE, key))?.value ?? null
} else {
const key = this.getKeytarKeyForPrivateKey(id)
return keytar.getPassword(key, 'user')
}
}
private getKeyForConnection (connection: SSHConnection): string {
private getKeytarKeyForConnection (connection: SSHConnection): string {
let key = `ssh@${connection.host}`
if (connection.port) {
key = `ssh@${connection.host}:${connection.port}`
@@ -42,7 +78,19 @@ export class PasswordStorageService {
return key
}
private getKeyForPrivateKey (id: string): string {
private getKeytarKeyForPrivateKey (id: string): string {
return `ssh-private-key:${id}`
}
private getVaultKeyForConnection (connection: SSHConnection) {
return {
user: connection.user,
host: connection.host,
port: connection.port,
}
}
private getVaultKeyForPrivateKey (id: string) {
return { hash: id }
}
}