Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-02-12 01:01:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add ssh-agent support to ssh client

Browse Source
This commit is contained in:
Sylvia Crowe 2024-06-06 19:59:22 -07:00
parent 69d58ef525
commit cd871a0c6c
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wavesrv/pkg/remote/sshclient.go
View File

@ -27,6 +27,7 @@ import (
"github.com/wavetermdev/waveterm/wavesrv/pkg/sstore"
"github.com/wavetermdev/waveterm/wavesrv/pkg/userinput"
"golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/agent"
"golang.org/x/crypto/ssh/knownhosts"
)
@ -83,7 +84,26 @@ func createPublicKeyCallback(connCtx context.Context, sshKeywords *SshKeywords,
// require pointer to modify list in closure
identityFilesPtr := &identityFiles
sshAuthSock := os.Getenv("SSH_AUTH_SOCK")
conn, err := net.Dial("unix", sshAuthSock)
var authSockSigners []ssh.Signer
if err != nil {
log.Printf("Failed to open SSH_AUTH_SOCK: %v", err)
} else {
agentClient := agent.NewClient(conn)
authSockSigners, _ = agentClient.Signers()
}
authSockSignersPtr := &authSockSigners
return func() ([]ssh.Signer, error) {
// try auth sock
if len(*authSockSignersPtr) != 0 {
authSockSigner := (*authSockSignersPtr)[0]
*authSockSignersPtr = (*authSockSignersPtr)[1:]
return []ssh.Signer{authSockSigner}, nil
}
// try manual identity files
if len(*identityFilesPtr) == 0 {
return nil, fmt.Errorf("no identity files remaining")
}