Fix for isse #63 - Incorrect parsing of PURL with leading '/' in name…

…space
package-url · Dec 13, 2023 · 11e2aca · 11e2aca
1 parent 06c7d20
commit 11e2aca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/package-url.js b/src/package-url.js
@@ -149,7 +149,7 @@ class PackageURL {
 
     let type
     [type, remainder] = remainder.split('/', 2);
-    if (!type || !remainder) {
+    if (!type) {
       throw new Error('purl is missing the required "type" component.');
     }
     type = decodeURIComponent(type)
@@ -207,7 +207,7 @@ class PackageURL {
       let nameIndex = remaining.length - 1;
       let namespaceComponents = remaining.slice(0, nameIndex);
       name = decodeURIComponent(remaining[nameIndex]);
-      namespace = decodeURIComponent(namespaceComponents.join('/'));
+      namespace = decodeURIComponent(namespaceComponents.filter(item => item.trim()).join('/'));
     } else if (remaining.length === 1) {
       name = decodeURIComponent(remaining[0]);
     }

diff --git a/test/data/test-suite-data.json b/test/data/test-suite-data.json
@@ -430,5 +430,17 @@
     "qualifiers": null,
     "subpath": null,
     "is_invalid": false
+  },
+  {
+    "description": "In namespace, leading and trailing slashes '/' are not significant and should be stripped in the canonical form",
+    "purl": "pkg:golang//github.com/ll/[email protected]",
+    "canonical_purl": "pkg:golang/github.com/ll/[email protected]",
+    "type": "golang",
+    "namespace": "github.com/ll",
+    "name": "xlog",
+    "version": "2.0",
+    "qualifiers": null,
+    "subpath": null,
+    "is_invalid": false
   }
 ]