@cyclonedx/cdxgen 11.3.0 → 11.3.1

package/bin/cdxgen.js

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
-
+import { Buffer } from "node:buffer";
 import crypto from "node:crypto";
 import fs from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import process from "node:process";
-import { URL } from "node:url";
 import { findUpSync } from "find-up";
 import globalAgent from "global-agent";
 import { load as _load } from "js-yaml";
@@ -781,6 +780,13 @@ const checkPermissions = (filePath, options) => {
   return true;
 };
 
+const needsBomSigning = ({ generateKeyAndSign }) =>
+  generateKeyAndSign ||
+  (process.env.SBOM_SIGN_ALGORITHM &&
+    process.env.SBOM_SIGN_ALGORITHM !== "none" &&
+    process.env.SBOM_SIGN_PRIVATE_KEY &&
+    safeExistsSync(process.env.SBOM_SIGN_PRIVATE_KEY));
+
 /**
  * Method to start the bom creation process
  */
@@ -838,14 +844,7 @@ const checkPermissions = (filePath, options) => {
           thoughtLog(`Let's save the file to "${jsonFile}".`);
         }
       }
-      if (
-        jsonPayload &&
-        (options.generateKeyAndSign ||
-          (process.env.SBOM_SIGN_ALGORITHM &&
-            process.env.SBOM_SIGN_ALGORITHM !== "none" &&
-            process.env.SBOM_SIGN_PRIVATE_KEY &&
-            safeExistsSync(process.env.SBOM_SIGN_PRIVATE_KEY)))
-      ) {
+      if (jsonPayload && needsBomSigning(options)) {
         let alg = process.env.SBOM_SIGN_ALGORITHM || "RS512";
         if (alg.includes("none")) {
           alg = "RS512";
@@ -857,6 +856,7 @@ const checkPermissions = (filePath, options) => {
           const jdirName = dirname(jsonFile);
           publicKeyFile = join(jdirName, "public.key");
           const privateKeyFile = join(jdirName, "private.key");
+          const privateKeyB64File = join(jdirName, "private.key.base64");
           const { privateKey, publicKey } = crypto.generateKeyPairSync("rsa", {
             modulusLength: 4096,
             publicKeyEncoding: {
@@ -870,10 +870,15 @@ const checkPermissions = (filePath, options) => {
           });
           fs.writeFileSync(publicKeyFile, publicKey);
           fs.writeFileSync(privateKeyFile, privateKey);
+          fs.writeFileSync(
+            privateKeyB64File,
+            Buffer.from(privateKey, "utf8").toString("base64"),
+          );
           console.log(
             "Created public/private key pairs for testing purposes",
             publicKeyFile,
             privateKeyFile,
+            privateKeyB64File,
           );
           privateKeyToUse = privateKey;
           jwkPublicKey = crypto

package/lib/helpers/envcontext.js

@@ -30,7 +30,7 @@ export const GIT_COMMAND = process.env.GIT_CMD || "git";
 // sdkman tool aliases
 export const SDKMAN_JAVA_TOOL_ALIASES = {
   java8: process.env.JAVA8_TOOL || "8.0.452-amzn", // Temurin no longer offers java8 :(
-  java11: process.env.JAVA11_TOOL || "11.0.26-tem",
+  java11: process.env.JAVA11_TOOL || "11.0.27-tem",
   java17: process.env.JAVA17_TOOL || "17.0.15-tem",
   java21: process.env.JAVA21_TOOL || "21.0.7-tem",
   java22: process.env.JAVA22_TOOL || "22.0.2-tem",

package/lib/managers/docker.js

@@ -84,6 +84,9 @@ export const stripAbsolutePath = (path) => {
  * Detect colima
  */
 export function detectColima() {
+  if (isColima) {
+    return true;
+  }
   if (_platform() === "darwin") {
     const result = spawnSync("colima", ["version"], {
       encoding: "utf-8",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonedx/cdxgen",
-  "version": "11.3.0",
+  "version": "11.3.1",
   "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>",

package/types/lib/managers/docker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../../lib/managers/docker.js"],"names":[],"mappings":"AAkFA;;GAEG;AACH,oCAmBC;AAED;;GAEG;AACH,4CA6CC;AA7HD,4BAA6C;AAC7C,kCAAmC,WAAW,CAAC;AAmCxC,kDAeN;AAqFM,iCAHI,MAAM,WACN,MAAM,iDAehB;AAqBM,6DAmBN;AAgLM,4EAsGN;AAEM,oFAwBN;AAUM;;;;;;;;EA2EN;AAsBM,2DAuMN;AAgBM,yFAuGN;AAMM;;;;;;;;;;;;;;GAwDN;AAEM;;;;;;;;GAyGN;AAMM,4EA+IN;AAKM,4EA2GN;AAEM,+EAEN;AAEM,4EA2CN;AAEM,iFA0BN"}
+{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../../lib/managers/docker.js"],"names":[],"mappings":"AAkFA;;GAEG;AACH,oCAsBC;AAED;;GAEG;AACH,4CA6CC;AAhID,4BAA6C;AAC7C,kCAAmC,WAAW,CAAC;AAmCxC,kDAeN;AAwFM,iCAHI,MAAM,WACN,MAAM,iDAehB;AAqBM,6DAmBN;AAgLM,4EAsGN;AAEM,oFAwBN;AAUM;;;;;;;;EA2EN;AAsBM,2DAuMN;AAgBM,yFAuGN;AAMM;;;;;;;;;;;;;;GAwDN;AAEM;;;;;;;;GAyGN;AAMM,4EA+IN;AAKM,4EA2GN;AAEM,+EAEN;AAEM,4EA2CN;AAEM,iFA0BN"}