Merge pull request #1388 from romanZupancic/windows-sshagent-env

Add SSH_AUTH_SOCK support to Windows environments.

Author: hslatman

internal/sshutil/agent_windows.go

@@ -13,17 +13,28 @@ import (
 // dialAgent returns an ssh.Agent client. It uses the SSH_AUTH_SOCK to connect
 // to the agent.
 func dialAgent() (*Agent, error) {
-	// Attempt unix sockets for environments like cygwin.
+	// Override the default windows openssh-ssh-agent pipe
 	if socket := os.Getenv("SSH_AUTH_SOCK"); socket != "" {
+		// Attempt unix sockets for environments like cygwin.
 		if conn, err := net.Dial("unix", socket); err == nil {
 			return &Agent{
 				ExtendedAgent: agent.NewClient(conn),
 				Conn:          conn,
 			}, nil
 		}
+
+		// Connect to Windows pipe at the supplied address
+		conn, err := winio.DialPipeContext(context.Background(), socket)
+		if err != nil {
+			return nil, errors.Wrap(err, "error connecting with ssh-agent at pipe specified by environment variable SSH_AUTH_SOCK")
+		}
+		return &Agent{
+			ExtendedAgent: agent.NewClient(conn),
+			Conn:          conn,
+		}, nil
 	}
 
-	// Windows OpenSSH agent
+	// DEFAULT: Windows OpenSSH agent
 	conn, err := winio.DialPipeContext(context.Background(), `\\.\\pipe\\openssh-ssh-agent`)
 	if err != nil {
 		return nil, errors.Wrap(err, "error connecting with ssh-agent")