synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-08 11:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Avoid double escaping of ProxyCommand on Windows (#3664)

Browse Source 
Fixes #2853
This commit is contained in:
Mathias Fredriksson
2022-08-24 19:12:40 +03:00
committed by GitHub
parent 09142255e6
commit 123fe0131e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/configssh.go
View File

@ -280,10 +280,16 @@ func configSSH() *cobra.Command {
"\tLogLevel ERROR", "\tLogLevel ERROR",
) )
if !skipProxyCommand { if !skipProxyCommand {
// In SSH configs, strings inside "" are interpreted literally and there
// is no need to e.g. escape backslashes (common on Windows platforms).
// We will escape the quotes, though.
escapedBinaryFile := strings.ReplaceAll(binaryFile, "\"", "\\\"")
if !wireguard { if !wireguard {
configOptions = append(configOptions, fmt.Sprintf("\tProxyCommand %q --global-config %q ssh --stdio %s", binaryFile, root, hostname)) //nolint:gocritic // We don't want to use %q here, see above.
configOptions = append(configOptions, fmt.Sprintf("\tProxyCommand \"%s\" --global-config \"%s\" ssh --stdio %s", escapedBinaryFile, root, hostname))
} else { } else {
configOptions = append(configOptions, fmt.Sprintf("\tProxyCommand %q --global-config %q ssh --wireguard --stdio %s", binaryFile, root, hostname)) //nolint:gocritic // We don't want to use %q here, see above.
configOptions = append(configOptions, fmt.Sprintf("\tProxyCommand \"%s\" --global-config \"%s\" ssh --wireguard --stdio %s", escapedBinaryFile, root, hostname))
} }
} }