devsecops-engine-tools 1.7.17__tar.gz → 1.7.19__tar.gz

{devsecops_engine_tools-1.7.17 → devsecops_engine_tools-1.7.19}/PKG-INFO

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

{devsecops_engine_tools-1.7.17 → devsecops_engine_tools-1.7.19}/devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py

@@ -28,6 +28,20 @@ from devsecops_engine_tools.version import version
 
 logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 
+def parse_separated_list(value, choices):
+    values = value.split(',')
+    # Validar cada elemento de la lista
+    for val in values:
+        if val not in choices:
+            raise argparse.ArgumentTypeError(f"Invalid value: {val}. Valid values are: {', '.join(choices)}")
+    
+    return values
+
+def parse_choices(choices):
+    def parse_with_choices(value):
+        return parse_separated_list(value, choices)
+    return parse_with_choices
+
 def get_inputs_from_cli(args):
     parser = argparse.ArgumentParser()
     parser.add_argument("-v", "--version", action='version', version='{version}'.format(version=version))
@@ -49,7 +63,7 @@ def get_inputs_from_cli(args):
     )
     parser.add_argument("-fp", "--folder_path", type=str, required=False, help="Folder Path to scan, only apply engine_iac tool")
     parser.add_argument("-p",
-        "--platform", choices=["eks", "openshift"], type=str, required=False, help="Platform to execute,  only apply engine_iac tool"
+        "--platform", type=parse_choices({"all", "docker", "k8s", "cloudformation"}), required=False, default="all" ,help="Platform to scan, only apply engine_iac tool"
     )
     parser.add_argument(
         "--use_secrets_manager",

{devsecops_engine_tools-1.7.17 → devsecops_engine_tools-1.7.19}/devsecops_engine_tools/engine_sast/engine_iac/src/domain/model/config_tool.py

@@ -6,7 +6,6 @@ class ConfigTool:
         self.version = json_data[tool]["VERSION"]
         self.search_pattern = json_data["SEARCH_PATTERN"]
         self.ignore_search_pattern = json_data["IGNORE_SEARCH_PATTERN"]
-        self.exclusions_path = json_data["EXCLUSIONS_PATH"]
         self.use_external_checks_git = json_data[tool]["USE_EXTERNAL_CHECKS_GIT"]
         self.external_checks_git = json_data[tool]["EXTERNAL_CHECKS_GIT"]
         self.repository_ssh_host = json_data[tool]["EXTERNAL_GIT_SSH_HOST"]

{devsecops_engine_tools-1.7.17 → devsecops_engine_tools-1.7.19}/devsecops_engine_tools/engine_sast/engine_iac/src/domain/model/gateways/tool_gateway.py

@@ -2,5 +2,5 @@ from abc import ABCMeta, abstractmethod
 
 class ToolGateway(metaclass=ABCMeta):
     @abstractmethod
-    def run_tool(self, config_tool, folders_to_scan, environment, container_platform, secret_tool):
+    def run_tool(self, config_tool, folders_to_scan, environment, platform_to_scan, secret_tool):
         "run_tool"

{devsecops_engine_tools-1.7.17 → devsecops_engine_tools-1.7.19}/devsecops_engine_tools/engine_sast/engine_iac/src/infrastructure/driven_adapters/checkov/checkov_tool.py

@@ -38,6 +38,7 @@ class CheckovTool(ToolGateway):
     CHECKOV_CONFIG_FILE = "checkov_config.yaml"
     TOOL = "CHECKOV"
     framework_mapping = {"RULES_DOCKER": "dockerfile", "RULES_K8S": "kubernetes", "RULES_CLOUDFORMATION": "cloudformation"}
+    framework_external_checks = ["RULES_K8S", "RULES_CLOUDFORMATION","RULES_DOCKER"]
 
 
     def create_config_file(self, checkov_config: CheckovConfig):
@@ -113,58 +114,50 @@ class CheckovTool(ToolGateway):
         output = self.execute(checkov_config)
         result.append(json.loads(output))
         queue.put(result)
-    
-    def if_platform(self,value,container_platform):
-        if value.get("platform_not_apply"):
-            if value.get("platform_not_apply") != container_platform:
-                return True
-            else:
-                return False
-        else:
-            return True
         
     def scan_folders(
-        self, folders_to_scan, config_tool: ConfigTool, agent_env, environment, container_platform
+        self, folders_to_scan, config_tool: ConfigTool, agent_env, environment, platform_to_scan
     ):
         output_queue = queue.Queue()
         # Crea una lista para almacenar los hilos
         threads = []  
         for folder in folders_to_scan:
             for rule in config_tool.rules_data_type:
-                checkov_config = CheckovConfig(
-                    path_config_file="",
-                    config_file_name=rule,
-                    framework=self.framework_mapping[rule],
-                    checks=[
-                        key
-                        for key, value in config_tool.rules_data_type[rule].items()
-                        if value["environment"].get(environment) and self.if_platform(value,container_platform)
-                    ],
-                    soft_fail=False,
-                    directories=folder,
-                    external_checks_git=[
-                        f"{config_tool.external_checks_git}/{self.framework_mapping[rule]}"
-                    ]
-                    if config_tool.use_external_checks_git == "True"
-                    and agent_env is not None
-                    and rule in ["RULES_K8S", "RULES_CLOUDFORMATION","RULES_DOCKER"]
-                    else [],
-                    env=agent_env,
-                    external_checks_dir=f"/tmp/rules/{self.framework_mapping[rule]}"
-                    if config_tool.use_external_checks_dir == "True"
-                    and rule in ["RULES_K8S", "RULES_CLOUDFORMATION","RULES_DOCKER"]
-                    else [],
-                )
-
-                checkov_config.create_config_dict()
-                self.create_config_file(checkov_config)
-                config_tool.rules_all.update(config_tool.rules_data_type[rule])
-                t = threading.Thread(
-                    target=self.async_scan,
-                    args=(output_queue, checkov_config),
-                )
-                t.start()
-                threads.append(t)
+                if "all" in platform_to_scan or any(elem.upper() in rule for elem in platform_to_scan):
+                    checkov_config = CheckovConfig(
+                        path_config_file="",
+                        config_file_name=rule,
+                        framework=self.framework_mapping[rule],
+                        checks=[
+                            key
+                            for key, value in config_tool.rules_data_type[rule].items()
+                            if value["environment"].get(environment)
+                        ],
+                        soft_fail=False,
+                        directories=folder,
+                        external_checks_git=[
+                            f"{config_tool.external_checks_git}/{self.framework_mapping[rule]}"
+                        ]
+                        if config_tool.use_external_checks_git == "True"
+                        and agent_env is not None
+                        and rule in self.framework_external_checks
+                        else [],
+                        env=agent_env,
+                        external_checks_dir=f"/tmp/rules/{self.framework_mapping[rule]}"
+                        if config_tool.use_external_checks_dir == "True"
+                        and rule in self.framework_external_checks
+                        else [],
+                    )
+
+                    checkov_config.create_config_dict()
+                    self.create_config_file(checkov_config)
+                    config_tool.rules_all.update(config_tool.rules_data_type[rule])
+                    t = threading.Thread(
+                        target=self.async_scan,
+                        args=(output_queue, checkov_config),
+                    )
+                    t.start()
+                    threads.append(t)
         # Espera a que todos los hilos terminen
         for t in threads:
             t.join()
@@ -176,12 +169,12 @@ class CheckovTool(ToolGateway):
         return result_scans
 
     def run_tool(
-        self, config_tool: ConfigTool, folders_to_scan, environment, container_platform, secret_tool
+        self, config_tool: ConfigTool, folders_to_scan, environment, platform_to_scan, secret_tool
     ):
         agent_env = self.configurate_external_checks(config_tool, secret_tool)
 
         result_scans = self.scan_folders(
-            folders_to_scan, config_tool, agent_env, environment, container_platform
+            folders_to_scan, config_tool, agent_env, environment, platform_to_scan
         )
 
         checkov_deserealizator = CheckovDeserealizator()

{devsecops_engine_tools-1.7.17 → devsecops_engine_tools-1.7.19}/devsecops_engine_tools/engine_sast/engine_iac/src/infrastructure/helpers/file_generator_tool.py

@@ -35,27 +35,27 @@ def generate_file_from_tool(tool, result_list, rules_doc):
                         "checkov_version", None
                     )
 
