devsecops-engine-tools 1.46.1__tar.gz → 1.47.0__tar.gz

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/PKG-INFO

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

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_core/src/domain/model/threshold.py

@@ -10,4 +10,5 @@ class Threshold:
         self.vulnerability = LevelVulnerability(data.get("VULNERABILITY"))
         self.compliance = LevelCompliance(data.get("COMPLIANCE"))
         self.cve = data.get("CVE",[])
+        self.name = data.get("NAME", "default")
         self.quality_vulnerability_management = data.get("QUALITY_VULNERABILITY_MANAGEMENT") if data.get("QUALITY_VULNERABILITY_MANAGEMENT") else None

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_core/src/domain/model/vulnerability_management.py

@@ -10,6 +10,7 @@ class VulnerabilityManagement:
     dict_args: any
     secret_tool: any
     config_tool: any
+    repository_provider: str
     source_code_management_uri: str
     base_compact_remote_config_url: str
     access_token: str

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_core/src/domain/usecases/break_build.py

@@ -77,6 +77,7 @@ class BreakBuild:
                     lambda item: any(
                         exclusion.id == item.id
                         and (exclusion.where in item.where or "all" in exclusion.where)
+                        and exclusion.severity == item.severity
                         for exclusion in exclusions
                     ),
                     findings_list,
@@ -349,6 +350,7 @@ class BreakBuild:
                                     and (
                                         elem.where in item.where or "all" in elem.where
                                     )
+                                    and elem.severity == item.severity
                                 ),
                                 None,
                             ),
@@ -360,6 +362,7 @@ class BreakBuild:
                                     and (
                                         elem.where in item.where or "all" in elem.where
                                     )
+                                    and elem.severity == item.severity
                                 ),
                                 None,
                             ),
@@ -371,6 +374,7 @@ class BreakBuild:
                                     and (
                                         elem.where in item.where or "all" in elem.where
                                     )
+                                    and elem.severity == item.severity
                                 ),
                                 None,
                             ),

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_core/src/domain/usecases/handle_scan.py

@@ -160,6 +160,7 @@ class HandleScan:
                             dict_args,
                             secret_tool,
                             config_tool,
