devsecops-engine-tools 1.93.0__tar.gz → 1.94.1__tar.gz

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.93.0
+Version: 1.94.1
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -165,7 +165,7 @@ For more information visit [here](https://github.com/bancolombia/devsecops-engin
     <td>Free</td>
   </tr>
   <tr>
-    <td rowspan="2">ENGINE_DEPENDENCIES</td>
+    <td rowspan="3">ENGINE_DEPENDENCIES</td>
     <td><a href="https://jfrog.com/help/r/get-started-with-the-jfrog-platform/jfrog-xray">XRAY</a></td>
     <td>Paid</td>
   </tr>
@@ -173,6 +173,10 @@ For more information visit [here](https://github.com/bancolombia/devsecops-engin
     <td><a href="https://owasp.org/www-project-dependency-check/">DEPENDENCY CHECK</a></td>
     <td>Free</td>
   </tr>
+  <tr>
+    <td><a href="https://trivy.dev/">TRIVY</a></td>
+    <td>Free</td>
+  </tr>
   <tr>
     <td>ENGINE_CODE</td>
     <td><a href="https://docs.bearer.com/quickstart/">BEARER</a></td>

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py

@@ -231,7 +231,7 @@ def get_inputs_from_cli(args):
         "engine_iac": ["checkov", "kics", "kubescape"],
         "engine_secret": ["trufflehog", "gitleaks"],
         "engine_container": ["prisma", "trivy"],
-        "engine_dependencies": ["xray", "dependency_check"],
+        "engine_dependencies": ["xray", "dependency_check", "trivy"],
         "engine_code": ["bearer"],
         "engine_dast": ["nuclei"],
         "engine_risk": None,

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sast/engine_iac/src/infrastructure/driven_adapters/checkov/checkov_tool.py

@@ -101,8 +101,7 @@ class CheckovTool(ToolGateway):
                     self.TOOL_CHECKOV,
                     result_scans,
                     rules_run,
-                    config_tool[self.TOOL_CHECKOV]["DEFAULT_SEVERITY"],
-                    config_tool[self.TOOL_CHECKOV]["DEFAULT_CATEGORY"],
+                    config_tool[self.TOOL_CHECKOV],
                 ),
             )
         else:

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sast/engine_iac/src/infrastructure/helpers/file_generator_tool.py

@@ -1,12 +1,13 @@
 import json
 import os
+import re
 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 generate_file_from_tool(tool, result_list, rules_doc, default_severity, default_category):
+def generate_file_from_tool(tool, result_list, rules_doc, config_tool):
     if tool == "CHECKOV":
         try:
             if len(result_list) > 0:
