devsecops-engine-tools 1.27.0__tar.gz → 1.28.0__tar.gz

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.27.0
+Version: 1.28.0
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -70,7 +70,7 @@ pip3 install devsecops-engine-tools
 ### Scan running - flags (CLI)
 
 ```bash
-devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --remote_config_branch ["remote_config_branch"] --tool ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container", "engine_risk", "engine_code"] --folder_path ["Folder path scan engine_iac, engine_code and engine_dependencies"] --platform ["k8s","cloudformation","docker", "openapi", "terraform"] --use_secrets_manager ["false", "true"] --use_vulnerability_management ["false", "true"] --send_metrics ["false", "true"] --token_cmdb ["token_cmdb"] --token_vulnerability_management ["token_vulnerability_management"] --token_engine_container ["token_engine_container"] --token_engine_dependencies ["token_engine_dependencies"] --token_external_checks ["token_external_checks"] --xray_mode ["scan", "audit"] --image_to_scan ["image_to_scan"]
+devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --remote_config_branch ["remote_config_branch"] --tool ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container", "engine_risk", "engine_code"] --folder_path ["Folder path scan engine_iac, engine_code, engine_dependencies and engine_secret"] --platform ["k8s","cloudformation","docker", "openapi", "terraform"] --use_secrets_manager ["false", "true"] --use_vulnerability_management ["false", "true"] --send_metrics ["false", "true"] --token_cmdb ["token_cmdb"] --token_vulnerability_management ["token_vulnerability_management"] --token_engine_container ["token_engine_container"] --token_engine_dependencies ["token_engine_dependencies"] --token_external_checks ["token_external_checks"] --xray_mode ["scan", "audit"] --image_to_scan ["image_to_scan"]
 ```
 
 ### Structure Remote Config
