devsecops-engine-tools 1.36.0__tar.gz → 1.38.1__tar.gz

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.36.0
+Version: 1.38.1
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -74,7 +74,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, 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","build-scan"] --image_to_scan ["image_to_scan"] --dast_file_path ["dast_file_path"]
+devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --remote_config_branch ["remote_config_branch"] --module ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container", "engine_risk", "engine_code"] --tool ["nuclei", "bearer", "checkov", "kics", "kubescape", "trufflehog", "gitleaks", "prisma", "trivy", "xray", "dependency_check"] --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","build-scan"] --image_to_scan ["image_to_scan"] --dast_file_path ["dast_file_path"]
 ```
 
 ### Structure Remote Config
@@ -184,7 +184,7 @@ $ set +a
 
 
 ```bash
-devsecops-engine-tools --platform_devops local --remote_config_repo DevSecOps_Remote_Config --tool engine_iac
+devsecops-engine-tools --platform_devops local --remote_config_repo DevSecOps_Remote_Config --module engine_iac
 
 ```
 
@@ -198,13 +198,13 @@ devsecops-engine-tools --platform_devops local --remote_config_repo DevSecOps_Re
 docker pull bancolombia/devsecops-engine-tools
 ```
 ```bash
-docker run --rm -v ./folder_to_analyze:/folder_to_analyze bancolombia/devsecops-engine-tools:latest devsecops-engine-tools --platform_devops local --remote_config_repo docker_default_remote_config --tool engine_iac --folder_path /folder_to_analyze
+docker run --rm -v ./folder_to_analyze:/folder_to_analyze bancolombia/devsecops-engine-tools:latest devsecops-engine-tools --platform_devops local --remote_config_repo docker_default_remote_config --module engine_iac --folder_path /folder_to_analyze
 ```
 
 The docker image have it own default remote config with basic configuration called docker_default_remote_config, but you can define your own config and pass it as volume
 
 ```bash
-docker run --rm -v ./folder_to_analyze:/folder_to_analyze -v ./custom_remote_config:/custom_remote_config bancolombia/devsecops-engine-tools:latest devsecops-engine-tools --platform_devops local --remote_config_repo custom_remote_config --tool engine_iac --folder_path /folder_to_analyze
+docker run --rm -v ./folder_to_analyze:/folder_to_analyze -v ./custom_remote_config:/custom_remote_config bancolombia/devsecops-engine-tools:latest devsecops-engine-tools --platform_devops local --remote_config_repo custom_remote_config --module engine_iac --folder_path /folder_to_analyze
 ```
 
 
@@ -234,7 +234,7 @@ stages:
           - script: |
               # Install devsecops-engine-tools
               pip3 install -q devsecops-engine-tools
-              devsecops-engine-tools --platform_devops azure --remote_config_repo remote_config --tool engine_iac
+              devsecops-engine-tools --platform_devops azure --remote_config_repo remote_config --module engine_iac
             displayName: "Engine Tools"
         env:
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -285,7 +285,7 @@ jobs:
         run: |
           # Install devsecops-engine-tools
           pip3 install -q devsecops-engine-tools
-          output=$(devsecops-engine-tools --platform_devops github --remote_config_repo remote_config --tool engine_iac)
+          output=$(devsecops-engine-tools --platform_devops github --remote_config_repo remote_config --module engine_iac)
           echo "$output"
           if [[ $output == *"✘Failed"* ]]; then
             exit 1

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py