@@ -20,7 +21,7 @@ def generate_file_from_tool(tool, result_list, rules_doc, default_severity, defa
                 for result in result_list:
                     failed_checks = result.get("results", {}).get("failed_checks", [])
                     all_failed_checks.extend(
-                        map(lambda x: update_fields(x, rules_doc, default_severity, default_category), failed_checks)
+                        map(lambda x: update_fields(x, rules_doc, config_tool), failed_checks)
                     )
                     summary_passed += result.get("summary", {}).get("passed", 0)
                     summary_failed += result.get("summary", {}).get("failed", 0)
@@ -60,14 +61,18 @@ def generate_file_from_tool(tool, result_list, rules_doc, default_severity, defa
             logger.error(f"Error during handling checkov json integrator {ex}")
 
 
-def update_fields(check_result, rules_doc, default_severity, default_category):
+def update_fields(check_result, rules_doc, config_tool):
     rule_info = rules_doc.get(check_result.get("check_id"), {})
 
-    check_result["severity"] = rule_info.get("severity", default_severity)
-    check_result["bc_category"] = rule_info.get("category", default_category)
+    check_result["severity"] = rule_info.get("severity", config_tool.get("DEFAULT_SEVERITY"))
+    check_result["bc_category"] = rule_info.get("category", config_tool.get("DEFAULT_CATEGORY"))
     if "customID" in rule_info:
         check_result["custom_vuln_id"] = rule_info["customID"]
     if "guideline" in rule_info:
         check_result["guideline"] = rule_info["guideline"]
 
+    regex_clean = config_tool.get("REGEX_CLEAN_RESOURCE")
+    if regex_clean:
+        check_result["resource"] = re.sub(regex_clean, "", check_result.get("resource", ""))
+
     return check_result

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_container/src/applications/runner_container_scan.py

@@ -13,7 +13,7 @@ from devsecops_engine_tools.engine_sca.engine_container.src.infrastructure.drive
 from devsecops_engine_tools.engine_sca.engine_container.src.infrastructure.driven_adapters.trivy_tool.trivy_manager_scan import (
     TrivyScan,
 )
-from devsecops_engine_tools.engine_sca.engine_container.src.infrastructure.driven_adapters.trivy_tool.trivy_deserialize_output import (
+from devsecops_engine_tools.engine_utilities.trivy_utils.infrastructure.driven_adapters.trivy_deserialize_output import (
     TrivyDeserializator,
 )
 

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_container/src/domain/model/gateways/deserealizator_gateway.py

@@ -7,7 +7,7 @@ from devsecops_engine_tools.engine_sca.engine_container.src.domain.model.context
 
 class DeseralizatorGateway(metaclass=ABCMeta):
     @abstractmethod
-    def get_list_findings(self, results_scan_list: list) -> "list[Finding]":
+    def get_list_findings(self, results_scan_list: str) -> "list[Finding]":
         "Deseralizator"
 
     @abstractmethod

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_container/src/domain/usecases/container_sca_scan.py

@@ -133,7 +133,7 @@ class ContainerScaScan:
         if context_flag == "true":
             self.tool_deseralizator.get_container_context_from_results(image_scanned)
 
-        return self.tool_deseralizator.get_list_findings(image_scanned)
+        return self.tool_deseralizator.get_list_findings(image_scanned, module="engine_container")
 
     def _get_image(self, image_to_scan):
         """

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_deserialize_output.py

@@ -12,7 +12,7 @@ import json
 
 @dataclass
 class PrismaDeserealizator(DeseralizatorGateway):
-    def get_list_findings(self, image_scanned) -> "list[Finding]":
+    def get_list_findings(self, image_scanned, module="engine_container") -> "list[Finding]":
         list_open_vulnerabilities = []
         SEVERITY_MAP = {
             "unimportant": "low",
@@ -55,7 +55,7 @@ class PrismaDeserealizator(DeseralizatorGateway):
                     published_date_cve=vul.get("publishedDate", "").replace(
                         "Z", "+00:00"
                     ),
-                    module="engine_container",
+                    module=module,
                     category=Category.VULNERABILITY,
                     requirements=vul.get("status", ""),
                     tool="PrismaCloud",

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/trivy_tool/trivy_manager_scan.py

@@ -1,66 +1,20 @@
 from devsecops_engine_tools.engine_sca.engine_container.src.domain.model.gateways.tool_gateway import (
     ToolGateway,
 )
-
-import subprocess
-import platform
-import requests
-import tarfile
-import zipfile
-import json
-
-from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
-from devsecops_engine_tools.engine_utilities import settings
-
 from devsecops_engine_tools.engine_utilities.sbom.deserealizator import (
     get_list_component,
 )
+from devsecops_engine_tools.engine_utilities.trivy_utils.infrastructure.driven_adapters.trivy_manager_scan_utils import (
+    TrivyManagerScanUtils
+)
+import subprocess
+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()
 
 
 class TrivyScan(ToolGateway):
-    def download_tool(self, file, url):
-        try:
-            response = requests.get(url, allow_redirects=True)
-            with open(file, "wb") as compress_file:
-                compress_file.write(response.content)
-        except Exception as e:
-            logger.error(f"Error downloading trivy: {e}")
-
-    def install_tool(self, file, url, command_prefix):
-        installed = subprocess.run(
-            ["which", command_prefix],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-        if installed.returncode == 1:
-            try:
-                self.download_tool(file, url)
-                with tarfile.open(file, 'r:gz') as tar_file:
-                    tar_file.extract(member=tar_file.getmember("trivy"))
-                    return "./trivy"
-            except Exception as e:
-                logger.error(f"Error installing trivy: {e}")
-        else:
-            return installed.stdout.decode().strip()
-        
-    def install_tool_windows(self, file, url, command_prefix):
-        try:
-            subprocess.run(
-                [command_prefix, "--version"],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-            )
-            return command_prefix
-        except:
-            try:
-                self.download_tool(file, url)
-                with zipfile.ZipFile(file, 'r') as zip_file:
-                    zip_file.extract(member="trivy.exe")
-                    return "./trivy.exe"
-            except Exception as e:
-                logger.error(f"Error installing trivy: {e}")
 
     def scan_image(self, prefix, image_name, result_file, base_image, is_compressed_file=False):
         command = [
@@ -123,24 +77,11 @@ class TrivyScan(ToolGateway):
             logger.error(f"Error generating SBOM: {e}")
 
     def run_tool_container_sca(self, remoteconfig, secret_tool, token_engine_container, image_name, result_file, base_image, exclusions, generate_sbom, is_compressed_file=False):
-        trivy_version = remoteconfig["TRIVY"]["TRIVY_VERSION"]
-        os_platform = platform.system()
-        arch_platform = platform.architecture()[0]
-        base_url = f"https://github.com/aquasecurity/trivy/releases/download/v{trivy_version}/"
+        trivy_version = remoteconfig["TRIVY"]["TRIVY_VERSION"]        
+        command_prefix = TrivyManagerScanUtils().identify_os_and_install(trivy_version)
         sbom_components = None
-
-        command_prefix = "trivy"
-        if os_platform == "Linux":
-            file=f"trivy_{trivy_version}_Linux-{arch_platform}.tar.gz"
-            command_prefix = self.install_tool(file, base_url+file, "trivy")
-        elif os_platform == "Darwin":
-            file=f"trivy_{trivy_version}_macOS-{arch_platform}.tar.gz"
-            command_prefix = self.install_tool(file, base_url+file, "trivy")
-        elif os_platform == "Windows":
-            file=f"trivy_{trivy_version}_windows-{arch_platform}.zip"
-            command_prefix = self.install_tool_windows(file, base_url+file, "trivy.exe")
-        else:
-            logger.warning(f"{os_platform} is not supported.")
+        
+        if not command_prefix:
             return None
 
         image_scanned = (

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_dependencies/src/applications/runner_dependencies_scan.py

@@ -10,6 +10,12 @@ from devsecops_engine_tools.engine_sca.engine_dependencies.src.infrastructure.dr
 from devsecops_engine_tools.engine_sca.engine_dependencies.src.infrastructure.driven_adapters.dependency_check.dependency_check_deserialize import (
     DependencyCheckDeserialize,
 )
+from devsecops_engine_tools.engine_sca.engine_dependencies.src.infrastructure.driven_adapters.trivy_tool.trivy_manager_scan import (
+    TrivyScanSBOM,
+)
+from devsecops_engine_tools.engine_utilities.trivy_utils.infrastructure.driven_adapters.trivy_deserialize_output import (
+    TrivyDeserializator,
+)
 from devsecops_engine_tools.engine_sca.engine_dependencies.src.infrastructure.entry_points.entry_point_tool import (
     init_engine_dependencies,
 )
@@ -30,6 +36,11 @@ def runner_engine_dependencies(
                 "tool_deserializator": DependencyCheckDeserialize,
                 "tool_sbom": sbom_tool_gateway
             },
+            "TRIVY": {
+                "tool_run": TrivyScanSBOM,
+                "tool_deserializator": TrivyDeserializator,
+                "tool_sbom": sbom_tool_gateway
+            }
         }
 
         selected_tool = config_tool["ENGINE_DEPENDENCIES"]["TOOL"]

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/model/gateways/deserializator_gateway.py

@@ -4,5 +4,5 @@ from devsecops_engine_tools.engine_core.src.domain.model.finding import Finding
 
 class DeserializatorGateway(metaclass=ABCMeta):
     @abstractmethod
-    def get_list_findings(self, results_scan_file, remote_config) -> "list[Finding]":
+    def get_list_findings(self, results_scan_file) -> "list[Finding]":
         "Deserializator"

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/dependencies_sca_scan.py

@@ -61,4 +61,4 @@ class DependenciesScan:
         Process the results deserializer.
         Terun: list: Deserialized list of findings.
         """
-        return self.tool_deserializator.get_list_findings(dependencies_scanned, self.remote_config)
+        return self.tool_deserializator.get_list_findings(dependencies_scanned, remote_config=self.remote_config, module="engine_dependencies")

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/dependency_check/dependency_check_deserialize.py

@@ -20,7 +20,7 @@ logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 class DependencyCheckDeserialize(DeserializatorGateway):
     TOOL = "DEPENDENCY_CHECK"
 
-    def get_list_findings(self, dependencies_scanned_file, remote_config) -> "list[Finding]":
+    def get_list_findings(self, dependencies_scanned_file, remote_config={}, module="") -> "list[Finding]":
         dependencies, namespace = self.filter_vulnerabilities_by_confidence(dependencies_scanned_file, remote_config)
         list_open_vulnerabilities = []
 

devsecops_engine_tools-1.94.1/devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/trivy_tool/trivy_manager_scan.py

@@ -0,0 +1,117 @@
+from devsecops_engine_tools.engine_sca.engine_dependencies.src.domain.model.gateways.tool_gateway import (
+    ToolGateway,
+)
+from devsecops_engine_tools.engine_sca.engine_dependencies.src.domain.model.context_dependencies import (
+    ContextDependencies,
+)
+from devsecops_engine_tools.engine_utilities.trivy_utils.infrastructure.driven_adapters.trivy_manager_scan_utils import (
+    TrivyManagerScanUtils
+)
+import os
+import json
+import subprocess
+from dataclasses import asdict
+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()
+
+
+class TrivyScanSBOM(ToolGateway):
+    def run_tool_dependencies_sca(
+        self,
+        remote_config,
+        dict_args,
+        exclusion,
+        pipeline_name,
+        to_scan,
+        secret_tool,
+        token_engine_dependencies,
+        **kwargs,
+    ):
+        trivy_version = remote_config["TRIVY"]["CLI_VERSION"]
+        command_prefix = TrivyManagerScanUtils().identify_os_and_install(trivy_version)
+        sbom = f"{pipeline_name}_SBOM.json"
+
+        if not command_prefix:
+            return None
+
+        if not os.path.exists(sbom):
+            raise FileNotFoundError("SBOM file not found, enable SBOM generation to scan with Trivy.")
+
+        dependencies_scanned = self._scan_dependencies_sbom(command_prefix, sbom)
+
+        return dependencies_scanned
+
+    def get_dependencies_context_from_results(
+            self, 
+            path_file_results, 
+            remote_config
+    ):
+        dependencies_container_list = []
+
+        with open(path_file_results, "rb") as file:
+            image_object = file.read()
+            json_data = json.loads(image_object)
+
+        results = json_data.get("Results", [])
+
+        for result in results:
+            vulnerabilities = result.get("Vulnerabilities", [])
+            for vul in vulnerabilities:
+                context_container = ContextDependencies(
+                    cve_id=[vul.get("VulnerabilityID", "unknown")],
+                    severity=vul.get("Severity", "unknown").lower(),
+                    component=vul.get("PkgID", "unknown"),
+                    package_name=vul.get("PkgName", "unknown"),
+                    installed_version=vul.get("InstalledVersion", "unknown"),
+                    fixed_version=vul.get("FixedVersion", "unknown").split(", "),
+                    impact_paths=[],
+                    description=vul.get("Description", "unknown").replace("\n", ""),
+                    references=vul.get("References", "unknown"),
+                    source_tool="Trivy"
+                )
+                dependencies_container_list.append(context_container)
+
+        print("===== BEGIN CONTEXT OUTPUT =====")
+        print(
+            json.dumps(
+                {
+                    "dependencies_context": [
+                        asdict(context) for context in dependencies_container_list
+                    ]
+                },
+                indent=2,
+            )
+        )
+        print("===== END CONTEXT OUTPUT =====")
+
+    def _scan_dependencies_sbom(self, command_prefix, sbom_path):
+        result_file = f"{sbom_path.replace('.json', '')}_scan_result.json"
+
+        command = [
+            command_prefix,
+            "sbom",
+            sbom_path,
+            "-f",
+            "json",
+            "--scanners",
+            "vuln",
+            "-o",
+            result_file,
+        ]
+
+        try:
+            subprocess.run(
+                command,
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
+            print(f"The SBOM {sbom_path} was scanned")
+
+            return result_file
+
+        except Exception as e:
+            logger.error(f"Error during SBOM scan of {sbom_path}: {e}")

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_deserialize_output.py

@@ -46,7 +46,7 @@ class XrayDeserializator(DeserializatorGateway):
         ]
         return vulnerabilities
 
-    def get_list_findings(self, dependencies_scanned_file, remote_config) -> "list[Finding]":
+    def get_list_findings(self, dependencies_scanned_file, remote_config={}, module="") -> "list[Finding]":
         list_open_vulnerabilities = []
         with open(dependencies_scanned_file, "rb") as file:
             json_data = json.loads(file.read())

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/entry_point_tool.py

@@ -77,7 +77,6 @@ def init_engine_dependencies(
                 secret_tool,
                 build_id,
                 build_url
-
             )
             if config_sbom["ENABLED"] and any(
                 branch in str(tool_remote.get_variable("branch_tag"))

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/cmdb.py

@@ -50,9 +50,8 @@ class CmdbUserCase:
     def get_code_app(self, engagement_name: str):
         m = re.search(r"" + self.__expression, engagement_name, re.IGNORECASE)
         if m is None:
-            e = f"Engagement name {engagement_name} not match whit expression: {self.__expression}"
-            logger.error(e)
-            raise ApiError(e)
+            logger.warning(f"Engagement name {engagement_name} not match whit expression: {self.__expression}")
+            return ''
         code_app = m.group(1)
         logger.debug(code_app)
         return code_app.lower()

{devsecops_engine_tools-1.93.0/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/trivy_tool → devsecops_engine_tools-1.94.1/devsecops_engine_tools/engine_utilities/trivy_utils/infrastructure/driven_adapters}/trivy_deserialize_output.py

@@ -16,7 +16,7 @@ from datetime import datetime, timezone
 @dataclass
 class TrivyDeserializator(DeseralizatorGateway):
 
-    def get_list_findings(self, image_scanned) -> "list[Finding]":
+    def get_list_findings(self, image_scanned, remote_config={}, module="") -> "list[Finding]":
         list_open_vulnerabilities = []
         with open(image_scanned, "rb") as file:
             image_object = file.read()
@@ -36,13 +36,13 @@ class TrivyDeserializator(DeseralizatorGateway):
                         )
                     ),
                     where=vul.get("PkgName", "")
-                    + " "
+                    + ":"
                     + vul.get("InstalledVersion", ""),
                     description=vul.get("Description", "").replace("\n", "")[:150],
                     severity=vul.get("Severity", "").lower(),
                     identification_date=datetime.now().strftime("%Y-%m-%dT%H:%M:%S%z"),
                     published_date_cve=self._check_date_format(vul),
-                    module="engine_container",
+                    module=module,
                     category=Category.VULNERABILITY,
                     requirements=vul.get("FixedVersion") or vul.get("Status", ""),
                     tool="Trivy",

devsecops_engine_tools-1.94.1/devsecops_engine_tools/engine_utilities/trivy_utils/infrastructure/driven_adapters/trivy_manager_scan_utils.py

@@ -0,0 +1,73 @@
+import subprocess
+import platform
+import requests
+import tarfile
+import zipfile
+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()
+
+class TrivyManagerScanUtils():
+    def identify_os_and_install(self, trivy_version):
+        os_platform = platform.system()
+        arch_platform = platform.architecture()[0]
+        base_url = f"https://github.com/aquasecurity/trivy/releases/download/v{trivy_version}/"
+
+        command_prefix = "trivy"
+        if os_platform == "Linux":
+            file=f"trivy_{trivy_version}_Linux-{arch_platform}.tar.gz"
+            command_prefix = self._install_tool(file, base_url+file, "trivy")
+        elif os_platform == "Darwin":
+            file=f"trivy_{trivy_version}_macOS-{arch_platform}.tar.gz"
+            command_prefix = self._install_tool(file, base_url+file, "trivy")
+        elif os_platform == "Windows":
+            file=f"trivy_{trivy_version}_windows-{arch_platform}.zip"
+            command_prefix = self._install_tool_windows(file, base_url+file, "trivy.exe")
+        else:
+            logger.warning(f"{os_platform} is not supported.")
+            return None
+
+        return command_prefix
+
+    def _install_tool(self, file, url, command_prefix):
+        installed = subprocess.run(
+            ["which", command_prefix],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+        if installed.returncode == 1:
+            try:
+                self._download_tool(file, url)
+                with tarfile.open(file, 'r:gz') as tar_file:
+                    tar_file.extract(member=tar_file.getmember("trivy"))
+                    return "./trivy"
+            except Exception as e:
+                logger.error(f"Error installing trivy: {e}")
+        else:
+            return installed.stdout.decode().strip()
+        
+    def _install_tool_windows(self, file, url, command_prefix):
+        try:
+            subprocess.run(
+                [command_prefix, "--version"],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            )
+            return command_prefix
+        except:
+            try:
+                self._download_tool(file, url)
+                with zipfile.ZipFile(file, 'r') as zip_file:
+                    zip_file.extract(member="trivy.exe")
+                    return "./trivy.exe"
+            except Exception as e:
+                logger.error(f"Error installing trivy: {e}")
+    
+    def _download_tool(self, file, url):
+        try:
+            response = requests.get(url, allow_redirects=True)
+            with open(file, "wb") as compress_file:
+                compress_file.write(response.content)
+        except Exception as e:
+            logger.error(f"Error downloading trivy: {e}")

devsecops_engine_tools-1.94.1/devsecops_engine_tools/version.py

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

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.93.0
+Version: 1.94.1
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -165,7 +165,7 @@ For more information visit [here](https://github.com/bancolombia/devsecops-engin
     <td>Free</td>
   </tr>
   <tr>
-    <td rowspan="2">ENGINE_DEPENDENCIES</td>
+    <td rowspan="3">ENGINE_DEPENDENCIES</td>
     <td><a href="https://jfrog.com/help/r/get-started-with-the-jfrog-platform/jfrog-xray">XRAY</a></td>
     <td>Paid</td>
   </tr>
@@ -173,6 +173,10 @@ For more information visit [here](https://github.com/bancolombia/devsecops-engin
     <td><a href="https://owasp.org/www-project-dependency-check/">DEPENDENCY CHECK</a></td>
     <td>Free</td>
   </tr>
+  <tr>
+    <td><a href="https://trivy.dev/">TRIVY</a></td>
+    <td>Free</td>
+  </tr>
   <tr>
     <td>ENGINE_CODE</td>
     <td><a href="https://docs.bearer.com/quickstart/">BEARER</a></td>

{devsecops_engine_tools-1.93.0 → devsecops_engine_tools-1.94.1}/devsecops_engine_tools.egg-info/SOURCES.txt

@@ -234,7 +234,6 @@ devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_ada
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_deserialize_output.py
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/trivy_tool/__init__.py
-devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/trivy_tool/trivy_deserialize_output.py
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/trivy_tool/trivy_manager_scan.py
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/entry_points/__init__.py
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/entry_points/entry_point_tool.py
@@ -260,6 +259,8 @@ devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/dependency_check/__init__.py
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/dependency_check/dependency_check_deserialize.py
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/dependency_check/dependency_check_tool.py
+devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/trivy_tool/__init__.py
+devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/trivy_tool/trivy_manager_scan.py
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/__init__.py
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_deserialize_output.py
 devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_manager_scan.py
@@ -361,6 +362,11 @@ devsecops_engine_tools/engine_utilities/sonarqube/src/infrastructure/helpers/__i
 devsecops_engine_tools/engine_utilities/sonarqube/src/infrastructure/helpers/utils.py
 devsecops_engine_tools/engine_utilities/ssh/__init__.py
 devsecops_engine_tools/engine_utilities/ssh/managment_private_key.py
+devsecops_engine_tools/engine_utilities/trivy_utils/__init__.py
+devsecops_engine_tools/engine_utilities/trivy_utils/infrastructure/__init__.py
+devsecops_engine_tools/engine_utilities/trivy_utils/infrastructure/driven_adapters/__init__.py
+devsecops_engine_tools/engine_utilities/trivy_utils/infrastructure/driven_adapters/trivy_deserialize_output.py
+devsecops_engine_tools/engine_utilities/trivy_utils/infrastructure/driven_adapters/trivy_manager_scan_utils.py
 devsecops_engine_tools/engine_utilities/utils/__init__.py
 devsecops_engine_tools/engine_utilities/utils/api_error.py
 devsecops_engine_tools/engine_utilities/utils/dataclass_classmethod.py

devsecops_engine_tools-1.93.0/devsecops_engine_tools/version.py

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