@cyclonedx/cdxgen 9.11.4 → 9.11.6

package/docker.js

@@ -693,7 +693,17 @@ export const extractTar = async (fullImageName, dir) => {
             path.includes("ssl/certs") ||
             path.includes("etc/") ||
             path.includes("logs/") ||
-            ["CharacterDevice"].includes(entry.type)
+            path.includes("dev/") ||
+            [
+              "BlockDevice",
+              "CharacterDevice",
+              "FIFO",
+              "MultiVolume",
+              "TapeVolume",
+              "SymbolicLink",
+              "RenamedOrSymlinked",
+              "HardLink"
+            ].includes(entry.type)
           ) {
             return false;
           }

package/index.js

@@ -4459,7 +4459,11 @@ export const createCsharpBom = async (path, options) => {
   if (FETCH_LICENSE) {
     const retMap = await getNugetMetadata(pkgList, dependencies);
     if (retMap.dependencies && retMap.dependencies.length) {
-      dependencies = dependencies.concat(retMap.dependencies);
+      dependencies = mergeDependencies(
+        dependencies,
+        retMap.dependencies,
+        parentComponent
+      );
     }
     pkgList = trimComponents(pkgList, "json");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonedx/cdxgen",
-  "version": "9.11.4",
+  "version": "9.11.6",
   "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/utils.js

@@ -129,7 +129,7 @@ export const SEARCH_MAVEN_ORG =
 
 // circuit breaker for search maven.org
 let search_maven_org_errors = 0;
-const MAX_SEARCH_MAVEN_ORG_ERRORS = 5;
+const MAX_SEARCH_MAVEN_ORG_ERRORS = 1;
 
 // circuit breaker for get repo license
 let get_repo_license_errors = 0;
@@ -7106,7 +7106,15 @@ export const extractJarArchive = async function (
               sha +
               "%22&rows=20&wt=json";
             const res = await cdxgenAgent.get(searchurl, {
-              responseType: "json"
+              responseType: "json",
+              timeout: {
+                lookup: 200,
+                connect: 5000,
+                secureConnect: 5000,
+                socket: 1000,
+                send: 10000,
+                response: 1000
+              }
             });
             const data = res && res.body ? res.body["response"] : undefined;
             if (data && data["numFound"] == 1) {
@@ -7118,7 +7126,9 @@ export const extractJarArchive = async function (
             }
           } catch (err) {
             if (err && err.message && !err.message.includes("404")) {
-              console.log(err);
+              if (DEBUG_MODE) {
+                console.log(err);
+              }
               search_maven_org_errors++;
             }
           }