retire 5.2.1 → 5.2.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [5.2.3]
+
+### Bugfix
+
+- Fix license handling for complex licenses
+
+## [5.2.2]
+
+### Bugfix
+
+- Encode purls correctly in SBOM
+
 ## [5.2.1]
 
 ### Bugfix

package/lib/license.js

@@ -15,10 +15,11 @@ function evaluateLicense(licenses, version) {
             .slice(splitIndex + 1)
             .trim()
             .split(';')
+            .map((x) => x.trim())
             .map((range) => {
             const [from, to] = range.split(' ').map((v) => v.trim());
             if (!from.startsWith('>='))
-                throw new Error("Invalid license range: 'from' must start with '>=': " + range);
+                throw new Error("Invalid license range: 'from' must start with '>=': " + range + '[' + from + ']' + '[' + to + ']');
             if (to && !to.startsWith('<'))
                 throw new Error("Invalid license range: 'to' must start with '<': " + range);
             if (to && to.startsWith('<='))

package/lib/repo.js

@@ -132,7 +132,7 @@ function validateRepository(repo, replacer) {
         bowername: z.array(z.string().regex(/^[a-z0-9.-]+$/i)).optional(),
         basePurl: z
             .string()
-            .regex(/^pkg:[a-z0-9/]+$/i)
+            .regex(/^pkg:[a-z0-9%.-/]+$/i)
             .optional(),
         npmname: z
             .string()

package/lib/reporters/utils.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePURL = generatePURL;
+function encodePURLchars(str) {
+    return str.replace(/[^A-Za-z0-9.+/=%-]/g, (match) => '%' + ('0' + match.charCodeAt(0).toString(16).toUpperCase()).slice(-2));
+}
 function generatePURL(component) {
     if (component.basePurl) {
-        return component.basePurl + '@' + component.version;
+        const [pType, ...rest] = component.basePurl.split(':');
+        const pathElements = rest.join(':').split('/').map(encodePURLchars).join('/');
+        return `${pType}:${pathElements}@${encodePURLchars(component.version)}`;
     }
     const compName = component.npmname || component.component;
-    return `pkg:npm/${compName}@${component.version}`;
+    return `pkg:npm/${encodePURLchars(compName)}@${encodePURLchars(component.version)}`;
 }

package/lib/retire.js

@@ -4,7 +4,7 @@
  */
 
 var exports = exports || {};
-exports.version = '5.2.1';
+exports.version = '5.2.3';
 
 function isDefined(o) {
   return typeof o !== 'undefined';

package/package.json

@@ -2,7 +2,7 @@
   "author": "Erlend Oftedal <erlend@oftedal.no>",
   "name": "retire",
   "description": "Retire is a tool for detecting use of vulnerable libraries",
-  "version": "5.2.1",
+  "version": "5.2.3",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",