ds-xbom-lib 6.0.0a2__tar.gz → 6.0.0b2__tar.gz

{ds_xbom_lib-6.0.0a2 → ds_xbom_lib-6.0.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ds-xbom-lib
-Version: 6.0.0a2
+Version: 6.0.0b2
 Summary: xBOM library for owasp depscan
 Author-email: Team AppThreat <cloud@appthreat.com>
 License-Expression: MIT

{ds_xbom_lib-6.0.0a2 → ds_xbom_lib-6.0.0b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ds-xbom-lib"
-version = "6.0.0a2"
+version = "6.0.0b2"
 description = "xBOM library for owasp depscan"
 authors = [
     {name = "Team AppThreat", email = "cloud@appthreat.com"},

{ds_xbom_lib-6.0.0a2 → ds_xbom_lib-6.0.0b2}/src/ds_xbom_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ds-xbom-lib
-Version: 6.0.0a2
+Version: 6.0.0b2
 Summary: xBOM library for owasp depscan
 Author-email: Team AppThreat <cloud@appthreat.com>
 License-Expression: MIT

{ds_xbom_lib-6.0.0a2 → ds_xbom_lib-6.0.0b2}/src/xbom_lib/cdxgen.py

@@ -17,6 +17,9 @@ cdxgen_server_headers = {
     "Accept-Encoding": "gzip",
 }
 
+# cdxgen timeout. Increased to 30 minutes
+CDXGEN_TIMEOUT_MS = os.getenv("CDXGEN_TIMEOUT_MS", str(int(30 * 60 * 1000)))
+
 # version of cdxgen to use
 CDXGEN_IMAGE_VERSION = os.getenv("CDXGEN_IMAGE_VERSION", "latest")
 CDXGEN_IMAGE_ROLLING_VERSION = os.getenv("CDXGEN_IMAGE_ROLLING_VERSION", "v11")
@@ -271,6 +274,7 @@ class CdxgenGenerator(XBOMGenerator):
                 prefix="cdxgen-temp-", dir=os.getenv("DEPSCAN_TEMP_DIR")
             )
             env["CDXGEN_TEMP_DIR"] = cdxgen_temp_dir
+        env["CDXGEN_TIMEOUT_MS"] = CDXGEN_TIMEOUT_MS
         if cdxgen_cmd:
             bom_result = exec_tool(
                 args,
@@ -405,6 +409,7 @@ class CdxgenImageBasedGenerator(CdxgenGenerator):
                 or k in ("FETCH_LICENSE",)
             ):
                 run_command_args += ["-e", k]
+        run_command_args += ["-e", f"CDXGEN_TIMEOUT_MS={CDXGEN_TIMEOUT_MS}"]
         # Enabling license fetch will improve metadata such as tags and description
         # These will help with semantic reachability analysis
         if self.options.get("profile") not in ("generic",):
@@ -478,7 +483,9 @@ class CdxgenImageBasedGenerator(CdxgenGenerator):
         # Should we pull the most recent image
         if needs_latest_image(image_name):
             if self.logger:
-                self.logger.debug(f"Pulling the image {image_name} using {container_command}.")
+                self.logger.debug(
+                    f"Pulling the image {image_name} using {container_command}."
+                )
             exec_tool(
                 [container_command, "pull", "--quiet", image_name], logger=self.logger
             )