SSHHook: Using correct hostname for host_key when using non-default s…

…sh port (#15964)
apache · Jul 3, 2021 · a2dc01b · a2dc01b
1 parent ffe8fab
commit a2dc01b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/airflow/providers/ssh/hooks/ssh.py b/airflow/providers/ssh/hooks/ssh.py
@@ -241,7 +241,12 @@ def get_conn(self) -> paramiko.SSHClient:
         else:
             if self.host_key is not None:
                 client_host_keys = client.get_host_keys()
-                client_host_keys.add(self.remote_host, self.host_key.get_name(), self.host_key)
+                if self.port == SSH_PORT:
+                    client_host_keys.add(self.remote_host, self.host_key.get_name(), self.host_key)
+                else:
+                    client_host_keys.add(
+                        f"[{self.remote_host}]:{self.port}", self.host_key.get_name(), self.host_key
+                    )
             else:
                 pass  # will fallback to system host keys if none explicitly specified in conn extra