Modify from_string for golang purls (#115)

* Modify from_string for golang purls Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com> * Fix failing tests Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com> * Address review comments Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com> --------- Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com> Co-authored-by: tdruez <489057+tdruez@users.noreply.github.com>
package-url · Dec 8, 2023 · baf0c61 · baf0c61
1 parent b3ed6ac
commit baf0c61
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 8 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.11.4 (2023-12-08)
+-------------------
+
+- Modified `PackageURL.from_string` to properly handle golang purls.
+
 0.11.3 (2023-12-08)
 --------------------
 

diff --git a/src/packageurl/__init__.py b/src/packageurl/__init__.py
@@ -500,6 +500,8 @@ def from_string(cls, purl: str) -> "PackageURL":
         if not type or not sep:
             raise ValueError(f"purl is missing the required type component: {repr(purl)}.")
 
+        type = type.lower()
+
         scheme, authority, path, qualifiers_str, subpath = _urlsplit(
             url=remainder, scheme="", allow_fragments=True
         )
@@ -530,7 +532,10 @@ def from_string(cls, purl: str) -> "PackageURL":
         ns_name_parts = ns_name.split("/")
         ns_name_parts = [seg for seg in ns_name_parts if seg and seg.strip()]
         name = ""
-        if not namespace and len(ns_name_parts) > 1:
+        if type == "golang":
+            name = "/".join(ns_name_parts)
+            namespace = ""
+        elif not namespace and len(ns_name_parts) > 1:
             name = ns_name_parts[-1]
             ns = ns_name_parts[0:-1]
             namespace = "/".join(ns)

diff --git a/src/packageurl/contrib/purl2url.py b/src/packageurl/contrib/purl2url.py
@@ -265,14 +265,13 @@ def build_golang_repo_url(purl):
     """
     purl_data = PackageURL.from_string(purl)
 
-    namespace = purl_data.namespace
     name = purl_data.name
     version = purl_data.version
 
     if name and version:
-        return f"https://pkg.go.dev/{namespace}/{name}@{version}"
+        return f"https://pkg.go.dev/{name}@{version}"
     elif name:
-        return f"https://pkg.go.dev/{namespace}/{name}"
+        return f"https://pkg.go.dev/{name}"
 
 
 # Download URLs:

diff --git a/tests/data/test-suite-data.json b/tests/data/test-suite-data.json
@@ -28,8 +28,8 @@
     "purl": "pkg:GOLANG/google.golang.org/genproto#/googleapis/api/annotations/",
     "canonical_purl": "pkg:golang/google.golang.org/genproto#googleapis/api/annotations",
     "type": "golang",
-    "namespace": "google.golang.org",
-    "name": "genproto",
+    "namespace": null,
+    "name": "google.golang.org/genproto",
     "version": null,
     "qualifiers": null,
     "subpath": "googleapis/api/annotations",
@@ -40,13 +40,25 @@
     "purl": "pkg:GOLANG/google.golang.org/genproto@abcdedf#/googleapis/api/annotations/",
     "canonical_purl": "pkg:golang/google.golang.org/genproto@abcdedf#googleapis/api/annotations",
     "type": "golang",
-    "namespace": "google.golang.org",
-    "name": "genproto",
+    "namespace": null,
+    "name": "google.golang.org/genproto",
     "version": "abcdedf",
     "qualifiers": null,
     "subpath": "googleapis/api/annotations",
     "is_invalid": false
   },
+  {
+    "description": "valid golang purl",
+    "purl": "pkg:golang/github.com/nats-io/nats-server/v2/server@v1.2.9",
+    "canonical_purl": "pkg:golang/github.com/nats-io/nats-server/v2/server@v1.2.9",
+    "type": "golang",
+    "namespace": null,
+    "name": "github.com/nats-io/nats-server/v2/server",
+    "version": "v1.2.9",
+    "qualifiers": null,
+    "subpath": null,
+    "is_invalid": false
+  },
   {
     "description": "bitbucket namespace and name should be lowercased",
     "purl": "pkg:bitbucket/birKenfeld/pyGments-main@244fd47e07d1014f0aed9c",
@@ -346,5 +358,17 @@
     "qualifiers": null,
     "subpath": "googleapis/api/annotations",
     "is_invalid": false
+  },
+  {
+    "description": "valid npm purl without namespace, version and subpath",
+    "purl": "pkg:NPM/core#/googleapis/api/annotations/",
+    "canonical_purl": "pkg:npm/core#googleapis/api/annotations",
+    "type": "npm",
+    "namespace": null,
+    "name": "core",
+    "version": null,
+    "qualifiers": null,
+    "subpath": "googleapis/api/annotations",
+    "is_invalid": false
   }
 ]