@@ -83,6 +83,26 @@ def get_inputs_from_cli(args):
     parser.add_argument(
         "-t",
         "--tool",
+        choices=[
+            "nuclei",
+            "bearer",
+            "checkov",
+            "kics",
+            "kubescape",
+            "trufflehog",
+            "gitleaks",
+            "prisma",
+            "trivy",
+            "xray",
+            "dependency_check",
+        ],
+        type=str,
+        required=False,
+        help="Tool to execute according to the module",
+    )
+    parser.add_argument(
+        "-m",
+        "--module",
         choices=[
             "engine_iac",
             "engine_dast",
@@ -94,7 +114,7 @@ def get_inputs_from_cli(args):
         ],
         type=str,
         required=True,
-        help="Tool to execute",
+        help="Module to execute",
     )
     parser.add_argument(
         "-fp",
@@ -176,12 +196,32 @@ def get_inputs_from_cli(args):
         help="File path containing the configuration, structured according to the documentation, \
         for the API or web application to be scanned by the DAST tool."
     )
+
+    TOOLS = {
+        "engine_iac": ["checkov", "kics", "kubescape"],
+        "engine_secret": ["trufflehog", "gitleaks"],
+        "engine_container": ["prisma", "trivy"],
+        "engine_dependencies": ["xray", "dependency_check"],
+        "engine_code": ["bearer"],
+        "engine_dast": ["nuclei"],
+        "engine_risk": None,
+    }
+
     args = parser.parse_args()
