Allow usernames containing "@" and addind escaping "@" when building …

…URL (#42)

src/io/wcm/devops/jenkins/pipeline/scm/GitRepository.groovy

@@ -88,7 +88,7 @@ class GitRepository {
   GitRepository(Script script, String url) {
     this.script = script
     this.url = url
-    Matcher matcher = url =~ /(https?:\\/\\/|(?:ssh:\\/\\/)?)(?:([^@\/]+)@)?((?:[\w.\-_]+)(?::\d+)?)(?:\\/|:)((?:[\w-_\\/]*))\\/(.*)/
+    Matcher matcher = url =~ /(https?:\\/\\/|(?:ssh:\\/\\/)?)(?:([^\/]+)@)?((?:[\w.\-_]+)(?::\d+)?)(?:\\/|:)((?:[\w-_\\/]*))\\/(.*)/
     if (matcher) {
       List matches = matcher[0]
 
@@ -159,7 +159,7 @@ class GitRepository {
     if (isHttp() || isHttps()) {
       // add a username if present
       if (username != null) {
-        ret += "${username}@"
+        ret += "${username.replace("@","%40")}@"
       }
       // add the server, group and project
       ret += "${server}/${group}/${project}"

test/io/wcm/devops/jenkins/pipeline/scm/GitRepositoryTest.groovy

@@ -164,7 +164,7 @@ class GitRepositoryTest extends CpsScriptTestBase {
   }
 
   @Test
-  void shouldManiupulateHttpsUsername() {
+  void shouldManipulateHttpsUsername() {
     String url = "https://[email protected]:443/wcm-io-devops/jenkins-pipeline-library.git"
     underTest = new GitRepository(this.script, url)
     assertEquals(url, underTest.getUrl())
@@ -176,6 +176,14 @@ class GitRepositoryTest extends CpsScriptTestBase {
     assertEquals(url, underTest.getUrl())
   }
 
+  @Test
+  void shouldEscapeAtInUsername() {
+    String url = "https://username1@[email protected]:443/wcm-io-devops/jenkins-pipeline-library.git"
+    String expectedUrl = "https://username1%[email protected]:443/wcm-io-devops/jenkins-pipeline-library.git"
+    underTest = new GitRepository(this.script, url)
+    assertEquals(expectedUrl, underTest.getUrl())
+  }
+
   @Test(expected = AbortException.class)
   void shouldThrowExceptionOnInvalidUrl() {
     underTest = new GitRepository(this.script, "")