opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for host keys for non-22 ports

Browse Source 
When not using the standard SSH port (22), the port is appended
to the hostname (in brackets) like so: "host" -> "[host]:1234"

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
(cherry picked from commit 8794e8db1ce3088d633911454d6d36c4e939e126)
This commit is contained in:
Anders F Björklund
2020-10-25 14:43:27 +01:00
parent bce8331528
commit 6f6cf87f8f
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/bindings/connection.go
View File

@ -214,19 +214,23 @@ func sshClient(_url *url.URL, secure bool, passPhrase string, identity string) (
authMethods = append(authMethods, ssh.Password(string(pass))) authMethods = append(authMethods, ssh.Password(string(pass)))
} }
callback := ssh.InsecureIgnoreHostKey()
if secure {
key := terminal.HostKey(_url.Hostname())
if key != nil {
callback = ssh.FixedHostKey(key)
}
}
port := _url.Port() port := _url.Port()
if port == "" { if port == "" {
port = "22" port = "22"
} }
callback := ssh.InsecureIgnoreHostKey()
if secure {
host := _url.Hostname()
if port != "22" {
host = fmt.Sprintf("[%s]:%s", host, port)
}
key := terminal.HostKey(host)
if key != nil {
callback = ssh.FixedHostKey(key)
}
}
bastion, err := ssh.Dial("tcp", bastion, err := ssh.Dial("tcp",
net.JoinHostPort(_url.Hostname(), port), net.JoinHostPort(_url.Hostname(), port),
&ssh.ClientConfig{ &ssh.ClientConfig{