rdelaage
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put host last in SSH command line 

This is how the SSH manpage says the command line should look, and the
"--" prevents mistakes in hostnames from being interpreted as options.
This commit is contained in:
greatroar 2020-02-19 15:53:20 +01:00
parent 6ac6bca7a1
commit e1969d1e33
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/backend/sftp/sftp.go
View File

@ -189,11 +189,8 @@ func buildSSHCommand(cfg Config) (cmd string, args []string, err error) {
cmd = "ssh" cmd = "ssh"
host, port := cfg.Host, cfg.Port if cfg.Port != "" {
args = append(args, "-p", cfg.Port)
args = []string{host}
if port != "" {
args = append(args, "-p", port)
} }
if cfg.User != "" { if cfg.User != "" {
args = append(args, "-l") args = append(args, "-l")
@ -201,6 +198,8 @@ func buildSSHCommand(cfg Config) (cmd string, args []string, err error) {
} }
args = append(args, "-s") args = append(args, "-s")
args = append(args, "sftp") args = append(args, "sftp")
args = append(args, "--", cfg.Host)
return cmd, args, nil return cmd, args, nil
} }

12
internal/backend/sftp/sshcmd_test.go
View File

@ -13,34 +13,34 @@ var sshcmdTests = []struct {
{ {
Config{User: "user", Host: "host", Path: "dir/subdir"}, Config{User: "user", Host: "host", Path: "dir/subdir"},
"ssh", "ssh",
[]string{"host", "-l", "user", "-s", "sftp"}, []string{"-l", "user", "-s", "sftp", "--", "host"},
}, },
{ {
Config{Host: "host", Path: "dir/subdir"}, Config{Host: "host", Path: "dir/subdir"},
"ssh", "ssh",
[]string{"host", "-s", "sftp"}, []string{"-s", "sftp", "--", "host"},
}, },
{ {
Config{Host: "host", Port: "10022", Path: "/dir/subdir"}, Config{Host: "host", Port: "10022", Path: "/dir/subdir"},
"ssh", "ssh",
[]string{"host", "-p", "10022", "-s", "sftp"}, []string{"-p", "10022", "-s", "sftp", "--", "host"},
}, },
{ {
Config{User: "user", Host: "host", Port: "10022", Path: "/dir/subdir"}, Config{User: "user", Host: "host", Port: "10022", Path: "/dir/subdir"},
"ssh", "ssh",
[]string{"host", "-p", "10022", "-l", "user", "-s", "sftp"}, []string{"-p", "10022", "-l", "user", "-s", "sftp", "--", "host"},
}, },
{ {
// IPv6 address. // IPv6 address.
Config{User: "user", Host: "::1", Path: "dir"}, Config{User: "user", Host: "::1", Path: "dir"},
"ssh", "ssh",
[]string{"::1", "-l", "user", "-s", "sftp"}, []string{"-l", "user", "-s", "sftp", "--", "::1"},
}, },
{ {
// IPv6 address with zone and port. // IPv6 address with zone and port.
Config{User: "user", Host: "::1%lo0", Port: "22", Path: "dir"}, Config{User: "user", Host: "::1%lo0", Port: "22", Path: "dir"},
"ssh", "ssh",
[]string{"::1%lo0", "-p", "22", "-l", "user", "-s", "sftp"}, []string{"-p", "22", "-l", "user", "-s", "sftp", "--", "::1%lo0"},
}, },
} }