fix(ssh-args): space inside quotes

ydb-platform · May 23, 2024 · 638378c · 638378c
1 parent 4fb2872
commit 638378c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pkg/options/options_suite_test.go b/pkg/options/options_suite_test.go
@@ -22,12 +22,16 @@ var _ = Describe("Test parsing SSHArgs", func() {
 			[]string{"arg1", "arg2", "arg3"},
 		),
 		Entry("not split by whitespace inside quotes",
-			"arg1 arg2 ProxyCommand=\"cmd\"",
-			[]string{"arg1", "arg2", "ProxyCommand=\"cmd\""},
+			"arg1 arg2 ProxyCommand=\\\"arg1 arg2\\\"",
+			[]string{"arg1", "arg2", "ProxyCommand=\"arg1 arg2\""},
 		),
 		Entry("not split by comma",
-			"arg1,arg2 ProxyCommand=\"cmd\"",
-			[]string{"arg1,arg2", "ProxyCommand=\"cmd\""},
+			"arg1,arg2",
+			[]string{"arg1,arg2"},
+		),
+		Entry("real world example",
+			"ssh -i ~/yandex -o ProxyCommand=\\\"ssh -W %h:%p -i ~/yandex [email protected]\\\"",
+			[]string{"ssh", "-i", "~/yandex", "-o", "ProxyCommand=\"ssh -W %h:%p -i ~/yandex [email protected]\""},
 		),
 	)
 })
diff --git a/pkg/options/restart.go b/pkg/options/restart.go
@@ -275,7 +275,7 @@ func parseSSHArgs(rawArgs string) []string {
 			continue
 		}
 
-		if unicode.IsSpace(rawRunes[i]) {
+		if unicode.IsSpace(rawRunes[i]) && !isInsideQuotes {
 			if len(curArg) > 0 {
 				args = append(args, string(curArg))
 			}