From a0aeb912765c2dbeef41ae0391846d6e874f41e8 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Feb 24 2022 15:14:23 +0000
Subject: Fix parsing of URLs with port numbers


---

diff --git a/koji/daemon.py b/koji/daemon.py
index 9c3aa55..d487803 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -301,7 +301,7 @@ class SCM(object):
         if password is not None and not allow_password:
             raise koji.GenericError('username:password format not supported: %s:%s'
                                     % (user, password))
-        netloc = parsed_url.hostname
+        netloc = userhost[-1]
 
         # check for empty path before we apply normpath
         if not path:
diff --git a/tests/test_scm.py b/tests/test_scm.py
index 13956c5..a75f259 100644
--- a/tests/test_scm.py
+++ b/tests/test_scm.py
@@ -53,6 +53,7 @@ class TestSCM(unittest.TestCase):
             "svn+ssh://server/some/path#bab0c73900241ef5c465d7e873e9d8b34c948e67",
             "cvs://server/some/path#bab0c73900241ef5c465d7e873e9d8b34c948e67",
             "cvs+ssh://server/some/path#bab0c73900241ef5c465d7e873e9d8b34c948e67",
+            "cvs+ssh://server:80/some/path#bab0c73900241ef5c465d7e873e9d8b34c948e67",
         ]
         bad = [
             "http://localhost/foo.html",
@@ -98,6 +99,19 @@ class TestSCM(unittest.TestCase):
         self.assertEqual(scm.source_cmd, ['make', 'sources'])
         self.assertEqual(scm.scmtype, 'GIT')
 
+    def test_with_port(self):
+        url = "git+ssh://user@server:80/foo.git#bab0c73900241ef5c465d7e873e9d8b34c948e67"
+        scm = SCM(url)
+        self.assertEqual(scm.scheme, 'git+ssh://')
+        self.assertEqual(scm.user, 'user')
+        self.assertEqual(scm.host, 'server:80')
+        self.assertEqual(scm.repository, '/foo.git')
+        self.assertEqual(scm.module, '')
+        self.assertEqual(scm.revision, 'bab0c73900241ef5c465d7e873e9d8b34c948e67')
+        self.assertEqual(scm.use_common, True)
+        self.assertEqual(scm.source_cmd, ['make', 'sources'])
+        self.assertEqual(scm.scmtype, 'GIT+SSH')
+
     def test_assert_allowed_basic(self):
         scm = SCM("git://scm.example.com/path1#1234")