From a3c1a3ee752f41a706fa226ea4185165099fbfcd Mon Sep 17 00:00:00 2001
From: fangdingjun <fangdingjun@gmail.com>
Date: Mon, 5 Dec 2016 17:41:09 +0800
Subject: [PATCH] fix agent and default private key issue

---
 obfssh_client/ssh.go | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/obfssh_client/ssh.go b/obfssh_client/ssh.go
index 2166104..f314055 100644
--- a/obfssh_client/ssh.go
+++ b/obfssh_client/ssh.go
@@ -131,6 +131,7 @@ func main() {
 	if pass == "" && key == "" {
 		var pkeys []ssh.Signer
 
+		// read default ssh private
 		home := os.Getenv("HOME")
 		for _, f := range []string{
 			".ssh/id_rsa",
@@ -149,20 +150,28 @@ func main() {
 			}
 		}
 
-		if len(pkeys) != 0 {
-			obfssh.Log(obfssh.DEBUG, "private key length %d", len(pkeys))
-			auth = append(auth, ssh.PublicKeys(pkeys...))
-		}
-
+		// auth with agent
 		agentConn, err = net.Dial("unix", os.Getenv("SSH_AUTH_SOCK"))
 		if err == nil {
 			defer agentConn.Close()
 			obfssh.Log(obfssh.DEBUG, "add auth method with agent %s", os.Getenv("SSH_AUTH_SOCK"))
 			agentClient := agent.NewClient(agentConn)
-			auth = append(auth, ssh.PublicKeysCallback(agentClient.Signers))
+			//auth = append(auth, ssh.PublicKeysCallback(agentClient.Signers))
+			signers, err := agentClient.Signers()
+			if err == nil {
+				pkeys = append(pkeys, signers...)
+			} else {
+				obfssh.Log(obfssh.DEBUG, "get key from agent failed: %s", err)
+			}
 		} else {
 			obfssh.Log(obfssh.DEBUG, "connect to agent failed")
 		}
+
+		if len(pkeys) != 0 {
+			obfssh.Log(obfssh.DEBUG, "private key length %d", len(pkeys))
+			auth = append(auth, ssh.PublicKeys(pkeys...))
+		}
+
 	}
 
 	args := flag.Args()