list keys and refactor
This commit is contained in:
parent
4e1ad1b285
commit
8157baf782
4 changed files with 154 additions and 82 deletions
77
agent.go
77
agent.go
|
|
@ -4,7 +4,10 @@ import (
|
|||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"os/exec"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"golang.org/x/crypto/ssh"
|
||||
|
|
@ -13,7 +16,7 @@ import (
|
|||
)
|
||||
|
||||
func startEphemeralAgent(pemData []byte, target string) (string, func(), error) {
|
||||
var key interface{}
|
||||
var key any
|
||||
var err error
|
||||
|
||||
key, err = ssh.ParseRawPrivateKey(pemData)
|
||||
|
|
@ -75,3 +78,75 @@ func startEphemeralAgent(pemData []byte, target string) (string, func(), error)
|
|||
}
|
||||
return sockPath, cleanup, nil
|
||||
}
|
||||
|
||||
func startSSH(dbPath string, args []string) {
|
||||
user, host := parseDestination(args)
|
||||
env := os.Environ()
|
||||
|
||||
if host != "" {
|
||||
db, err := initDB(dbPath)
|
||||
if err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
pemData, err := findKey(db, user, host)
|
||||
if err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
db.Close()
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
env = newEnv
|
||||
}
|
||||
|
||||
sshPath, err := exec.LookPath("ssh")
|
||||
if err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
sshCmd := exec.Command(sshPath, args...)
|
||||
sshCmd.Env = env
|
||||
sshCmd.Stdin = os.Stdin
|
||||
sshCmd.Stdout = os.Stdout
|
||||
sshCmd.Stderr = os.Stderr
|
||||
|
||||
c := make(chan os.Signal, 1)
|
||||
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
|
||||
go func() {
|
||||
for sig := range c {
|
||||
if sshCmd.Process != nil {
|
||||
sshCmd.Process.Signal(sig)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
err = sshCmd.Run()
|
||||
if err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
if exitErr, ok := err.(*exec.ExitError); ok {
|
||||
os.Exit(exitErr.ExitCode())
|
||||
}
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue