models: fix git regex

closes #374

Author: rokroskar

renku/models/_git.py

@@ -40,12 +40,12 @@
 _RE_PORT = r':(?P<port>\d+)'
 
 _RE_PATHNAME = (
-    r'/(?P<pathname>'
+    r'(?P<pathname>'
     r'(((?P<owner>[\w\-\.]+)/)?(?P<name>[\w\-\.]+)(\.git)?)?)'
 )
 
 _RE_PREFIXED_PATHNAME = (
-    r'/(?P<pathname>(([\w\-\~\.]+)/)+'
+    r'(?P<pathname>(([\w\-\~\.]+)/)+'
     r'(?P<owner>[\w\-\.]+)/(?P<name>[\w\-\.]+)(\.git)?)'
 )
 
@@ -62,21 +62,36 @@ def _build(*parts):
 
 #: Define possible repository URLs.
 _REPOSITORY_URLS = (
-    _build(_RE_PROTOCOL, _RE_USERNAME_PASSWORD, _RE_HOSTNAME, _RE_PATHNAME),
+    # https://user:[email protected]/owner/repo.git
     _build(
-        _RE_PROTOCOL, _RE_USERNAME_PASSWORD, _RE_HOSTNAME,
+        _RE_PROTOCOL, _RE_USERNAME_PASSWORD, _RE_HOSTNAME, r'/', _RE_PATHNAME
+    ),
+
+    # https://user:[email protected]/prefix/owner/repo.git
+    _build(
+        _RE_PROTOCOL, _RE_USERNAME_PASSWORD, _RE_HOSTNAME, r'/',
         _RE_PREFIXED_PATHNAME
-    ), _build(_RE_USERNAME, _RE_HOSTNAME, _RE_PATHNAME),
+    ),
+
+    # https://user:[email protected]:1234/owner/repo.git
     _build(
-        _RE_PROTOCOL, _RE_USERNAME_PASSWORD, _RE_HOSTNAME, _RE_PORT,
+        _RE_PROTOCOL, _RE_USERNAME_PASSWORD, _RE_HOSTNAME, _RE_PORT, r'/',
         _RE_PATHNAME
     ),
+
+    # https://user:[email protected]:1234/prefix/owner/repo.git
     _build(
-        _RE_PROTOCOL, _RE_USERNAME_PASSWORD, _RE_HOSTNAME, _RE_PORT,
+        _RE_PROTOCOL, _RE_USERNAME_PASSWORD, _RE_HOSTNAME, _RE_PORT, r'/',
         _RE_PREFIXED_PATHNAME
-    ), _build(_RE_USERNAME, _RE_HOSTNAME, _RE_PREFIXED_PATHNAME),
-    _build(_RE_USERNAME, _RE_HOSTNAME, _RE_PORT, _RE_PATHNAME),
-    _build(_RE_USERNAME, _RE_HOSTNAME, _RE_PORT, _RE_PREFIXED_PATHNAME),
+    ),
+
+    # [email protected]:owner/repo.git
+    _build(_RE_USERNAME, _RE_HOSTNAME, r':', _RE_PATHNAME),
+
+    # [email protected]:prefix/owner/repo.git
+    _build(_RE_USERNAME, _RE_HOSTNAME, r':', _RE_PREFIXED_PATHNAME),
+
+    # /path/to/repo
     _build(_RE_UNIXPATH)
 )
 

tests/models/test_git.py

@@ -120,41 +120,55 @@
             'username': 'user',
             'password': 'pass',
         },
+        pytest.param(
+            {
+                'href': '[email protected]/repo.git',
+                'protocol': 'ssh',
+                'hostname': 'example.com',
+                'name': 'repo',
+                'pathname': 'repo.git',
+                'username': 'git',
+            },
+            marks=pytest.mark.
+            xfail(raises=errors.ConfigurationError, strict=True),
+        ),
+        pytest.param(
+            {
+                'href': '[email protected]/owner/repo.git',
+                'protocol': 'ssh',
+                'hostname': 'example.com',
+                'name': 'repo',
+                'pathname': 'owner/repo.git',
+                'owner': 'owner',
+                'username': 'git',
+            },
+            marks=pytest.mark.
+            xfail(raises=errors.ConfigurationError, strict=True),
+        ),
         {
-            'href': '[email protected]/repo.git',
+            'href': '[email protected]:repo.git',
             'protocol': 'ssh',
             'hostname': 'example.com',
             'name': 'repo',
             'pathname': 'repo.git',
             'username': 'git',
         },
         {
-            'href': '[email protected]/owner/repo.git',
-            'protocol': 'ssh',
-            'hostname': 'example.com',
-            'name': 'repo',
-            'pathname': 'owner/repo.git',
-            'owner': 'owner',
-            'username': 'git',
-        },
-        {
-            'href': '[email protected]:1234/owner/repo.git',
+            'href': '[email protected]:owner/repo.git',
             'protocol': 'ssh',
             'hostname': 'example.com',
             'name': 'repo',
             'pathname': 'owner/repo.git',
             'owner': 'owner',
-            'port': '1234',
             'username': 'git',
         },
         {
-            'href': '[email protected]:1234/prefix/owner/repo.git',
+            'href': '[email protected]:prefix/owner/repo.git',
             'protocol': 'ssh',
             'hostname': 'example.com',
             'name': 'repo',
             'pathname': 'prefix/owner/repo.git',
             'owner': 'owner',
-            'port': '1234',
             'username': 'git',
         },
         {
@@ -201,7 +215,7 @@
         pytest.param(
             {
                 'href': '[email protected]:1234:owner/repo.git',
-                'protocol': 'https',
+                'protocol': 'ssh',
                 'hostname': 'example.com',
                 'port': '1234',
                 'name': 'repo',
@@ -211,6 +225,15 @@
             marks=pytest.mark.
             xfail(raises=errors.ConfigurationError, strict=True),
         ),
+        {
+            'href': '[email protected]:1234/prefix/owner/repo.git',
+            'username': 'git',
+            'protocol': 'ssh',
+            'hostname': 'example.com',
+            'name': 'repo',
+            'pathname': '1234/prefix/owner/repo.git',
+            'owner': 'owner',
+        },
     ]
 )
 def test_valid_href(fields):