+                            self.devops_platform_gateway.get_variable("repository_provider"),
                             self.devops_platform_gateway.get_source_code_management_uri(),
                             self.devops_platform_gateway.get_base_compact_remote_config_url(
                                 dict_args["remote_config_repo"]
@@ -218,11 +219,12 @@ class HandleScan:
     def _update_threshold_cve(
         self, input_core: InputCore, dict_args, secret_tool, config_tool
     ):
-        input_core.threshold_defined.cve.extend(
-            self.vulnerability_management.get_black_list(
-                dict_args, secret_tool, config_tool
+        if input_core.threshold_defined.name == "default":
+            input_core.threshold_defined.cve.extend(
+                self.vulnerability_management.get_black_list(
+                    dict_args, secret_tool, config_tool
+                )
             )
-        )
 
     def _define_threshold_quality_vuln(
         self, input_core: InputCore, dict_args, secret_tool, config_tool
@@ -230,7 +232,7 @@ class HandleScan:
         quality_vulnerability_management = (
             input_core.threshold_defined.quality_vulnerability_management
         )
-        if quality_vulnerability_management:
+        if quality_vulnerability_management and input_core.threshold_defined.name == "default":
             product_type = self.vulnerability_management.get_product_type_service(
                 input_core.scope_pipeline, dict_args, secret_tool, config_tool
             )

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/azure/azure_devops.py

@@ -7,7 +7,7 @@ from devsecops_engine_tools.engine_utilities.azuredevops.models.AzurePredefinedV
     SystemVariables,
     ReleaseVariables,
     AgentVariables,
-    VMVariables
+    VMVariables,
 )
 from devsecops_engine_tools.engine_utilities.azuredevops.infrastructure.azure_devops_api import (
     AzureDevopsApi,
@@ -57,11 +57,16 @@ class AzureDevops(DevopsPlatformGateway):
             return AzureMessageResultPipeline.SucceededWithIssues.value
 
     def get_source_code_management_uri(self):
-        source_code_management_uri = (
-            f"{SystemVariables.System_TeamFoundationCollectionUri.value()}"
-            f"{SystemVariables.System_TeamProject.value()}/_git/{BuildVariables.Build_Repository_Name.value()}"
-        )
-        return source_code_management_uri.replace(" ", "%20")
+        source_code_management_uri = {
+            "tfsgit": (
+                f"{SystemVariables.System_TeamFoundationCollectionUri.value()}"
+                f"{SystemVariables.System_TeamProject.value()}/_git/{BuildVariables.Build_Repository_Name.value()}"
+            ).replace(" ", "%20"),
+            "github": (
+                f"https://github.com/{BuildVariables.Build_Repository_Name.value()}"
+            ),
+        }
+        return source_code_management_uri.get(BuildVariables.Build_Repository_Provider.value().lower())
 
     def get_base_compact_remote_config_url(self, remote_config_repo):
         return (
@@ -75,36 +80,36 @@ class AzureDevops(DevopsPlatformGateway):
 
     def get_variable(self, variable):
 
-            variable_map = {
-                "branch_name": BuildVariables.Build_SourceBranchName,
-                "build_id": BuildVariables.Build_BuildNumber,
-                "build_execution_id": BuildVariables.Build_BuildId,
-                "commit_hash": BuildVariables.Build_SourceVersion,
-                "environment": ReleaseVariables.Environment,
-                "release_id": ReleaseVariables.Release_Releaseid,
-                "branch_tag": BuildVariables.Build_SourceBranch,
-                "access_token": SystemVariables.System_AccessToken,
-                "organization": SystemVariables.System_TeamFoundationCollectionUri,
-                "project_name": SystemVariables.System_TeamProject,
-                "repository": BuildVariables.Build_Repository_Name,
-                "pipeline_name": (
-                    BuildVariables.Build_DefinitionName
-                    if SystemVariables.System_HostType.value() == "build"
-                    else ReleaseVariables.Release_Definitionname
-                ),
-                "stage": SystemVariables.System_HostType,
-                "path_directory": SystemVariables.System_DefaultWorkingDirectory,
-                "os": AgentVariables.Agent_OS,
-                "temp_directory": AgentVariables.Agent_TempDirectory,
-                "target_branch": SystemVariables.System_TargetBranchName,
-                "source_branch": SystemVariables.System_SourceBranch,
-                "repository_provider": BuildVariables.Build_Repository_Provider,
-                "pull_request_id": SystemVariables.System_PullRequestId,
-                "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()
-            except ValueError:
-                return None
+        variable_map = {
+            "branch_name": BuildVariables.Build_SourceBranchName,
+            "build_id": BuildVariables.Build_BuildNumber,
+            "build_execution_id": BuildVariables.Build_BuildId,
+            "commit_hash": BuildVariables.Build_SourceVersion,
+            "environment": ReleaseVariables.Environment,
+            "release_id": ReleaseVariables.Release_Releaseid,
+            "branch_tag": BuildVariables.Build_SourceBranch,
+            "access_token": SystemVariables.System_AccessToken,
+            "organization": SystemVariables.System_TeamFoundationCollectionUri,
+            "project_name": SystemVariables.System_TeamProject,
+            "repository": BuildVariables.Build_Repository_Name,
+            "pipeline_name": (
+                BuildVariables.Build_DefinitionName
+                if SystemVariables.System_HostType.value() == "build"
+                else ReleaseVariables.Release_Definitionname
+            ),
+            "stage": SystemVariables.System_HostType,
+            "path_directory": SystemVariables.System_DefaultWorkingDirectory,
+            "os": AgentVariables.Agent_OS,
+            "temp_directory": AgentVariables.Agent_TempDirectory,
+            "target_branch": SystemVariables.System_TargetBranchName,
+            "source_branch": SystemVariables.System_SourceBranch,
+            "repository_provider": BuildVariables.Build_Repository_Provider,
+            "pull_request_id": SystemVariables.System_PullRequestId,
+            "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()
+        except ValueError:
+            return None

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/defect_dojo.py

@@ -49,6 +49,28 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
     TRANSFERRED_FINDING = "Transferred Finding"
     ON_WHITELIST = "On Whitelist"
 
+    enviroment_mapping = {
+        "dev": "Development",
+        "qa": "Staging",
+        "pdn": "Production",
+        "default": "Production",
+    }
+
+    scan_type_mapping = {
+        "CHECKOV": "Checkov Scan",
+        "PRISMA": "Twistlock Image Scan",
+        "XRAY": "JFrog Xray On Demand Binary Scan",
+        "TRUFFLEHOG": "Trufflehog Scan",
+        "TRIVY": "Trivy Scan",
+        "KUBESCAPE": "Kubescape JSON Importer",
+        "KICS": "KICS Scan",
+        "BEARER": "Bearer CLI",
+        "DEPENDENCY_CHECK": "Dependency Check Scan",
+        "SONARQUBE": "SonarQube API Import",
+        "GITLEAKS": "Gitleaks Scan",
+        "NUCLEI": "Nuclei Scan",
+    }
+
     def send_vulnerability_management(
         self, vulnerability_management: VulnerabilityManagement
     ):
@@ -65,27 +87,6 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 else vulnerability_management.secret_tool["token_cmdb"]
             )
 
-            enviroment_mapping = {
-                "dev": "Development",
-                "qa": "Staging",
-                "pdn": "Production",
-                "default": "Production",
-            }
-            scan_type_mapping = {
-                "CHECKOV": "Checkov Scan",
-                "PRISMA": "Twistlock Image Scan",
-                "XRAY": "JFrog Xray On Demand Binary Scan",
-                "TRUFFLEHOG": "Trufflehog Scan",
-                "TRIVY": "Trivy Scan",
-                "KUBESCAPE": "Kubescape Scanner",
-                "KICS": "KICS Scanner",
-                "BEARER": "Bearer CLI",
-                "DEPENDENCY_CHECK": "Dependency Check Scan",
-                "SONARQUBE": "SonarQube API Import",
-                "GITLEAKS": "Gitleaks Scan",
-                "NUCLEI": "Nuclei Scan",
-            }
-
             if any(
                 branch in str(vulnerability_management.branch_tag)
                 for branch in vulnerability_management.config_tool[
@@ -94,11 +95,24 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             ) 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'])}"]
-                if vulnerability_management.dict_args["module"] == "engine_container" and sum(1 for line in open("scanned_images.txt", 'r', encoding='utf-8') if line.strip()) > 1:
-                    match = re.search(r"(?<=:)([^-]+)", vulnerability_management.dict_args['image_to_scan'])
+                    tags = [
+                        f"{vulnerability_management.dict_args['module']}_{'_'.join(vulnerability_management.dict_args['platform'])}"
+                    ]
+                if (
+                    vulnerability_management.dict_args["module"] == "engine_container"
+                    and sum(
+                        1
+                        for line in open("scanned_images.txt", "r", encoding="utf-8")
+                        if line.strip()
+                    )
+                    > 1
+                ):
+                    match = re.search(
+                        r"(?<=:)([^-]+)",
+                        vulnerability_management.dict_args["image_to_scan"],
+                    )
                     tags.append(match.group(1) if match else None)
-                  
+
                 use_cmdb = vulnerability_management.config_tool[
                     "VULNERABILITY_MANAGER"
                 ]["DEFECT_DOJO"]["CMDB"]["USE_CMDB"]
@@ -107,8 +121,6 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                     vulnerability_management,
                     token_cmdb,
                     token_dd,
-                    scan_type_mapping,
-                    enviroment_mapping,
                     tags,
                     use_cmdb,
                 )
@@ -422,7 +434,9 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
 
             exclusions_black_list = self._get_finding_exclusion(
                 session_manager,
-                config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["MAX_RETRIES_QUERY"],
+                config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"][
+                    "MAX_RETRIES_QUERY"
+                ],
                 {
                     "type": "black_list",
                 },
@@ -439,28 +453,37 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
         vulnerability_management: VulnerabilityManagement,
         token_cmdb,
         token_dd,
-        scan_type_mapping,
-        enviroment_mapping,
         tags,
         use_cmdb: bool,
     ):
+        tool_scm_conf_mapping = vulnerability_management.config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["TOOL_SCM_MAPPING"]
         common_fields = {
-            "scan_type": scan_type_mapping[vulnerability_management.scan_type],
+            "scan_type": self.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,
+            "tool_scm_configuration": (
+                tool_scm_conf_mapping[
+                    vulnerability_management.repository_provider.upper()
+                ]
+                if vulnerability_management.repository_provider is not None
+                and vulnerability_management.repository_provider.upper()
+                in tool_scm_conf_mapping
+                else tool_scm_conf_mapping["DEFAULT"]
+            ),
             "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,
-            "test_title": '_'.join(tags),
+            "test_title": "_".join(tags),
             "environment": (
-                enviroment_mapping[vulnerability_management.environment.lower()]
+                self.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"]
+                and vulnerability_management.environment.lower()
+                in self.enviroment_mapping
+                else self.enviroment_mapping["default"]
             ),
             "token_defect_dojo": token_dd,
             "host_defect_dojo": vulnerability_management.config_tool[
@@ -469,8 +492,9 @@ 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"]
+            "reimport_scan": vulnerability_management.config_tool[
+                "VULNERABILITY_MANAGER"
+            ]["DEFECT_DOJO"]["REIMPORT_SCAN"],
         }
 
         if use_cmdb:
@@ -625,7 +649,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             ).results
 
         return Utils().retries_requests(request_func, max_retries, retry_delay=5)
-    
+
     def _get_finding_exclusion(self, session_manager, max_retries, query_params):
         def request_func():
             return FindingExclusion.get_finding_exclusion(
@@ -704,7 +728,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             where=self._get_where(finding, tool),
             create_date=create_date,
             expired_date=expired_date,
-            severity=finding.severity,
+            severity=finding.severity.lower(),
             reason=reason,
         )
 
@@ -789,4 +813,4 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 return self._get_where(finding, tag)
             return finding.file_path
         else:
-            return finding.file_path
+            return finding.file_path

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_dast/src/domain/usecases/dast_scan.py

@@ -14,6 +14,7 @@ from devsecops_engine_tools.engine_core.src.domain.model.exclusions import (
     Exclusions,
 )
 from devsecops_engine_tools.engine_core.src.domain.model.threshold import Threshold
+from devsecops_engine_tools.engine_utilities.utils.utils import Utils
 
 class DastScan:
     def __init__(
@@ -118,7 +119,12 @@ class DastScan:
 
         input_core = InputCore(
             totalized_exclusions=totalized_exclusions,
-            threshold_defined=Threshold(config_tool.get("THRESHOLD")),
+            threshold_defined=Utils.update_threshold(
+                self,
+                Threshold(config_tool['THRESHOLD']),
+                exclusions,
+                config_tool["SCOPE_PIPELINE"],
+            ),
             path_file_results=path_file_results,
             custom_message_break_build=config_tool.get("MESSAGE_INFO_DAST"),
             scope_pipeline=config_tool.get("SCOPE_PIPELINE"),

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_dast/src/infrastructure/driven_adapters/nuclei/nuclei_config.py

@@ -32,8 +32,13 @@ class NucleiConfig:
                 template_data["http"][0]["path"] = [
                     "{{BaseURL}}" + new_template_data["operation"]["path"]
                 ]
-                if "headers" in template_data.get("http", [{}])[0]:
-                    template_data["http"][0]["headers"] = new_template_data["operation"]["headers"]
+                if "headers" in new_template_data["operation"]:
+                    if "headers" not in template_data["http"][0]:
+                        template_data["http"][0]["headers"] = new_template_data["operation"]["headers"]
+                    else:
+                        for header, value in new_template_data["operation"]["headers"].items():
+                            if header not in template_data["http"][0]["headers"]:
+                                template_data["http"][0]["headers"][header] = value
                 if "payload" in new_template_data["operation"]:
                     body = json_dumps(new_template_data["operation"]["payload"])
                     template_data["http"][0]["body"] = body

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_sast/engine_iac/src/domain/usecases/iac_scan.py

@@ -13,7 +13,6 @@ from devsecops_engine_tools.engine_core.src.domain.model.exclusions import Exclu
 from devsecops_engine_tools.engine_core.src.domain.model.input_core import InputCore
 from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
 from devsecops_engine_tools.engine_utilities import settings
-from devsecops_engine_tools.engine_core.src.domain.model.threshold import Threshold
 from devsecops_engine_tools.engine_utilities.utils.utils import Utils
 
 logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/request_objects/import_scan.py

@@ -37,7 +37,8 @@ class ImportScanRequest:
     create_finding_groups_for_all_findings: str = ""
     # ****another parameter outside defect dojo*****
     product_description: str = ""
-    tools_configuration: str = ""
+    tool_sonarqube_configuration: str = ""
+    tool_scm_configuration: str = ""
     code_app: str = ""
     token_cmdb: str = ""
     host_cmdb: str = ""

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/serializers/import_scan.py

@@ -83,6 +83,7 @@ list_scan_type = [
     "JFrog Xray On Demand Binary Scan",
     "JFrog Xray Scan",
     "JFrog Xray Unified Scan",
+    "Kubescape JSON Importer",
     "KICS Scan",
     "Kiuwan Scan",
     "kube-bench Scan",
@@ -201,7 +202,8 @@ class ImportScanSerializer(Schema):
     test_title = 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)
+    tool_sonarqube_configuration = fields.Int(required=False, load_default=1)
+    tool_scm_configuration = fields.Int(required=False)
     code_app = fields.Str(required=False)
     # defect-dojo credential
     token_cmdb = fields.Str(required=False)

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py

@@ -25,6 +25,7 @@ class ImportScanUserCase:
         rest_product: ProductRestConsumer,
         rest_scan_configuration: ScanConfigrationRestConsumer,
         rest_engagement: EngagementRestConsumer,
+
     ):
         self.__rest_import_scan = rest_import_scan
         self.__rest_product_type = rest_product_type
@@ -110,7 +111,7 @@ class ImportScanUserCase:
             scan_configuration_list = self.__rest_scan_configurations.get_api_scan_configuration(request)
             if scan_configuration_list.results == []:
                 scan_configuration = self.__rest_scan_configurations.post_api_scan_configuration(
-                    request, product_id, request.tools_configuration
+                    request, product_id, request.tool_sonarqube_configuration
                 )
                 request.api_scan_configuration = scan_configuration.id
                 logger.debug(f"Scan configuration create service_key_1 : {scan_configuration.service_key_1}")
@@ -123,14 +124,14 @@ class ImportScanUserCase:
         logger.debug(f"search Engagement name: {request.engagement_name}")
         engagement = self.__rest_engagement.get_engagements(request.engagement_name)
         if engagement.results == [] or not any(engagement.name == request.engagement_name for engagement in engagement.results):
-            engagement = self.__rest_engagement.post_engagement(request.engagement_name, product_id)
-            logger.debug(f"Egagement created: {engagement.name}")
+            engagement = self.__rest_engagement.post_engagement(request, product_id, request.tool_scm_configuration)
+            logger.debug(f"Engagement created: {engagement.name}")
         else:
             engagement = [engagement for engagement in engagement.results if engagement.product == product_id and engagement.name == request.engagement_name]
             if engagement:
                 logger.debug(f"Engagement found: {engagement[0].name} whit product id: {engagement[0].product}")
             else:
-                engagement = self.__rest_engagement.post_engagement(request.engagement_name, product_id)
-                logger.debug(f"Egagement created: {engagement.name} whit product id {engagement.product}")
+                engagement = self.__rest_engagement.post_engagement(request, product_id, request.tool_scm_configuration)
+                logger.debug(f"Engagement created: {engagement.name} whit product id {engagement.product}")
 
         return self.import_scan(request, api_scan_bool)

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/engagement.py

@@ -57,25 +57,30 @@ class EngagementRestConsumer:
             raise ApiError(e)
         return engagements
 
-    def post_engagement(self, engagement_name, product_id):
+    def post_engagement(self, request: ImportScanRequest, product_id, tool_scm_configuration_id):
         url = f"{self.__host}/api/v2/engagements/"
-        data = json.dumps(
-            {
-                "name": engagement_name,
+        data = {
+                "name": request.engagement_name,
                 "target_start": str(datetime.now().date()),
                 "target_end": str(datetime.now().date()),
                 "product": product_id,
                 "engagement_type": "CI/CD",
                 "status": "In Progress",
             }
-        )
+        
+        if request.source_code_management_uri:
+            data["source_code_management_uri"] = request.source_code_management_uri
+
+        if tool_scm_configuration_id:
+            data["source_code_management_server"] = tool_scm_configuration_id
+        
         headers = {
             "Authorization": f"Token {self.__token}",
             "Content-Type": "application/json",
         }
         try:
             response = self.__session.post(
-                url=url, headers=headers, data=data, verify=VERIFY_CERTIFICATE
+                url=url, headers=headers, data=json.dumps(data), verify=VERIFY_CERTIFICATE
             )
             if response.status_code != 201:
                 logger.error(response.json())

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_utilities/sonarqube/src/domain/usecases/report_sonar.py

@@ -94,6 +94,7 @@ class ReportSonar:
             config_tool = config_tool,
             source_code_management_uri = source_code_management_uri,
             base_compact_remote_config_url = compact_remote_config_url,
+            repository_provider = self.devops_platform_gateway.get_variable("repository_provider"),
             access_token = self.devops_platform_gateway.get_variable("access_token"),
             version = self.devops_platform_gateway.get_variable("build_execution_id"),
             build_id = self.devops_platform_gateway.get_variable("build_id"),

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools/engine_utilities/utils/utils.py

@@ -126,6 +126,7 @@ class Utils:
             threshold.vulnerability = LevelVulnerability(new_threshold.get("VULNERABILITY"))
             threshold.compliance = LevelCompliance(new_threshold.get("COMPLIANCE")) if new_threshold.get("COMPLIANCE") else threshold.compliance
             threshold.cve = new_threshold.get("CVE") if new_threshold.get("CVE") is not None else threshold.cve
+            threshold.name = new_threshold.get("reason", "Exclusion")
             return threshold
 
         threshold_pipeline = exclusions_data.get(pipeline_name, {}).get("THRESHOLD", {})

devsecops_engine_tools-1.47.0/devsecops_engine_tools/version.py

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

{devsecops_engine_tools-1.46.1 → devsecops_engine_tools-1.47.0}/devsecops_engine_tools.egg-info/PKG-INFO

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

devsecops_engine_tools-1.46.1/devsecops_engine_tools/version.py

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