[FIXED JENKINS-49768] Detect scp style urls and translate to ssh style

jenkinsci · Mar 14, 2018 · bddf7b2 · bddf7b2
1 parent 30dbeb9
commit bddf7b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,8 +12,7 @@
 
 ## Version 1.0.5 (unreleased)
 
-* ...
-
+* Fix parsing of clone URLs when Gitea is publishes scp style clone URLs ([JENKINS-49768](https://issues.jenkins-ci.org/browse/JENKINS-49768))
 ## Version 1.0.4 (2017-12-18)
 
 * Added support for Webhook notification of repository creation / deletion now that Gitea 1.3 supports those events

diff --git a/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMBuilder.java b/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMBuilder.java
@@ -152,6 +152,16 @@ public static UriTemplate checkoutUriTemplate(@CheckForNull Item context,
                     )
             );
             if (credentials instanceof SSHUserPrivateKey) {
+                int atIndex = sshRemote.indexOf('@');
+                int colonIndex = sshRemote.indexOf(':');
+                if (atIndex != -1 && colonIndex != -1 && atIndex < colonIndex) {
+                    // this is an scp style url, we will translate to ssh style
+                    return UriTemplate.buildFromTemplate("ssh://"+sshRemote.substring(0, colonIndex))
+                            .path(UriTemplateBuilder.var("owner"))
+                            .path(UriTemplateBuilder.var("repository"))
+                            .literal(".git")
+                            .build();
+                }
                 URI sshUri = URI.create(sshRemote);
                 return UriTemplate.buildFromTemplate(
                         "ssh://git@" + sshUri.getHost() + (sshUri.getPort() != 22 ? ":" + sshUri.getPort() : "")