From 8794e8db1ce3088d633911454d6d36c4e939e126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 25 Oct 2020 14:43:27 +0100
Subject: [PATCH] Add support for host keys for non-22 ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 pkg/bindings/connection.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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