fallback to standard ssh when no key is found in store
This commit is contained in:
parent
c4b98a09ed
commit
6967e3e749
1 changed files with 19 additions and 22 deletions
41
agent.go
41
agent.go
|
|
@ -85,30 +85,27 @@ func startSSH(storePath string, args []string) {
|
||||||
|
|
||||||
if host != "" {
|
if host != "" {
|
||||||
pemData, err := findKey(storePath, user, host)
|
pemData, err := findKey(storePath, user, host)
|
||||||
if err != nil {
|
if err == nil {
|
||||||
fmt.Println("Error:", err)
|
targetName := host
|
||||||
os.Exit(1)
|
if user != "" {
|
||||||
}
|
targetName = user + "@" + host
|
||||||
|
|
||||||
targetName := host
|
|
||||||
if user != "" {
|
|
||||||
targetName = user + "@" + host
|
|
||||||
}
|
|
||||||
|
|
||||||
socketPath, cleanup, err := startEphemeralAgent(pemData, targetName)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println("Error:", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
defer cleanup()
|
|
||||||
|
|
||||||
newEnv := []string{"SSH_AUTH_SOCK=" + socketPath}
|
|
||||||
for _, e := range env {
|
|
||||||
if !strings.HasPrefix(e, "SSH_AUTH_SOCK=") {
|
|
||||||
newEnv = append(newEnv, e)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
socketPath, cleanup, err := startEphemeralAgent(pemData, targetName)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error:", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
newEnv := []string{"SSH_AUTH_SOCK=" + socketPath}
|
||||||
|
for _, e := range env {
|
||||||
|
if !strings.HasPrefix(e, "SSH_AUTH_SOCK=") {
|
||||||
|
newEnv = append(newEnv, e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
env = newEnv
|
||||||
}
|
}
|
||||||
env = newEnv
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sshPath, err := exec.LookPath("ssh")
|
sshPath, err := exec.LookPath("ssh")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue