devsecops-engine-tools 1.45.1__tar.gz → 1.46.0__tar.gz

{devsecops_engine_tools-1.45.1 → devsecops_engine_tools-1.46.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.45.1
+Version: 1.46.0
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

{devsecops_engine_tools-1.45.1 → devsecops_engine_tools-1.46.0}/devsecops_engine_tools/engine_dast/src/applications/runner_dast_scan.py

@@ -29,17 +29,24 @@ from devsecops_engine_tools.engine_dast.src.domain.model.wa_config import (
 from devsecops_engine_tools.engine_dast.src.infrastructure.helpers.json_handler import (
     load_json_file
 )
+from devsecops_engine_tools.engine_core.src.domain.model.input_core import (
+    InputCore,
+)
+from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
+from devsecops_engine_tools.engine_utilities import settings
+
+logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 
 def runner_engine_dast(dict_args, config_tool, secret_tool, devops_platform_gateway):
-    if config_tool["TOOL"].lower() == "nuclei": # tool_gateway is the main Tool
-        tool_run = NucleiTool()
-    extra_tools = []
-    target_config = None
+    try:
+        if config_tool["TOOL"].lower() == "nuclei": # tool_gateway is the main Tool
+            tool_run = NucleiTool()
+        extra_tools = []
+        target_config = None
 
-    # Filling operations list with adapters
-    data = load_json_file(dict_args["dast_file_path"])
+        # Filling operations list with adapters
+        data = load_json_file(dict_args["dast_file_path"])
 
-    try:
         if "operations" in data: # Api
             operations: List = []
             for elem in data["operations"]:
@@ -96,5 +103,20 @@ def runner_engine_dast(dict_args, config_tool, secret_tool, devops_platform_gate
             target_data=target_config
         )
     except Exception as e:
-        raise Exception(f"Error engine_dast: {e}")
+        logger.error(f"Error engine_dast: {e}")
+        config_tool_dast = devops_platform_gateway.get_remote_config(
+            dict_args["remote_config_repo"], "engine_dast/ConfigTool.json", dict_args["remote_config_branch"]
+        )
+        if config_tool_dast["IGNORE_ERRORS"]:
+            input_core = InputCore(
+                totalized_exclusions=[],
+                threshold_defined={},
+                path_file_results="",
+                custom_message_break_build=config_tool_dast.get("MESSAGE_INFO_DAST"),
+                scope_pipeline="",
+                stage_pipeline=devops_platform_gateway.get_variable("stage"),
+            )
+            return [], input_core
+        else:
+            raise Exception(f"Error engine_dast: {e}")
         

{devsecops_engine_tools-1.45.1 → devsecops_engine_tools-1.46.0}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py

@@ -40,7 +40,7 @@ class DockerImages(ImagesGateway):
                 return None
 
             labels = image_details.get("Config", {}).get("Labels", {})
-            return self.extract_base_image_from_labels(labels, matching_image)
+            return self.extract_base_image_from_labels(labels, matching_image)[0]
         except Exception as e:
             logger.warning(f"Error obtaining base image: {e}")
             return None
@@ -50,17 +50,18 @@ class DockerImages(ImagesGateway):
             logger.error("Error: matching_image ID is None")
             return False
         image_details = self.get_image_details(matching_image.id)
-        if not image_details:
+        if not image_details.get("Config", {}).get("Labels", {}):
             return False
 
         labels = image_details.get("Config", {}).get("Labels", {})
         baseline_date = labels.get("x86.baseline.date")
-
+        date_image = None
         if baseline_date:
             date_image = self.parse_date(baseline_date)
         else:
             base_image = self.extract_base_image_from_labels(labels)
-            date_image = self.extract_date_from_image(base_image)
+            if not base_image[1]:
+                date_image = self.extract_date_from_image(base_image[0])
 
         return self.validate_date(date_image, referenced_date)
 
@@ -74,23 +75,23 @@ class DockerImages(ImagesGateway):
 
     def extract_base_image_from_labels(self, labels, matching_image=None):
         try:
-            if labels.get("repository") == 'evc/uso_especifico':
-                return None
-            source_image = labels.get("x86.image.name") or labels.get(
-                "image.base.ref.name"
-            )
-            if not source_image:
-                source_image = labels.get("source_images") or labels.get("source-image")
-
-            if source_image and matching_image:
-                logger.info(f"Base image for '{matching_image}' found: {source_image}")
-            elif matching_image:
-                logger.warning(f"Base image not found for '{matching_image}'.")
-
-            return source_image
+            if labels:
+                source_image = labels.get("x86.image.name") or labels.get("image.base.ref.name")
+                if not source_image:
+                    source_image = labels.get("source_images") or labels.get("source-image")
+                is_uso_especifico = labels.get("repository") == 'evc/uso_especifico'
+                if source_image and matching_image:
+                    logger.info(f"Base image for '{matching_image}' found: {source_image}")
+                elif matching_image:
+                    logger.warning(f"Base image not found for '{matching_image}'.")
+                return source_image, is_uso_especifico
+            else:
+                logger.warning("No labels found in image.")
+                return None, False
         except Exception as e:
             logger.error(f"Error extracting base image from labels: {e}")
-            return None
+            return None, False
+
 
     def extract_date_from_image(self, image_name):
         if not image_name:

devsecops_engine_tools-1.46.0/devsecops_engine_tools/version.py

@@ -0,0 +1 @@
+version = '1.46.0'

{devsecops_engine_tools-1.45.1 → devsecops_engine_tools-1.46.0}/devsecops_engine_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.45.1
+Version: 1.46.0
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

devsecops_engine_tools-1.45.1/devsecops_engine_tools/version.py

@@ -1 +0,0 @@
-version = '1.45.1'