-            file_name = "results.json"
-            results_data = {
-                "check_type": "Dockerfile, Kubernetes and CloudFormation",
-                "results": {
-                    "failed_checks": all_failed_checks,
-                },
-                "summary": {
-                    "passed": summary_passed,
-                    "failed": summary_failed,
-                    "skipped": summary_skipped,
-                    "parsing_errors": summary_parsing_errors,
-                    "resource_count": summary_resource_count,
-                    "checkov_version": checkov_version,
-                },
-            }
+                file_name = "results.json"
+                results_data = {
+                    "check_type": "Dockerfile, Kubernetes and CloudFormation",
+                    "results": {
+                        "failed_checks": all_failed_checks,
+                    },
+                    "summary": {
+                        "passed": summary_passed,
+                        "failed": summary_failed,
+                        "skipped": summary_skipped,
+                        "parsing_errors": summary_parsing_errors,
+                        "resource_count": summary_resource_count,
+                        "checkov_version": checkov_version,
+                    },
+                }
 
-            with open(file_name, "w") as json_file:
-                json.dump(results_data, json_file, indent=4)
+                with open(file_name, "w") as json_file:
+                    json.dump(results_data, json_file, indent=4)
 
-            absolute_path = os.path.abspath(file_name)
-            return absolute_path
+                absolute_path = os.path.abspath(file_name)
+                return absolute_path
         except Exception as ex:
             logger.error(f"Error during handling checkov json integrator {ex}")
 

{devsecops_engine_tools-1.7.17 → devsecops_engine_tools-1.7.19}/devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/git_cli/git_run.py

@@ -46,11 +46,11 @@ class GitRun(GitGateway):
             os.chdir(path_new_folder)
             
             repository = git.Repo(path_new_folder)
-
             source_branch = source_branch.replace("refs/heads/", "")
-            subprocess.run(["git", "checkout", f"origin/{source_branch}"], capture_output=True, text=True)
+            repository.git.checkout(source_branch)
+            repository.git.pull('-X', 'theirs', '--no-edit', 'origin', target_branch)
             if source_branch != None:
-                diff = repository.git.diff(f"origin/{source_branch}..origin/{target_branch}", name_only=True)
+                diff = repository.git.diff(f"{source_branch}..{target_branch}", name_only=True)
                 if diff:
                     diff_files = diff.strip().split("\n")
                 print("Pull Requests Associated Files:",len(diff_files))

devsecops_engine_tools-1.7.19/devsecops_engine_tools/version.py

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

{devsecops_engine_tools-1.7.17 → devsecops_engine_tools-1.7.19}/devsecops_engine_tools.egg-info/PKG-INFO

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

devsecops_engine_tools-1.7.17/devsecops_engine_tools/version.py

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