From ef31364dfe14f1f73b194c88847ee43331273796 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 17 Jul 2023 14:43:37 -0400
Subject: [PATCH] Default to port 22 when dialing

[NO NEW TESTS NEEDED]

Fixes: https://github.com/containers/podman/issues/19162

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 pkg/ssh/utils.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkg/ssh/utils.go b/pkg/ssh/utils.go
index a19468d3a..051e2f758 100644
--- a/pkg/ssh/utils.go
+++ b/pkg/ssh/utils.go
@@ -15,6 +15,8 @@ import (
 	"golang.org/x/term"
 )
 
+const sshdPort = 22
+
 func Validate(user *url.Userinfo, path string, port int, identity string) (*config.Destination, *url.URL, error) {
 	// url.Parse NEEDS ssh://, if this ever fails or returns some nonsense, that is why.
 	uri, err := url.Parse(path)
@@ -28,11 +30,10 @@ func Validate(user *url.Userinfo, path string, port int, identity string) (*conf
 	}
 
 	if uri.Port() == "" {
-		if port != 0 {
-			uri.Host = net.JoinHostPort(uri.Host, strconv.Itoa(port))
-		} else {
-			uri.Host = net.JoinHostPort(uri.Host, "22")
+		if port == 0 {
+			port = sshdPort
 		}
+		uri.Host = net.JoinHostPort(uri.Host, strconv.Itoa(port))
 	}
 
 	if user != nil {
@@ -165,11 +166,15 @@ func ParseScpArgs(options ConnectionScpOptions) (string, string, string, bool, e
 }
 
 func DialNet(sshClient *ssh.Client, mode string, url *url.URL) (net.Conn, error) {
-	port, err := strconv.Atoi(url.Port())
-	if err != nil {
-		return nil, err
+	port := sshdPort
+	if url.Port() != "" {
+		p, err := strconv.Atoi(url.Port())
+		if err != nil {
+			return nil, err
+		}
+		port = p
 	}
-	if _, _, err = Validate(url.User, url.Hostname(), port, ""); err != nil {
+	if _, _, err := Validate(url.User, url.Hostname(), port, ""); err != nil {
 		return nil, err
 	}
 	return sshClient.Dial(mode, url.Path)