@@ -99,7 +99,7 @@ devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_con
    ┃   ┗ 📜ConfigTool.json
    ┃   ┗ 📜Exclusions.json
 ```
-
+For more information visit [here](https://github.com/bancolombia/devsecops-engine-tools/blob/trunk/example_remote_config_local/README.md)
 #### Tools available for the modules (Configuration engine_core/ConfigTool.json)
 
 

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py

@@ -101,7 +101,7 @@ def get_inputs_from_cli(args):
         "--folder_path",
         type=str,
         required=False,
-        help="Folder Path to scan, only apply engine_iac, engine_code and engine_dependencies tools",
+        help="Folder Path to scan, only apply engine_iac, engine_code, engine_secret and engine_dependencies tools",
     )
     parser.add_argument(
         "-p",

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_core/src/domain/model/vulnerability_management.py

@@ -18,3 +18,6 @@ class VulnerabilityManagement:
     branch_tag: str
     commit_hash: str
     environment: str
+    vm_product_type_name: str
+    vm_product_name: str
+    vm_product_description: str

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_core/src/domain/usecases/handle_scan.py

@@ -196,6 +196,9 @@ class HandleScan:
                             self.devops_platform_gateway.get_variable("branch_tag"),
                             self.devops_platform_gateway.get_variable("commit_hash"),
                             env,
+                            self.devops_platform_gateway.get_variable("vm_product_type_name"),
+                            self.devops_platform_gateway.get_variable("vm_product_name"),
+                            self.devops_platform_gateway.get_variable("vm_product_description"),
                         )
                     )
 

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/azure/azure_devops.py

@@ -7,6 +7,7 @@ from devsecops_engine_tools.engine_utilities.azuredevops.models.AzurePredefinedV
     SystemVariables,
     ReleaseVariables,
     AgentVariables,
+    VMVariables
 )
 from devsecops_engine_tools.engine_utilities.azuredevops.infrastructure.azure_devops_api import (
     AzureDevopsApi,
@@ -95,6 +96,9 @@ class AzureDevops(DevopsPlatformGateway):
                 "target_branch": SystemVariables.System_TargetBranchName,
                 "source_branch": SystemVariables.System_SourceBranch,
                 "repository_provider": BuildVariables.Build_Repository_Provider,
+                "vm_product_type_name": VMVariables.Vm_Product_Type_Name,
+                "vm_product_name": VMVariables.Vm_Product_Name,
+                "vm_product_description": VMVariables.Vm_Product_Description,
             }
             try:
                 return variable_map.get(variable).value()

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/defect_dojo.py

@@ -30,6 +30,7 @@ from functools import partial
 
 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.defect_dojo.domain.serializers.import_scan import ImportScanSerializer
 import time
 import concurrent.futures
 
@@ -87,44 +88,17 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 tags = vulnerability_management.dict_args["tool"]
                 if vulnerability_management.dict_args["tool"] == "engine_iac":
                     tags = f"{vulnerability_management.dict_args['tool']}_{'_'.join(vulnerability_management.dict_args['platform'])}"
-                request: ImportScanRequest = Connect.cmdb(
-                    cmdb_mapping={
-                        "product_type_name": "nombreevc",
-                        "product_name": "nombreapp",
-                        "tag_product": "nombreentorno",
-                        "product_description": "arearesponsableti",
-                        "codigo_app": "CodigoApp",
-                    },
-                    compact_remote_config_url=f'{vulnerability_management.base_compact_remote_config_url}{vulnerability_management.config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["CMDB_MAPPING_PATH"]}',
-                    personal_access_token=vulnerability_management.access_token,
-                    token_cmdb=token_cmdb,
-                    host_cmdb=vulnerability_management.config_tool[
-                        "VULNERABILITY_MANAGER"
-                    ]["DEFECT_DOJO"]["HOST_CMDB"],
-                    expression=vulnerability_management.config_tool[
-                        "VULNERABILITY_MANAGER"
-                    ]["DEFECT_DOJO"]["REGEX_EXPRESSION_CMDB"],
-                    token_defect_dojo=token_dd,
-                    host_defect_dojo=vulnerability_management.config_tool[
-                        "VULNERABILITY_MANAGER"
-                    ]["DEFECT_DOJO"]["HOST_DEFECT_DOJO"],
-                    scan_type=scan_type_mapping[vulnerability_management.scan_type],
-                    engagement_name=vulnerability_management.input_core.scope_pipeline,
-                    service=vulnerability_management.input_core.scope_pipeline,
-                    file=vulnerability_management.input_core.path_file_results,
-                    version=vulnerability_management.version,
-                    build_id=vulnerability_management.build_id,
-                    source_code_management_uri=vulnerability_management.source_code_management_uri,
-                    branch_tag=vulnerability_management.branch_tag,
-                    commit_hash=vulnerability_management.commit_hash,
-                    environment=(
-                        enviroment_mapping[vulnerability_management.environment.lower()]
-                        if vulnerability_management.environment is not None
-                        and vulnerability_management.environment.lower()
-                        in enviroment_mapping
-                        else enviroment_mapping["default"]
-                    ),
-                    tags=tags,
+
+                use_cmdb = vulnerability_management.config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["CMDB"]["USE_CMDB"]
+
+                request = self._build_request_importscan(
+                    vulnerability_management,
+                    token_cmdb,
+                    token_dd,
+                    scan_type_mapping,
+                    enviroment_mapping,
+                    tags,
+                    use_cmdb
                 )
 
                 def request_func():
@@ -170,7 +144,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                     request={
                         "name": Connect.get_code_app(
                             service,
-                            config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"][
+                            config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["CMDB"][
                                 "REGEX_EXPRESSION_CMDB"
                             ],
                         ),
@@ -387,6 +361,74 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                     ex
                 )
             )
+        
+    def _build_request_importscan(
+        self,
+        vulnerability_management: VulnerabilityManagement,
+        token_cmdb,
+        token_dd,
+        scan_type_mapping,
+        enviroment_mapping,
+        tags,
+        use_cmdb: bool
+    ):
+        common_fields = {
+            "scan_type": scan_type_mapping[vulnerability_management.scan_type],
+            "file": vulnerability_management.input_core.path_file_results,
+            "engagement_name": vulnerability_management.input_core.scope_pipeline,
+            "source_code_management_uri": vulnerability_management.source_code_management_uri,
+            "tags": tags,
+            "version": vulnerability_management.version,
+            "build_id": vulnerability_management.build_id,
+            "branch_tag": vulnerability_management.branch_tag,
+            "commit_hash": vulnerability_management.commit_hash,
+            "service": vulnerability_management.input_core.scope_pipeline,
+            "environment": (
+                enviroment_mapping[vulnerability_management.environment.lower()]
+                if vulnerability_management.environment is not None
+                and vulnerability_management.environment.lower()
+                in enviroment_mapping
+                else enviroment_mapping["default"]
+            ),
+            "token_defect_dojo": token_dd,
+            "host_defect_dojo": vulnerability_management.config_tool[
+                "VULNERABILITY_MANAGER"
+            ]["DEFECT_DOJO"]["HOST_DEFECT_DOJO"],
+            "expression": vulnerability_management.config_tool[
+                "VULNERABILITY_MANAGER"
+            ]["DEFECT_DOJO"]["CMDB"]["REGEX_EXPRESSION_CMDB"],
+        }
+
+        if use_cmdb:
+            cmdb_mapping = vulnerability_management.config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["CMDB"]["CMDB_MAPPING"]
+            return Connect.cmdb(
+                cmdb_mapping={
+                    "product_type_name": cmdb_mapping["PRODUCT_TYPE_NAME"],
+                    "product_name": cmdb_mapping["PRODUCT_NAME"],
+                    "tag_product": cmdb_mapping["TAG_PRODUCT"],
+                    "product_description": cmdb_mapping["PRODUCT_DESCRIPTION"],
+                    "codigo_app": cmdb_mapping["CODIGO_APP"],
+                },
+                compact_remote_config_url=f'{vulnerability_management.base_compact_remote_config_url}{vulnerability_management.config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["CMDB"]["CMDB_MAPPING_PATH"]}',
+                personal_access_token=vulnerability_management.access_token,
+                token_cmdb=token_cmdb,
+                host_cmdb=vulnerability_management.config_tool[
+                    "VULNERABILITY_MANAGER"
+                ]["DEFECT_DOJO"]["CMDB"]["HOST_CMDB"],
+                cmdb_request_response=vulnerability_management.config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["CMDB"]["CMDB_REQUEST_RESPONSE"],
+                **common_fields,
+            )
+        else:
+            request: ImportScanRequest = ImportScanSerializer().load(
+                {
+                    "product_type_name":vulnerability_management.vm_product_type_name,
+                    "product_name": vulnerability_management.vm_product_name,
+                    "product_description":vulnerability_management.vm_product_description,
+                    "code_app":vulnerability_management.vm_product_name,
+                    **common_fields,
+                }
+            )
+            return request
 
     def _process_component(self, component_sbom, session_manager, engagement):
         request = {

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/github/github_actions.py

@@ -6,7 +6,8 @@ from devsecops_engine_tools.engine_utilities.github.models.GithubPredefinedVaria
     BuildVariables,
     SystemVariables,
     ReleaseVariables,
-    AgentVariables
+    AgentVariables,
+    VMVariables
 )
 from devsecops_engine_tools.engine_utilities.github.infrastructure.github_api import (
     GithubApi,
@@ -85,6 +86,9 @@ class GithubActions(DevopsPlatformGateway):
             "target_branch": SystemVariables.github_event_base_ref,
             "source_branch": SystemVariables.github_ref,
             "repository_provider": BuildVariables.GitHub,
+            "vm_product_type_name": VMVariables.Vm_Product_Type_Name,
+            "vm_product_name": VMVariables.Vm_Product_Name,
+            "vm_product_description": VMVariables.Vm_Product_Description,
         }
         try:
             return variable_map.get(variable).value()

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/runtime_local/runtime_local.py

@@ -21,7 +21,7 @@ class RuntimeLocal(DevopsPlatformGateway):
     def get_remote_config(self, repository, path, branch=""):
         remote_config_path = f"{repository}/{path}"
 
-        with open(remote_config_path) as f:
+        with open(remote_config_path, 'r', encoding='utf-8') as f:
             return json.load(f)
 
     def message(self, type, message):
@@ -66,6 +66,9 @@ class RuntimeLocal(DevopsPlatformGateway):
             "temp_directory" : "DET_TEMP_DIRECTORY",
             "target_branch" : "DET_TARGET_BRANCH",
             "source_branch" : "DET_SOURCE_BRANCH",
-            "repository_provider" : "DET_REPOSITORY_PROVIDER"
+            "repository_provider" : "DET_REPOSITORY_PROVIDER",
+            "vm_product_type_name" : "DET_VM_PRODUCT_TYPE_NAME",
+            "vm_product_name" : "DET_VM_PRODUCT_NAME",
+            "vm_product_description" : "DET_VM_PRODUCT_DESCRIPTION",
         }
         return os.environ.get(env_variables[variable], None)

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_sast/engine_secret/src/domain/model/gateway/tool_gateway.py

@@ -1,5 +1,4 @@
 from abc import ABCMeta, abstractmethod
-from devsecops_engine_tools.engine_sast.engine_secret.src.domain.model.DeserializeConfigTool import DeserializeConfigTool
 
 class ToolGateway(metaclass=ABCMeta):
     @abstractmethod
@@ -11,8 +10,9 @@ class ToolGateway(metaclass=ABCMeta):
                             agent_os: str,
                             agent_work_folder: str,
                             repository_name: str,
-                            config_tool: DeserializeConfigTool,
+                            config_tool,
                             secret_tool,
                             secret_external_checks,
-                            agent_tem_dir:str) -> str:
+                            agent_tem_dir:str,
+                            tool) -> str:
         "run tool secret scan"

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/secret_scan.py

@@ -1,8 +1,5 @@
 import re
-from devsecops_engine_tools.engine_core.src.domain.model.input_core import InputCore
-from devsecops_engine_tools.engine_sast.engine_secret.src.domain.model.DeserializeConfigTool import (
-    DeserializeConfigTool,
-)
+
 from devsecops_engine_tools.engine_sast.engine_secret.src.domain.model.gateway.tool_gateway import (
     ToolGateway,
 )
@@ -29,31 +26,35 @@ class SecretScan:
         self.tool_deserialize = tool_deserialize
         self.git_gateway = git_gateway
 
-    def process(self, skip_tool, config_tool, secret_tool, dict_args):
+    def process(self, skip_tool, config_tool, secret_tool, dict_args, tool):
+        tool = str(tool).lower()
         finding_list = []
         file_path_findings = ""
         secret_external_checks=dict_args["token_external_checks"]
+        files_to_scan = None if dict_args["folder_path"] is None else [dict_args["folder_path"]]
         if skip_tool == False:
-            self.tool_gateway.install_tool(self.devops_platform_gateway.get_variable("os"), self.devops_platform_gateway.get_variable("temp_directory"), config_tool.tool_version)
-            files_pullrequest = self.git_gateway.get_files_pull_request(
-                self.devops_platform_gateway.get_variable("path_directory"),
-                self.devops_platform_gateway.get_variable("target_branch"),
-                config_tool.target_branches,
-                self.devops_platform_gateway.get_variable("source_branch"),
-                self.devops_platform_gateway.get_variable("access_token"),
-                self.devops_platform_gateway.get_variable("organization"),
-                self.devops_platform_gateway.get_variable("project_name"),
-                self.devops_platform_gateway.get_variable("repository"),
-                self.devops_platform_gateway.get_variable("repository_provider"))
+            self.tool_gateway.install_tool(self.devops_platform_gateway.get_variable("os"), self.devops_platform_gateway.get_variable("temp_directory"), config_tool[tool]["VERSION"])
+            if files_to_scan is None:
+                files_to_scan = self.git_gateway.get_files_pull_request(
+                    self.devops_platform_gateway.get_variable("path_directory"),
+                    self.devops_platform_gateway.get_variable("target_branch"),
+                    config_tool["TARGET_BRANCHES"],
+                    self.devops_platform_gateway.get_variable("source_branch"),
+                    self.devops_platform_gateway.get_variable("access_token"),
+                    self.devops_platform_gateway.get_variable("organization"),
+                    self.devops_platform_gateway.get_variable("project_name"),
+                    self.devops_platform_gateway.get_variable("repository"),
+                    self.devops_platform_gateway.get_variable("repository_provider"))
             findings, file_path_findings = self.tool_gateway.run_tool_secret_scan(
-                    files_pullrequest,
+                    files_to_scan,
                     self.devops_platform_gateway.get_variable("os"),
                     self.devops_platform_gateway.get_variable("path_directory"),
                     self.devops_platform_gateway.get_variable("repository"),
                     config_tool,
                     secret_tool,
                     secret_external_checks,
-                    self.devops_platform_gateway.get_variable("temp_directory"))
+                    self.devops_platform_gateway.get_variable("temp_directory"),
+                    tool)
             finding_list = self.tool_deserialize.get_list_vulnerability(
                 findings,
                 self.devops_platform_gateway.get_variable("os"),
@@ -69,12 +70,11 @@ class SecretScan:
         init_config_tool = self.devops_platform_gateway.get_remote_config(
             dict_args["remote_config_repo"], "engine_sast/engine_secret/ConfigTool.json", dict_args["remote_config_branch"]
         )
-        config_tool = DeserializeConfigTool(json_data=init_config_tool, tool=tool)
-        config_tool.scope_pipeline = self.devops_platform_gateway.get_variable("pipeline_name")
+        init_config_tool['SCOPE_PIPELINE'] = self.devops_platform_gateway.get_variable("pipeline_name")
 
-        skip_tool = bool(re.match(config_tool.ignore_search_pattern, config_tool.scope_pipeline, re.IGNORECASE))
+        skip_tool = bool(re.match(init_config_tool["IGNORE_SEARCH_PATTERN"], init_config_tool["SCOPE_PIPELINE"], re.IGNORECASE))
         
-        return config_tool, skip_tool
+        return init_config_tool, skip_tool
         
     def skip_from_exclusion(self, exclusions, skip_tool_isp):
         """

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/set_input_core.py

@@ -2,12 +2,9 @@ from devsecops_engine_tools.engine_core.src.domain.model.input_core import Input
 from devsecops_engine_tools.engine_core.src.domain.model.gateway.devops_platform_gateway import (
     DevopsPlatformGateway,
 )
-from devsecops_engine_tools.engine_sast.engine_secret.src.domain.model.DeserializeConfigTool import (
-    DeserializeConfigTool,
-)
 from devsecops_engine_tools.engine_core.src.domain.model.exclusions import Exclusions
 from devsecops_engine_tools.engine_utilities.utils.utils import Utils
-
+from devsecops_engine_tools.engine_core.src.domain.model.threshold import Threshold
 
 class SetInputCore:
     def __init__(
@@ -15,7 +12,7 @@ class SetInputCore:
         tool_remote: DevopsPlatformGateway,
         dict_args,
         tool,
-        config_tool: DeserializeConfigTool,
+        config_tool,
     ):
         self.tool_remote = tool_remote
         self.dict_args = dict_args
@@ -80,12 +77,12 @@ class SetInputCore:
             ),
             threshold_defined=Utils.update_threshold(
                 self,
-                self.config_tool.level_compliance,
+                Threshold(self.config_tool['THRESHOLD']),
                 exclusions_config,
-                self.config_tool.scope_pipeline,
+                self.config_tool["SCOPE_PIPELINE"],
             ),
             path_file_results=finding_list,
-            custom_message_break_build=self.config_tool.message_info_engine_secret,
-            scope_pipeline=self.config_tool.scope_pipeline,
+            custom_message_break_build=self.config_tool["MESSAGE_INFO_ENGINE_SECRET"],
+            scope_pipeline=self.config_tool["SCOPE_PIPELINE"],
             stage_pipeline=self.tool_remote.get_variable("stage").capitalize(),
         )

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/trufflehog/trufflehog_run.py

@@ -7,11 +7,10 @@ import concurrent.futures
 from devsecops_engine_tools.engine_sast.engine_secret.src.domain.model.gateway.tool_gateway import (
     ToolGateway,
 )
-from devsecops_engine_tools.engine_utilities.github.infrastructure.github_api import (
-    GithubApi,
-)
+
 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.utils.utils import Utils
 
 logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 
@@ -44,7 +43,7 @@ class TrufflehogRun(ToolGateway):
 
     def run_install(self, tool_version):
         command = f"curl -sSfL https://raw.githubusercontent.com/trufflesecurity/trufflehog/main/scripts/install.sh | sh -s -- -b /usr/local/bin v{tool_version}"
-        res = subprocess.run(command, capture_output=True, shell=True)
+        subprocess.run(command, capture_output=True, shell=True)
 
     def run_install_win(self, agent_temp_dir, tool_version):
         command_complete = f"powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; [Net.ServicePointManager]::SecurityProtocol; New-Item -Path {agent_temp_dir} -ItemType Directory -Force; Invoke-WebRequest -Uri 'https://github.com/trufflesecurity/trufflehog/releases/download/v{tool_version}/trufflehog_{tool_version}_windows_amd64.tar.gz' -OutFile {agent_temp_dir}/trufflehog.tar.gz -UseBasicParsing; tar -xzf {agent_temp_dir}/trufflehog.tar.gz -C {agent_temp_dir}; Remove-Item {agent_temp_dir}/trufflehog.tar.gz; $env:Path += '; + {agent_temp_dir}'; & {agent_temp_dir}/trufflehog.exe --version"
@@ -62,35 +61,20 @@ class TrufflehogRun(ToolGateway):
         config_tool,
         secret_tool,
         secret_external_checks,
-        agent_temp_dir
+        agent_temp_dir,
+        tool
     ):
         trufflehog_command = "trufflehog"
         if "Windows" in agent_os:
             trufflehog_command = f"{agent_temp_dir}/trufflehog.exe"
         with open(f"{agent_work_folder}/excludedPath.txt", "w") as file:
-            file.write("\n".join(config_tool.exclude_path))
+            file.write("\n".join(config_tool[tool]["EXCLUDE_PATH"]))
         exclude_path = f"{agent_work_folder}/excludedPath.txt"
         include_paths = self.config_include_path(files_commits, agent_work_folder, agent_os)
-        enable_custom_rules = config_tool.enable_custom_rules.lower()
-        secret = None
-        github_api = GithubApi()
-
-        if secret_tool is not None:
-            secret_tmp = secret_tool
-            secret = github_api.get_installation_access_token(
-                secret_tmp["github_token"],
-                config_tool.app_id_github,
-                config_tool.installation_id_github
-            )
-        elif secret_external_checks is not None:
-            secret = secret_external_checks.split("github:")[1] if "github" in secret_external_checks else None            
+        enable_custom_rules = config_tool[tool]["ENABLE_CUSTOM_RULES"]
+        Utils().configurate_external_checks(tool, config_tool, secret_tool, secret_external_checks, agent_work_folder)
 
-        if enable_custom_rules == "true" and secret is not None:
-            self.configurate_external_checks(config_tool, secret)
-        else: #In case that remote config from tool is enable but in the args dont send any type of secrets. So dont modified command
-            enable_custom_rules = "false"
-
-        with concurrent.futures.ThreadPoolExecutor(max_workers=config_tool.number_threads) as executor:
+        with concurrent.futures.ThreadPoolExecutor(max_workers=config_tool[tool]["NUMBER_THREADS"]) as executor:
             results = executor.map(
                 self.run_trufflehog,
                 [trufflehog_command] * len(include_paths),
@@ -99,8 +83,9 @@ class TrufflehogRun(ToolGateway):
                 include_paths,
                 [repository_name] * len(include_paths),
                 [enable_custom_rules] * len(include_paths),
+                [agent_os] * len(include_paths)
             )
-        findings, file_findings = self.create_file(self.decode_output(results), agent_work_folder, config_tool)
+        findings, file_findings = self.create_file(self.decode_output(results), agent_work_folder, config_tool, tool)
         return  findings, file_findings
 
     def config_include_path(self, files, agent_work_folder, agent_os):
@@ -130,13 +115,16 @@ class TrufflehogRun(ToolGateway):
         exclude_path,
         include_path,
         repository_name,
-        enable_custom_rules
+        enable_custom_rules,
+        agent_os
     ):
         command = f"{trufflehog_command} filesystem {agent_work_folder + '/' + repository_name} --include-paths {include_path} --exclude-paths {exclude_path} --no-verification --no-update --json"
 
-        if str(enable_custom_rules).lower() == "true":
-            command = command.replace("--no-verification --no-update --json", "--config /tmp/rules/trufflehog/custom-rules.yaml --no-verification --no-update --json")
-
+        if enable_custom_rules:
+            command = command.replace("--no-verification --no-update --json", f"--config {agent_work_folder}//rules//trufflehog//custom-rules.yaml --no-verification --no-update --json" if "Windows" in agent_os else
+                                      "/tmp/rules/trufflehog/custom-rules.yaml --no-verification --no-update --json" if "Linux" in agent_os else
+                                      "--no-verification --no-update --json")
+            
         result = subprocess.run(command, capture_output=True, shell=True, text=True, encoding='utf-8')
         return result.stdout.strip()
 
@@ -150,7 +138,7 @@ class TrufflehogRun(ToolGateway):
                         result.append(json_obj)
         return result
     
-    def create_file(self, findings, agent_work_folder, config_tool):
+    def create_file(self, findings, agent_work_folder, config_tool, tool):
         file_findings = os.path.join(agent_work_folder, "secret_scan_result.json")
         with open(file_findings, "w") as file:
             for find in findings:
@@ -159,20 +147,8 @@ class TrufflehogRun(ToolGateway):
                 where_text = original_where.replace(agent_work_folder, "")
                 find["SourceMetadata"]["Data"]["Filesystem"]["file"] = where_text
                 find["Id"] = "MISCONFIGURATION_SCANNING" if "exposure" in find["Raw"] else "SECRET_SCANNING"
-                find["References"] = config_tool.extradata_rules[find["Id"]]["References"] if "SECRET_SCANNING" not in find["Id"] else "N.A"
-                find["Mitigation"] = config_tool.extradata_rules[find["Id"]]["Mitigation"] if "SECRET_SCANNING" not in find["Id"] else "N.A"
+                find["References"] = config_tool[tool]["RULES"][find["Id"]]["References"] if "SECRET_SCANNING" not in find["Id"] else "N.A"
+                find["Mitigation"] = config_tool[tool]["RULES"][find["Id"]]["Mitigation"] if "SECRET_SCANNING" not in find["Id"] else "N.A"
                 json_str = json.dumps(find)
                 file.write(json_str + '\n')
-        return findings, file_findings
-    
-    def configurate_external_checks(self, config_tool, secret):
-        try:
-            github_api = GithubApi()
-            github_api.download_latest_release_assets(
-                config_tool.external_dir_owner,
-                config_tool.external_dir_repo,
-                secret,
-                "/tmp",
-            )
-        except Exception as ex:
-            logger.error(f"An error ocurred download external checks {ex}")
+        return findings, file_findings

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/entry_points/entry_point_tool.py

@@ -11,6 +11,6 @@ def engine_secret_scan(devops_platform_gateway, tool_gateway, dict_args, tool, t
     secret_scan = SecretScan(tool_gateway, devops_platform_gateway, tool_deserealizator, git_gateway)
     config_tool, skip_tool_isp = secret_scan.complete_config_tool(dict_args, tool)
     skip_tool = secret_scan.skip_from_exclusion(exclusions, skip_tool_isp)
-    finding_list, file_path_findings = secret_scan.process(skip_tool, config_tool, secret_tool, dict_args)
+    finding_list, file_path_findings = secret_scan.process(skip_tool, config_tool, secret_tool, dict_args, tool)
     input_core = SetInputCore(devops_platform_gateway, dict_args, tool, config_tool)
     return finding_list, input_core.set_input_core(file_path_findings)

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_utilities/azuredevops/models/AzurePredefinedVariables.py

@@ -63,3 +63,8 @@ class AgentVariables(BaseEnum):
     Agent_WorkFolder = "Agent.WorkFolder"
     Agent_TempDirectory = "Agent.TempDirectory"
     Agent_OS = "Agent.OS"
+
+class VMVariables(BaseEnum):
+    Vm_Product_Type_Name = "Vm.Product.Type.Name"
+    Vm_Product_Name = "Vm.Product.Name"
+    Vm_Product_Description = "Vm.Product.Description"

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/request_objects/import_scan.py

@@ -40,6 +40,7 @@ class ImportScanRequest:
     code_app: str = ""
     token_cmdb: str = ""
     host_cmdb: str = ""
+    cmdb_request_response: dict = None
     token_defect_dojo: str = ""
     host_defect_dojo: str = ""
     # *** config map ***

{devsecops_engine_tools-1.27.0 → devsecops_engine_tools-1.28.0}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/serializers/import_scan.py

@@ -198,16 +198,17 @@ class ImportScanSerializer(Schema):
     service = fields.Str(required=False)
     group_by = fields.Str(required=False)
     test_title = fields.Str(required=False)
-    description_product = fields.Str(required=False)
+    product_description = fields.Str(required=False)
     create_finding_groups_for_all_findings = fields.Str(required=False)
     tools_configuration = fields.Int(required=False, load_default=1)
     code_app = fields.Str(required=False)
     # defect-dojo credential
-    token_cmdb = fields.Str(required=True)
-    host_cmdb = fields.Url(required=True)
+    token_cmdb = fields.Str(required=False)
+    host_cmdb = fields.Url(required=False)
+    cmdb_request_response = fields.Dict(required=False)
     token_defect_dojo = fields.Str(required=True)
     host_defect_dojo = fields.Str(required=True)
-    cmdb_mapping = fields.Dict(required=True)
+    cmdb_mapping = fields.Dict(required=False)
     product_type_name_mapping = fields.Dict(required=False)
     # Config remote credential
     compact_remote_config_url = fields.Str(required=False)