mirror/tabby
2
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-01-30 14:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

support windows openssh agent

Browse Source
This commit is contained in:
Eugene Pankov 2020-07-29 18:11:10 +02:00
parent ae3870e297
commit cb97a784da
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
terminus-ssh/src/services/ssh.service.ts
View File

@ -16,6 +16,8 @@ import { PromptModalComponent } from '../components/promptModal.component'
import { PasswordStorageService } from './passwordStorage.service'
import { SSHTabComponent } from '../components/sshTab.component'
const WINDOWS_OPENSSH_AGENT_PIPE = '\\\\.\\pipe\\openssh-ssh-agent'
@Injectable({ providedIn: 'root' })
export class SSHService {
private logger: Logger
@ -183,7 +185,11 @@ export class SSHService {
let agent: string|null = null
if (this.hostApp.platform === Platform.Windows) {
agent = 'pageant'
if (await fs.exists(WINDOWS_OPENSSH_AGENT_PIPE)) {
agent = WINDOWS_OPENSSH_AGENT_PIPE
} else {
agent = 'pageant'
}
} else {
agent = process.env.SSH_AUTH_SOCK as string
}
@ -196,7 +202,7 @@ export class SSHService {
password: session.connection.privateKey ? undefined : '',
privateKey: privateKey || undefined,
tryKeyboard: true,
agent: agent || undefined,
agent: session.connection.agentForward && agent || undefined,
agentForward: session.connection.agentForward && !!agent,
keepaliveInterval: session.connection.keepaliveInterval,
keepaliveCountMax: session.connection.keepaliveCountMax,