Refine and simplify all regex patterns

tdruez · tdruez · commit cf114f70b519 · 2018-12-28T15:17:12.000-07:00
Signed-off-by: Thomas Druez &lt;tdruez@nexb.com&gt;
diff --git a/src/packageurl/contrib/url2purl.py b/src/packageurl/contrib/url2purl.py
@@ -173,7 +173,7 @@ def build_maven_purl(uri):
 # https://rubygems.org/downloads/jwt-0.1.8.gem
 rubygems_pattern = (
     r"^https?://rubygems.org/downloads/"
-    r"(?P<name>.+-?)-(?P<version>.*?)"
+    r"(?P<name>.+)-(?P<version>.+)"
     r"(\.gem)$"
 )
 
@@ -185,7 +185,7 @@ def build_rubygems_purl(uri):
 
 # https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip
 pypi_pattern = (
-    r"(?P<name>.+-?)-(?P<version>.*?)"
+    r"(?P<name>.+)-(?P<version>.+)"
     r"\.(zip|tar.gz|tar.bz2)$"
 )
 
@@ -210,7 +210,8 @@ def build_pypi_purl(uri):
 # https://www.nuget.org/api/v2/package/Newtonsoft.Json/11.0.1
 nuget_pattern1 = (
     r"^https?://.*nuget.org/(api/v2/)?packages?/"
-    r"(?P<name>.+-?)/(?P<version>.*?)$"
+    r"(?P<name>.+)/"
+    r"(?P<version>.+)$"
 )
 
 
@@ -222,8 +223,9 @@ def build_nuget_purl(uri):
 # https://api.nuget.org/v3-flatcontainer/newtonsoft.json/10.0.1/newtonsoft.json.10.0.1.nupkg
 nuget_pattern2 = (
     r"^https?://api.nuget.org/v3-flatcontainer/"
-    r"(?P<name>.+-?)/(?P<version>.*?)/"
-    r".*nupkg$"
+    r"(?P<name>.+)/"
+    r"(?P<version>.+)/"
+    r".*(nupkg)$"  # ends with "nupkg"
 )
 
 
@@ -235,8 +237,11 @@ def build_nuget_purl(uri):
 # http://master.dl.sourceforge.net/project/libpng/zlib/1.2.3/zlib-1.2.3.tar.bz2
 sourceforge_pattern = (
     r"^https?://.*sourceforge.net/project/"
-    r"(?P<namespace>.+-?)/(?P<name>.+-?)/(?P<version>[\.0-9]*?)/"
-    r"(?P=name)-(?P=version).*$"
+    r"(?P<namespace>([^/]+))/"  # do not allow more "/" segments
+    r"(?P<name>.+)/"
+    r"(?P<version>[0-9\.]+)/"  # version restricted to digits and dots
+    r"(?P=name)-(?P=version).*"  # {name}-{version} repeated in the filename
+    r"[^/]$"  # not ending with "/"
 )
 
 
diff --git a/tests/contrib/data/url2purl.json b/tests/contrib/data/url2purl.json
@@ -121,10 +121,12 @@
   "http://master.dl.sourceforge.net/project/wxmozilla/wxMozilla/0.5.5/wxMozilla-0.5.5.exe": "pkg:sourceforge/wxmozilla/wxMozilla@0.5.5",
   "http://iweb.dl.sourceforge.net/project/sblim/sblim-cim-client2/2.2.5/sblim-cim-client2-2.2.5-src.zip": "pkg:sourceforge/sblim/sblim-cim-client2@2.2.5",
   "http://master.dl.sourceforge.net/project/zinnia/zinnia-win32/0.06/zinnia-win32-0.06.zip": "pkg:sourceforge/zinnia/zinnia-win32@0.06",
+  "http://iweb.dl.sourceforge.net/project/findbugs/findbugs/1.3.4/findbugs-1.3.4.tar.gz/": null,
   "http://master.dl.sourceforge.net/project/pwiki/pwiki/0.1.2/0.1.2.zip": null,
   "http://master.dl.sourceforge.net/project/iswraid/iswraid/0.1.4.3/2.4.28-pre3-iswraid.patch.gz": null,
   "http://master.dl.sourceforge.net/project/aloyscore/aloyscore/0.1a1%20stable/0.1a1_stable_AloysCore.zip": null,
   "http://master.dl.sourceforge.net/project/myenterprise/OldFiles/1.0.0.2.MyEnterprise.Source.zip": null,
   "http://master.dl.sourceforge.net/project/wxhaskell/wxhaskell/wxhaskell-0.9/wxhaskell-src-0.9.zip": null,
-  "http://master.dl.sourceforge.net/project/a2freedom/A2/1.2/a2freedom-1.2.zip": null
+  "http://master.dl.sourceforge.net/project/a2freedom/A2/1.2/a2freedom-1.2.zip": null,
+  "http://master.dl.sourceforge.net/project/zclasspath/maven2/org/zclasspath/zclasspath/1.5/zclasspath-1.5.jar": null
 }
