TrueCloudLab/restic
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Revert "Put host last in SSH command line"

Browse source 
This reverts commit e1969d1e33.
This commit is contained in:
greatroar 2020-03-08 16:45:33 +01:00
parent a307797c11
commit 8cf3bb8737
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -189,8 +189,11 @@ func buildSSHCommand(cfg Config) (cmd string, args []string, err error) {
cmd = "ssh" cmd = "ssh"
if cfg.Port != "" { host, port := cfg.Host, 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")
@ -198,8 +201,6 @@ 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{"-l", "user", "-s", "sftp", "--", "host"}, []string{"host", "-l", "user", "-s", "sftp"},
}, },
{ {
Config{Host: "host", Path: "dir/subdir"}, Config{Host: "host", Path: "dir/subdir"},
"ssh", "ssh",
[]string{"-s", "sftp", "--", "host"}, []string{"host", "-s", "sftp"},
}, },
{ {
Config{Host: "host", Port: "10022", Path: "/dir/subdir"}, Config{Host: "host", Port: "10022", Path: "/dir/subdir"},
"ssh", "ssh",
[]string{"-p", "10022", "-s", "sftp", "--", "host"}, []string{"host", "-p", "10022", "-s", "sftp"},
}, },
{ {
Config{User: "user", Host: "host", Port: "10022", Path: "/dir/subdir"}, Config{User: "user", Host: "host", Port: "10022", Path: "/dir/subdir"},
"ssh", "ssh",
[]string{"-p", "10022", "-l", "user", "-s", "sftp", "--", "host"}, []string{"host", "-p", "10022", "-l", "user", "-s", "sftp"},
}, },
{ {
// IPv6 address. // IPv6 address.
Config{User: "user", Host: "::1", Path: "dir"}, Config{User: "user", Host: "::1", Path: "dir"},
"ssh", "ssh",
[]string{"-l", "user", "-s", "sftp", "--", "::1"}, []string{"::1", "-l", "user", "-s", "sftp"},
}, },
{ {
// 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{"-p", "22", "-l", "user", "-s", "sftp", "--", "::1%lo0"}, []string{"::1%lo0", "-p", "22", "-l", "user", "-s", "sftp"},
}, },
} }