+
+    if args.module in TOOLS and args.tool:
+        allowed_tools = TOOLS[args.module]
+        if allowed_tools is None:
+            parser.error(f"The tool flag should not be used with module {args.module}")
+        elif allowed_tools and (args.tool not in allowed_tools):
+            parser.error(f"Invalid value for tool. Allowed values for the provided module {args.module} are: {', '.join(allowed_tools)}")
+
     return {
         "platform_devops": args.platform_devops,
         "remote_config_repo": args.remote_config_repo,
         "remote_config_branch": args.remote_config_branch,
         "tool": args.tool,
+        "module": args.module,
         "folder_path": args.folder_path,
         "platform": args.platform,
         "use_secrets_manager": args.use_secrets_manager,

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_core/src/domain/model/gateway/metrics_manager_gateway.py

@@ -3,5 +3,5 @@ from abc import ABCMeta, abstractmethod
 
 class MetricsManagerGateway(metaclass=ABCMeta):
     @abstractmethod
-    def send_metrics(self, config_tool, tool, file_path):
+    def send_metrics(self, config_tool, module, file_path):
         "send_metrics"

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_core/src/domain/usecases/break_build.py

@@ -34,7 +34,7 @@ class BreakBuild:
     def _apply_policie_exception_new_vulnerability_industry(
         self, findings_list: "list[Finding]", exclusions: "list[Exclusions]", args: any
     ):
-        if args["tool"] in ["engine_container", "engine_dependencies"]:
+        if args["module"] in ["engine_container", "engine_dependencies"]:
             date_actual = datetime.now(pytz.utc)
             for item in findings_list:
                 if item.published_date_cve:

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_core/src/domain/usecases/handle_scan.py

@@ -47,7 +47,6 @@ from devsecops_engine_tools.engine_utilities import settings
 
 logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 
-
 class HandleScan:
     def __init__(
         self,
@@ -69,7 +68,7 @@ class HandleScan:
         )
         if dict_args["use_secrets_manager"] == "true":
             secret_tool = self.secrets_manager_gateway.get_secret(config_tool)
-        if "engine_iac" in dict_args["tool"]:
+        if "engine_iac" in dict_args["module"]:
             findings_list, input_core = runner_engine_iac(
                 dict_args,
                 config_tool["ENGINE_IAC"]["TOOL"],
@@ -81,7 +80,7 @@ class HandleScan:
                 config_tool, input_core, dict_args, secret_tool, env
             )
             return findings_list, input_core
-        elif "engine_container" in dict_args["tool"]:
+        elif "engine_container" in dict_args["module"]:
             findings_list, input_core, sbom_components = runner_engine_container(
                 dict_args,
                 config_tool["ENGINE_CONTAINER"]["TOOL"],
@@ -97,7 +96,7 @@ class HandleScan:
                 sbom_components,
             )
             return findings_list, input_core
-        elif "engine_dast" in dict_args["tool"]:
+        elif "engine_dast" in dict_args["module"]:
             findings_list, input_core = runner_engine_dast(
                 dict_args,
                 config_tool["ENGINE_DAST"],
@@ -108,7 +107,7 @@ class HandleScan:
                 config_tool, input_core, dict_args, secret_tool, env
             )
             return findings_list, input_core
-        elif "engine_code" in dict_args["tool"]:
+        elif "engine_code" in dict_args["module"]:
             findings_list, input_core = runner_engine_code(
                 dict_args,
                 config_tool["ENGINE_CODE"]["TOOL"],
@@ -118,7 +117,7 @@ class HandleScan:
                 config_tool, input_core, dict_args, secret_tool, env
             )
             return findings_list, input_core
-        elif "engine_secret" in dict_args["tool"]:
+        elif "engine_secret" in dict_args["module"]:
             findings_list, input_core = runner_secret_scan(
                 dict_args,
                 config_tool["ENGINE_SECRET"]["TOOL"],
@@ -129,7 +128,7 @@ class HandleScan:
                 config_tool, input_core, dict_args, secret_tool, env
             )
             return findings_list, input_core
-        elif "engine_dependencies" in dict_args["tool"]:
+        elif "engine_dependencies" in dict_args["module"]:
             findings_list, input_core, sbom_components = runner_engine_dependencies(
                 dict_args,
                 config_tool,
@@ -156,7 +155,7 @@ class HandleScan:
                 if input_core.path_file_results:
                     self.vulnerability_management.send_vulnerability_management(
                         VulnerabilityManagement(
-                            config_tool[dict_args["tool"].upper()]["TOOL"],
+                            config_tool[dict_args["module"].upper()]["TOOL"],
                             input_core,
                             dict_args,
                             secret_tool,

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_core/src/domain/usecases/metrics_manager.py

@@ -45,7 +45,7 @@ class MetricsManager:
                 "date": datetime.datetime.now().strftime("%Y-%m-%d"),
                 "component": scope_pipeline,
                 "stage": input_core.stage_pipeline,
-                "check_type": dict_args["tool"],
+                "check_type": dict_args["module"],
                 "environment": define_env(
                     self.devops_platform_gateway.get_variable("environment"),
                     self.devops_platform_gateway.get_variable("branch_name"),
@@ -55,5 +55,5 @@ class MetricsManager:
             }
             json.dump(body, file)
         self.metrics_manager_gateway.send_metrics(
-            config_tool, dict_args["tool"], file_path
+            config_tool, dict_args["module"], file_path
         )

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/aws/s3_manager.py

@@ -23,7 +23,7 @@ class S3Manager(MetricsManagerGateway):
         except client.exceptions.NoSuchKey:
             return ""
 
-    def send_metrics(self, config_tool, tool, file_path):
+    def send_metrics(self, config_tool, module, file_path):
         credentials_role = assume_role(config_tool["METRICS_MANAGER"]["AWS"]["ROLE_ARN"]) if config_tool["METRICS_MANAGER"]["AWS"]["USE_ROLE"] else None
         session = boto3.session.Session()
 
@@ -41,7 +41,7 @@ class S3Manager(MetricsManagerGateway):
                 region_name=config_tool["METRICS_MANAGER"]["AWS"]["REGION_NAME"]
             )
         date = datetime.datetime.now()
-        path_bucket = f'engine_tools/{tool}/{date.strftime("%Y")}/{date.strftime("%m")}/{date.strftime("%d")}/{file_path.split("/")[-1]}'
+        path_bucket = f'engine_tools/{module}/{date.strftime("%Y")}/{date.strftime("%m")}/{date.strftime("%d")}/{file_path.split("/")[-1]}'
 
         data = self._get_s3_data(
             client, config_tool["METRICS_MANAGER"]["AWS"]["BUCKET"], path_bucket

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/defect_dojo.py

@@ -90,10 +90,10 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 for branch in vulnerability_management.config_tool[
                     "VULNERABILITY_MANAGER"
                 ]["BRANCH_FILTER"]
-            ) or (vulnerability_management.dict_args["tool"] == "engine_secret"):
-                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'])}"
+            ) or (vulnerability_management.dict_args["module"] == "engine_secret"):
+                tags = vulnerability_management.dict_args["module"]
+                if vulnerability_management.dict_args["module"] == "engine_iac":
+                    tags = f"{vulnerability_management.dict_args['module']}_{'_'.join(vulnerability_management.dict_args['platform'])}"
 
                 use_cmdb = vulnerability_management.config_tool[
                     "VULNERABILITY_MANAGER"
@@ -125,7 +125,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                     test_string = "//".join([url_parts[0] + "/", url_parts[1]])
                     print(
                         "Report sent to vulnerability management: ",
-                        f"{test_string}?tags={vulnerability_management.dict_args['tool']}",
+                        f"{test_string}?tags={vulnerability_management.dict_args['module']}",
                     )
                 else:
                     raise ExceptionVulnerabilityManagement(response)
@@ -185,7 +185,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 "MAX_RETRIES_QUERY"
             ]
 
-            tool = dict_args["tool"]
+            tool = dict_args["module"]
 
             risk_accepted_query_params = {
                 "risk_accepted": True,
@@ -451,6 +451,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             "branch_tag": vulnerability_management.branch_tag,
             "commit_hash": vulnerability_management.commit_hash,
             "service": vulnerability_management.input_core.scope_pipeline,
+            "test_title": tags,
             "environment": (
                 enviroment_mapping[vulnerability_management.environment.lower()]
                 if vulnerability_management.environment is not None
@@ -464,6 +465,8 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             "expression": vulnerability_management.config_tool["VULNERABILITY_MANAGER"][
                 "DEFECT_DOJO"
             ]["CMDB"]["REGEX_EXPRESSION_CMDB"],
+            "reimport_scan": vulnerability_management.config_tool["VULNERABILITY_MANAGER"][
+                "DEFECT_DOJO"]["REIMPORT_SCAN"]
         }
 
         if use_cmdb:

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_core/src/infrastructure/entry_points/entry_point_core.py

@@ -29,8 +29,8 @@ def init_engine_core(
     )
     Printers.print_logo_tool(config_tool["BANNER"])
 
-    if config_tool[args["tool"].upper()]["ENABLED"]:
-        if args["tool"] == "engine_risk":
+    if config_tool[args["module"].upper()]["ENABLED"]:
+        if args["module"] == "engine_risk":
             results, input_core = HandleRisk(
                 vulnerability_management_gateway,
                 secrets_manager_gateway,
@@ -39,6 +39,9 @@ def init_engine_core(
             ).process(args, config_tool)
 
         else:
+            if args.get("tool"):
+                config_tool[args["module"].upper()]["TOOL"] = args.get("tool").upper()
+                
             findings_list, input_core = HandleScan(
                 vulnerability_management_gateway,
                 secrets_manager_gateway,
@@ -59,6 +62,6 @@ def init_engine_core(
         print(
             devops_platform_gateway.message(
                 "warning",
-                "DevSecOps Engine Tool - {0} in maintenance...".format(args["tool"]),
+                "DevSecOps Engine Tool - {0} in maintenance...".format(args["module"]),
             )
         )

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_sca/engine_dependencies/src/applications/runner_dependencies_scan.py

@@ -20,7 +20,11 @@ def runner_engine_dependencies(
 ):
     try:
         tools_mapping = {
-            "XRAY": {"tool_run": XrayScan, "tool_deserializator": XrayDeserializator, "tool_sbom": sbom_tool_gateway},
+            "XRAY": {
+                "tool_run": XrayScan, 
+                "tool_deserializator": XrayDeserializator, 
+                "tool_sbom": sbom_tool_gateway
+            },
             "DEPENDENCY_CHECK": {
                 "tool_run": DependencyCheckTool,
                 "tool_deserializator": DependencyCheckDeserialize,

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_utilities/defect_dojo/applications/defect_dojo.py

@@ -3,6 +3,9 @@ from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
 from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.import_scan import (
     ImportScanRestConsumer,
 )
+from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.reimport_scan import (
+    ReimportScanRestConsumer,
+)
 from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.product_type import (
     ProductTypeRestConsumer,
 )
@@ -48,12 +51,16 @@ class DefectDojo:
             rest_scan_configuration = ScanConfigrationRestConsumer(
                 request, session=SessionManager()
             )
+            rest_reimport_scan = ReimportScanRestConsumer(
+                request, session=SessionManager()
+            )
             uc = ImportScanUserCase(
                 rest_import_scan,
                 rest_product_type,
                 rest_product,
                 rest_scan_configuration,
                 rest_engagement=rest_engagement,
+                rest_reimport_scan=rest_reimport_scan
             )
             return uc.execute(request)
         except ApiError as e:

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/request_objects/import_scan.py

@@ -52,10 +52,10 @@ class ImportScanRequest:
     cmdb_mapping: dict = None
     product_type_name_mapping: dict = None
     compact_remote_config_url: str = None
-    # ** Expression
     expression: str = ""
-    # ** Test url
     url: str = ""
+    reimport_scan: bool = None
+    test_title: str = ""
 
     @classmethod
     def from_dict(cls, obj):
@@ -100,6 +100,7 @@ class ImportScanRequest:
             product_type_name_mapping=obj.get("product_type_name_mapping"),
             expression=obj.get("expression"),
             compact_remote_config_url=obj.get("compact_remote_config_url"),
+            reimport_scan=obj.get("reimport_scan"),
         )
         return obj
 

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/serializers/import_scan.py

@@ -219,6 +219,7 @@ class ImportScanSerializer(Schema):
     project_remote_config = fields.Str(required=False)
     # regulare expression
     expression = fields.Str(required=True)
+    reimport_scan = fields.Bool(required=False, default=False)
 
     @post_load
     def make_cmdb(self, data, **kwargs):

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py

@@ -1,17 +1,17 @@
 import re
 import os
-from devsecops_engine_tools.engine_utilities.utils.api_error import ApiError
+import urllib3
 from devsecops_engine_tools.engine_utilities.settings import SETTING_LOGGER
+from devsecops_engine_tools.engine_utilities.utils.api_error import ApiError
 from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
 from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.import_scan import ImportScanRestConsumer
+from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.reimport_scan import ReimportScanRestConsumer 
 from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.product_type import ProductTypeRestConsumer
 from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.product import ProductRestConsumer
 from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.scan_configurations import (
-    ScanConfigrationRestConsumer,
-)
+    ScanConfigrationRestConsumer)
 from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.engagement import EngagementRestConsumer
 from devsecops_engine_tools.engine_utilities.defect_dojo.domain.request_objects.import_scan import ImportScanRequest
-import urllib3
 
 logger = MyLogger.__call__(**SETTING_LOGGER).get_logger()
 
@@ -26,15 +26,76 @@ class ImportScanUserCase:
         rest_product: ProductRestConsumer,
         rest_scan_configuration: ScanConfigrationRestConsumer,
         rest_engagement: EngagementRestConsumer,
+        rest_reimport_scan: ReimportScanRestConsumer,
     ):
         self.__rest_import_scan = rest_import_scan
         self.__rest_product_type = rest_product_type
         self.__rest_product = rest_product
         self.__rest_scan_configurations = rest_scan_configuration
         self.__rest_engagement = rest_engagement
+        self.__rest_reimport_scan = rest_reimport_scan
 
-    def execute(self, request: ImportScanRequest) -> ImportScanRequest:
+
+    def get_file_type(self, path_file):
+        __, extension = os.path.splitext(path_file)
+        dict_rule_type_file = {
+            ".csv": "text/csv",
+            ".json": "apllication/json",
+            ".xml": "aplication/xml",
+            ".sarif": "aplication/json",
+        }
+        file_type = dict_rule_type_file.get(extension)
+        return file_type
+
+    def import_scan(self, request, api_scan_bool):
         response = None
+
+        if api_scan_bool:
+            response = self.__rest_import_scan.import_scan_api(request)
+            logger.info(f"End process Succesfull!!!: {response}")
+        else:
+            try:
+                file_type = self.get_file_type(request.file)
+                if file_type is None:
+                    raise ApiError("File format not allowed")
+
+                with open(request.file, "rb") as file:
+                    logger.info(f"read {file_type} file successful !!!")
+                    files = [("file", (request.file, file, file_type))]
+                    response = self.__rest_import_scan.import_scan(request, files)
+
+            except Exception as e:
+                raise ApiError(e)
+
+        response.url = f"{request.host_defect_dojo}/engagement/{str(response.engagement_id)}/finding/open"
+        return response
+    
+    def reimport_scan(self, request, api_scan_bool):
+        response = None
+
+        if api_scan_bool:
+            logger.debug(f"reimport scan :{self.__rest_reimport_scan}")
+            response = self.__rest_reimport_scan.reimport_scan(request)
+            logger.info(f"End process Succesfull!!!: {response}")
+        else:
+            try:
+                logger.debug(f"reimport scan file :{self.__rest_reimport_scan}")
+                file_type = self.get_file_type(request.file)
+                if file_type is None:
+                    raise ApiError("File format not allowed")
+
+                with open(request.file, "rb") as file:
+                    logger.info(f"read {file_type} file successful !!!")
+                    files = [("file", (request.file, file, file_type))]
+                    response = self.__rest_reimport_scan.reimport_scan(request, files)
+
+            except Exception as e:
+                raise ApiError(e)
+
+        response.url = f"{request.host_defect_dojo}/engagement/{str(response.engagement_id)}/finding/open"
+        return response
+
+    def execute(self, request: ImportScanRequest) -> ImportScanRequest:
         product_id = None
 
         if (request.product_name or request.product_type_name) == "":
@@ -101,33 +162,8 @@ class ImportScanUserCase:
                 engagement = self.__rest_engagement.post_engagement(request.engagement_name, product_id)
                 logger.debug(f"Egagement created: {engagement.name} whit product id {engagement.product}")
 
-        if api_scan_bool:
-            response = self.__rest_import_scan.import_scan_api(request)
-            logger.info(f"End process Succesfull!!!: {response}")
+        if request.reimport_scan is True:
+            logger.debug("reimport scan flow")
+            return self.reimport_scan(request, api_scan_bool)
         else:
-            try:
-                file_type = self.get_file_type(request.file)
-                if file_type is None:
-                    raise ApiError("File format not allowed")
-
-                with open(request.file, "rb") as file:
-                    logger.info(f"read {file_type} file successful !!!")
-                    files = [("file", (request.file, file, file_type))]
-                    response = self.__rest_import_scan.import_scan(request, files)
-
-            except Exception as e:
-                raise ApiError(e)
-
-        response.url = f"{request.host_defect_dojo}/engagement/{str(response.engagement_id)}/finding/open"
-        return response
-
-    def get_file_type(self, path_file):
-        __, extension = os.path.splitext(path_file)
-        dict_rule_type_file = {
-            ".csv": "text/csv",
-            ".json": "apllication/json",
-            ".xml": "aplication/xml",
-            ".sarif": "aplication/json",
-        }
-        file_type = dict_rule_type_file.get(extension)
-        return file_type
+            return self.import_scan(request, api_scan_bool)

devsecops_engine_tools-1.38.1/devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/reimport_scan.py

@@ -0,0 +1,74 @@
+from devsecops_engine_tools.engine_utilities.utils.api_error import ApiError
+from devsecops_engine_tools.engine_utilities.defect_dojo.domain.request_objects.import_scan import ImportScanRequest
+from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
+from devsecops_engine_tools.engine_utilities.defect_dojo.infraestructure.driver_adapters.settings.settings import VERIFY_CERTIFICATE
+from devsecops_engine_tools.engine_utilities.utils.session_manager import SessionManager
+from devsecops_engine_tools.engine_utilities.settings import SETTING_LOGGER
+
+logger = MyLogger.__call__(**SETTING_LOGGER).get_logger()
+
+
+class ReimportScanRestConsumer:
+
+    def __init__(self, request: ImportScanRequest, session: SessionManager):
+        self.__token = request.token_defect_dojo
+        self.__host = request.host_defect_dojo
+        self.__session = session._instance
+
+    def reimport_scan(self, request: ImportScanRequest, files) -> ImportScanRequest:
+        url = f"{self.__host}/api/v2/reimport-scan/"
+        logger.debug(f"URL: {url}")
+        payload = {
+            "scan_date": request.scan_date,
+            "minimum_severity": request.minimum_severity,
+            "active": request.active,
+            "verified": request.verified,
+            "scan_type": request.scan_type,
+            "endpoint_to_add": request.endpoint_to_add,
+            "file": files,
+            "product_type_name": request.product_type_name,
+            "product_name": request.product_name,
+            "engagement_name": request.engagement_name,
+            "engagement_end_date": request.engagement_end_date,
+            "source_code_management_uri": request.source_code_management_uri,
+            "auto_create_context": "true",
+            "deduplication_on_engagement": request.deduplication_on_engagement,
+            "lead": request.lead,
+            "push_to_jira": request.push_to_jira,
+            "environment": request.environment,
+            "build_id": request.build_id,
+            "branch_tag": request.branch_tag,
+            "commit_hash": request.commit_hash,
+            "api_scan_configuration": str(request.api_scan_configuration)
+            if request.api_scan_configuration != 0
+            else "",
+            "service": request.service,
+            "group_by": request.group_by,
+            "create_finding_groups_for_all_findings": request.create_finding_groups_for_all_findings,
+            "do_not_reactive"
+            "scan_type": request.scan_type,
+            "close_old_findings": request.close_old_findings,
+            "close_old_findings_product_scope": request.close_old_findings_product_scope,
+            "version": request.version,
+            "tags": request.tags,
+            "test_title": request.test_title,
+        }
+
+        headers = {"Authorization": f"Token {self.__token}"}
+        try:
+            response = self.__session.post(
+                url,
+                headers=headers,
+                data=payload,
+                files=files,
+                verify=VERIFY_CERTIFICATE
+            )
+            if response.status_code != 201:
+                logger.error(response.json())
+                raise ApiError(response.json())
+            logger.info(f"Sucessfull {response}")
+            response = ImportScanRequest.from_dict(response.json())
+        except Exception as e:
+            logger.error(f"from dict import Scan: {response.json()}")
+            raise ApiError(e)
+        return response

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_utilities/sonarqube/src/domain/usecases/report_sonar.py

@@ -85,7 +85,7 @@ class ReportSonar:
         else:
             project_keys = self.sonar_gateway.get_project_keys(pipeline_name)
 
-        args["tool"] = "sonarqube"
+        args["module"] = "sonarqube"
         vulnerability_manager = VulnerabilityManagement(
             scan_type = "SONARQUBE",
             input_core = input_core,

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.38.1}/devsecops_engine_tools/engine_utilities/sonarqube/src/infrastructure/entry_points/entry_point_report_sonar.py

@@ -60,7 +60,7 @@ def init_report_sonar(
 
         if args["send_metrics"] == "true":
             MetricsManager(devops_platform_gateway, metrics_manager_gateway).process(
-                config_tool, input_core, {"tool": "report_sonar"}, ""
+                config_tool, input_core, {"module": "report_sonar"}, ""
             )
     else:
         if not is_enabled:

devsecops_engine_tools-1.38.1/devsecops_engine_tools/version.py

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