Merge 04bb33b into 4f35d3b

pingcap · Jul 6, 2021 · e5a397b · e5a397b
2 parents 4f35d3b + 04bb33b
commit e5a397b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/cluster/executor/ssh.go b/pkg/cluster/executor/ssh.go
@@ -261,7 +261,9 @@ func (e *NativeSSHExecutor) configArgs(args []string, isScp bool) []string {
 				proxyArgs = append([]string{"sshpass", "-p", proxy.Passphrase, "-P", e.prompt("passphrase")}, proxyArgs...)
 			}
 		}
-		args = append(args, []string{"-o", fmt.Sprintf(`ProxyCommand="%s %s@%s -p %d -W %%h:%%p"`, strings.Join(proxyArgs, " "), proxy.User, proxy.Host, proxy.Port)}...)
+		// Don't need to extra quote it, exec.Command will handle it right
+		// ref https://stackoverflow.com/a/26473771/2298986
+		args = append(args, []string{"-o", fmt.Sprintf(`ProxyCommand=%s %s@%s -p %d -W %%h:%%p`, strings.Join(proxyArgs, " "), proxy.User, proxy.Host, proxy.Port)}...)
 	}
 	return args
 }

diff --git a/pkg/cluster/executor/ssh_test.go b/pkg/cluster/executor/ssh_test.go
@@ -92,7 +92,7 @@ func TestNativeSSHConfigArgs(t *testing.T) {
 				},
 			},
 			false,
-			`-o ConnectTimeout=60 -i id_rsa -o ProxyCommand="ssh -i b.id_rsa root@proxy1 -p 222 -W %h:%p"`,
+			"-o ConnectTimeout=60 -i id_rsa -o ProxyCommand=ssh -i b.id_rsa root@proxy1 -p 222 -W %h:%p",
 		},
 		{
 			&SSHConfig{
@@ -108,7 +108,7 @@ func TestNativeSSHConfigArgs(t *testing.T) {
 				},
 			},
 			false,
-			`-p 1203 -o ConnectTimeout=60 -i id_rsa -o ProxyCommand="ssh -o ConnectTimeout=10 -i b.id_rsa root@proxy1 -p 222 -W %h:%p"`,
+			"-p 1203 -o ConnectTimeout=60 -i id_rsa -o ProxyCommand=ssh -o ConnectTimeout=10 -i b.id_rsa root@proxy1 -p 222 -W %h:%p",
 		},
 		{
 			&SSHConfig{
@@ -123,7 +123,7 @@ func TestNativeSSHConfigArgs(t *testing.T) {
 				},
 			},
 			false,
-			`sshpass -p pass -P password -o ConnectTimeout=60 -o ProxyCommand="sshpass -p word -P password ssh -o ConnectTimeout=10 root@proxy1 -p 222 -W %h:%p"`,
+			"sshpass -p pass -P password -o ConnectTimeout=60 -o ProxyCommand=sshpass -p word -P password ssh -o ConnectTimeout=10 root@proxy1 -p 222 -W %h:%p",
 		},
 	}