From 76e535e5eafc76489012b98f3ef2c120eead78fc Mon Sep 17 00:00:00 2001
From: Michael Russell <Crazybus@users.noreply.github.com>
Date: Wed, 18 Jul 2018 02:47:07 +0200
Subject: [PATCH] Make the SSH executable path configurable (#4937)

Making this configurable is useful for windows users which may not be
using the default `ssh` executable. It also means that users can point to a
specify SSH executable if multiple are available.
---
 command/ssh.go | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/command/ssh.go b/command/ssh.go
index 40307043a6..73bdb1f9b4 100644
--- a/command/ssh.go
+++ b/command/ssh.go
@@ -32,6 +32,7 @@ type SSHCommand struct {
 	flagNoExec                bool
 	flagMountPoint            string
 	flagStrictHostKeyChecking string
+	flagSSHExecutable         string
 	flagUserKnownHostsFile    string
 
 	// SSH CA Mode options
@@ -203,6 +204,15 @@ func (c *SSHCommand) Flags() *FlagSets {
 			"user certificate. This is specified as a comma-separated list of values.",
 	})
 
+	f.StringVar(&StringVar{
+		Name:       "ssh-executable",
+		Target:     &c.flagSSHExecutable,
+		Default:    "ssh",
+		EnvVar:     "VAULT_SSH_EXECUTABLE",
+		Completion: complete.PredictAnything,
+		Usage:      "Path to the SSH executable to use when connecting to the host",
+	})
+
 	return set
 }
 
@@ -473,7 +483,7 @@ func (c *SSHCommand) handleTypeCA(username, ip, port string, sshArgs []string) i
 	// Add extra user defined ssh arguments
 	args = append(args, sshArgs...)
 
-	cmd := exec.Command("ssh", args...)
+	cmd := exec.Command(c.flagSSHExecutable, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -522,7 +532,7 @@ func (c *SSHCommand) handleTypeOTP(username, ip, port string, sshArgs []string)
 	// only the Go libraries. Feel free to try and remove this dependency.
 	args := make([]string, 0)
 	env := os.Environ()
-	sshCmd := "ssh"
+	sshCmd := c.flagSSHExecutable
 
 	sshpassPath, err := exec.LookPath("sshpass")
 	if err != nil {
@@ -537,7 +547,7 @@ func (c *SSHCommand) handleTypeOTP(username, ip, port string, sshArgs []string)
 		sshCmd = sshpassPath
 		args = append(args,
 			"-e", // Read password for SSHPASS environment variable
-			"ssh",
+			c.flagSSHExecutable,
 		)
 		env = append(env, fmt.Sprintf("SSHPASS=%s", string(cred.Key)))
 	}
@@ -634,7 +644,7 @@ func (c *SSHCommand) handleTypeDynamic(username, ip, port string, sshArgs []stri
 	// Add extra user defined ssh arguments
 	args = append(args, sshArgs...)
 
-	cmd := exec.Command("ssh", args...)
+	cmd := exec.Command(c.flagSSHExecutable, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr