@cyclonedx/cdxgen 10.2.3 → 10.2.4

package/bin/cdxgen.js

@@ -348,11 +348,13 @@ const applyAdvancedOptions = (options) => {
           "oci",
           "android",
           "apk",
-          "aab"
+          "aab",
+          "go",
+          "golang"
         ].includes(options.projectType)
       ) {
         console.log(
-          "PREVIEW: post-build lifecycle SBOM generation is supported only for android and dotnet projects. Please specify the type using the -t argument."
+          "PREVIEW: post-build lifecycle SBOM generation is supported only for android, dotnet, and go projects. Please specify the type using the -t argument."
         );
         process.exit(1);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonedx/cdxgen",
-  "version": "10.2.3",
+  "version": "10.2.4",
   "description": "Creates CycloneDX Software Bill of Materials (SBOM) from source or container image",
   "homepage": "http://github.com/cyclonedx/cdxgen",
   "author": "Prabhu Subramanian <prabhu@appthreat.com>",
@@ -57,8 +57,8 @@
     "url": "https://github.com/cyclonedx/cdxgen/issues"
   },
   "dependencies": {
-    "@babel/parser": "^7.24.0",
-    "@babel/traverse": "^7.24.0",
+    "@babel/parser": "^7.24.1",
+    "@babel/traverse": "^7.24.1",
     "@npmcli/arborist": "7.4.0",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
@@ -84,7 +84,7 @@
     "yargs": "^17.7.2"
   },
   "optionalDependencies": {
-    "@appthreat/atom": "2.0.8",
+    "@appthreat/atom": "2.0.9",
     "@appthreat/cdx-proto": "^0.0.4",
     "@cyclonedx/cdxgen-plugins-bin": "^1.5.8",
     "@cyclonedx/cdxgen-plugins-bin-arm64": "^1.5.8",

package/utils.js

@@ -6746,7 +6746,16 @@ function purlFromUrlString(type, repoUrl, version) {
     const pathnameLastElement = pathnameParts.pop();
     name = pathnameLastElement.replace(".git", "");
     const urlpath = pathnameParts.join("/");
-    namespace = hostname + ":" + urlpath;
+    namespace = hostname + "/" + urlpath;
+  } else if (repoUrl && repoUrl.startsWith("ssh://git@bitbucket")) {
+    repoUrl = repoUrl.replace("ssh://git@", "");
+    const parts = repoUrl.split(":");
+    const hostname = parts[0];
+    const pathnameParts = parts[1].split("/").slice(1);
+    const pathnameLastElement = pathnameParts.pop();
+    name = pathnameLastElement.replace(".git", "");
+    const urlpath = pathnameParts.join("/");
+    namespace = hostname + "/" + urlpath;
   } else if (repoUrl && repoUrl.startsWith("/")) {
     const parts = repoUrl.split("/");
     name = parts[parts.length - 1];

package/utils.test.js

@@ -3257,7 +3257,7 @@ test("parse swift deps files", () => {
     repository: { url: "https://github.com/apple/swift-argument-parser" }
   });
   pkgList = parseSwiftResolved("./test/data/Package2.resolved");
-  expect(pkgList.length).toEqual(6);
+  expect(pkgList.length).toEqual(7);
   expect(pkgList[0]).toEqual({
     name: "swift-argument-parser",
     group: "github.com/apple",
@@ -3280,6 +3280,54 @@ test("parse swift deps files", () => {
     "bom-ref": "pkg:swift/github.com/apple/swift-argument-parser@1.2.2",
     repository: { url: "https://github.com/apple/swift-argument-parser.git" }
   });
+  expect(pkgList[4]).toEqual({
+    name: "swift-http-server",
+    group: "github.com/swift",
+    version: "0.7.4",
+    purl: "pkg:swift/github.com/swift/swift-http-server@0.7.4",
+    properties: [{ name: "SrcFile", value: "./test/data/Package2.resolved" }],
+    evidence: {
+      identity: {
+        field: "purl",
+        confidence: 1,
+        methods: [
+          {
+            technique: "manifest-analysis",
+            confidence: 1,
+            value: "./test/data/Package2.resolved"
+          }
+        ]
+      }
+    },
+    "bom-ref": "pkg:swift/github.com/swift/swift-http-server@0.7.4",
+    repository: {
+      url: "git@github.com:swift/swift-http-server.git"
+    }
+  });
+  expect(pkgList[5]).toEqual({
+    name: "swift-http-server",
+    group: "bitbucket.org/swift",
+    version: "0.7.4",
+    purl: "pkg:swift/bitbucket.org/swift/swift-http-server@0.7.4",
+    properties: [{ name: "SrcFile", value: "./test/data/Package2.resolved" }],
+    evidence: {
+      identity: {
+        field: "purl",
+        confidence: 1,
+        methods: [
+          {
+            technique: "manifest-analysis",
+            confidence: 1,
+            value: "./test/data/Package2.resolved"
+          }
+        ]
+      }
+    },
+    "bom-ref": "pkg:swift/bitbucket.org/swift/swift-http-server@0.7.4",
+    repository: {
+      url: "ssh://git@bitbucket.org:7999/swift/swift-http-server.git"
+    }
+  });
 });
 
 test("pypi version solver tests", () => {