Ignore key decoding error when using agent auth sock (#25)

k0sproject · May 3, 2021 · 4a56ccf · 4a56ccf
1 parent 4224870
commit 4a56ccf
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/ssh.go b/ssh.go
@@ -128,6 +128,16 @@ func (c *SSH) Connect() error {
 		config.HostKeyCallback = trustedHostKeyCallback(c.HostKey)
 	}
 
+	sshAgentSock := os.Getenv("SSH_AUTH_SOCK")
+
+	if sshAgentSock != "" {
+		sshAgent, err := net.Dial("unix", sshAgentSock)
+		if err != nil {
+			return fmt.Errorf("cannot connect to SSH agent auth socket %s: %s", sshAgentSock, err)
+		}
+		config.Auth = append(config.Auth, ssh.PublicKeysCallback(agent.NewClient(sshAgent).Signers))
+	}
+
 	_, err := os.Stat(c.KeyPath)
 	if err != nil && !c.keypathDefault {
 		return err
@@ -139,24 +149,14 @@ func (c *SSH) Connect() error {
 			return err
 		}
 		signer, err := ssh.ParsePrivateKey(key)
-		if err != nil {
+		if err != nil && sshAgentSock == "" {
 			return err
 		}
 		config.Auth = append(config.Auth, ssh.PublicKeys(signer))
 	}
 
 	dst := fmt.Sprintf("%s:%d", c.Address, c.Port)
 
-	sshAgentSock := os.Getenv("SSH_AUTH_SOCK")
-
-	if sshAgentSock != "" {
-		sshAgent, err := net.Dial("unix", sshAgentSock)
-		if err != nil {
-			return fmt.Errorf("cannot connect to SSH agent auth socket %s: %s", sshAgentSock, err)
-		}
-		config.Auth = append(config.Auth, ssh.PublicKeysCallback(agent.NewClient(sshAgent).Signers))
-	}
-
 	var client *ssh.Client
 
 	if c.Bastion == nil {