Merge pull request #54 from spdx/issue53

Resolve issue #53 - fix regex for git download locations

Author: goneall

src/main/java/org/spdx/library/SpdxConstants.java

@@ -361,7 +361,7 @@ public class SpdxConstants {
 	// Download Location Format
 	private static final String SUPPORTED_DOWNLOAD_REPOS = "(git|hg|svn|bzr)";
 	private static final String URL_PATTERN = "(http:\\/\\/www\\.|https:\\/\\/www\\.|http:\\/\\/|https:\\/\\/|ssh:\\/\\/|git:\\/\\/|svn:\\/\\/|sftp:\\/\\/|ftp:\\/\\/)?[a-z0-9]+([\\-\\.]{1}[a-z0-9]+){0,100}\\.[a-z]{2,5}(:[0-9]{1,5})?(\\/.*)";
-	private static final String GIT_PATTERN = "(git\\+git@[a-zA-Z0-9\\.]+:[a-zA-Z0-9]+)";
+	private static final String GIT_PATTERN = "(git\\+git@[a-zA-Z0-9\\.]+:[a-zA-Z0-9/\\\\.@]+)";
 	private static final String BAZAAR_PATTERN = "(bzr\\+lp:[a-zA-Z0-9\\.]+)";
 	public static final Pattern DOWNLOAD_LOCATION_PATTERN = Pattern.compile("^(NONE|NOASSERTION|(("+SUPPORTED_DOWNLOAD_REPOS+"\\+)?"+URL_PATTERN+")|"+GIT_PATTERN+"|"+BAZAAR_PATTERN+")$", Pattern.CASE_INSENSITIVE);
 

src/test/java/org/spdx/library/model/SpdxPackageTest.java

@@ -1454,5 +1454,26 @@ public void testSetNameString() throws InvalidSPDXAnalysisException {
 		assertEquals(PKG_NAME2, pkg2.getName().get());
 		assertEquals(PKG_NAME2, pkg.getName().get());
 	}
+	
+	public void testDownloadPattern() {
+	    assertTrue(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+	            "git://git.myproject.org/MyProject.git@master").matches());
+       assertTrue(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+               "git://git.myproject.org/MyOrg/MyProject.git@master").matches());
+        assertTrue(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+                "[email protected]:MyProject").matches());
+        assertTrue(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+                "[email protected]:MyOrg/MyProject").matches());
+        assertTrue(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+                "[email protected]:MyProject.git").matches());
+        assertTrue(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+                "[email protected]:MyOrg/MyProject.git").matches());
+        assertTrue(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+                "[email protected]:MyProject@main").matches());
+        assertTrue(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+                "[email protected]:MyProject@6338c7a2525e055a05bae1580e4dd189c2feff7b").matches());
+        assertFalse(SpdxConstants.DOWNLOAD_LOCATION_PATTERN.matcher(
+                "[email protected]:MyProject@6338c7a2525e055a05bae1580e4dd189c2feff7b").matches());
+	}
 
 }