sshutil: Quote control socket path.

mook-as · mook-as · commit 5d4c1210ebee · 2021-08-25T11:46:26.000-07:00
The path may contain spaces (such as "Application Support"); ensure that it
can be used correctly by ssh.

Signed-off-by: Mark Yen &lt;mark.yen@suse.com&gt;
diff --git a/pkg/sshutil/sshutil.go b/pkg/sshutil/sshutil.go
@@ -164,7 +164,7 @@ func SSHArgs(instDir string, useDotSSH bool) ([]string, error) {
 	args = append(args,
 		"-l", u.Username, // guest and host have the same username, but we should specify the username explicitly (#85)
 		"-o", "ControlMaster=auto",
-		"-o", "ControlPath="+controlSock,
+		"-o", fmt.Sprintf("ControlPath=\"%s\"", controlSock),
 		"-o", "ControlPersist=5m",
 	)
 	return args, nil

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ func SSHArgs(instDir string, useDotSSH bool) ([]string, error) {`
`164`	`164`	`args = append(args,`
`165`	`165`	`"-l", u.Username, // guest and host have the same username, but we should specify the username explicitly (#85)`
`166`	`166`	`"-o", "ControlMaster=auto",`
`167`		`- "-o", "ControlPath="+controlSock,`
	`167`	`+ "-o", fmt.Sprintf("ControlPath=\"%s\"", controlSock),`
`168`	`168`	`"-o", "ControlPersist=5m",`
`169`	`169`	`)`
`170`	`170`	`return args, nil`