devsecops-engine-tools 1.168.0__tar.gz → 1.169.1__tar.gz

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/PKG-INFO

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

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/defect_dojo.py

@@ -1,4 +1,5 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from typing import Dict
 import re
 import os
 from devsecops_engine_tools.engine_core.src.domain.model.gateway.vulnerability_management_gateway import (
@@ -49,14 +50,14 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
     TRANSFERRED_FINDING = "Transferred Finding"
     ON_WHITELIST = "On Whitelist"
 
-    enviroment_mapping = {
+    enviroment_mapping: Dict[str, str] = field(default_factory=lambda: {
         "dev": "Development",
         "qa": "Staging",
         "pdn": "Production",
         "default": "Production",
-    }
+    })
 
-    scan_type_mapping = {
+    scan_type_mapping: Dict[str, str] = field(default_factory=lambda: {
         "CHECKOV": "Checkov Scan",
         "CONFTEST": "Conftest Scan",
         "PRISMA": "Twistlock Image Scan",
@@ -71,16 +72,16 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
         "GITLEAKS": "Gitleaks Scan",
         "NUCLEI": "Nuclei Scan",
         "KIUWAN": "Kiuwan Scan"
-    }
+    })
     
-    multiple_scan_types = {
+    multiple_scan_types: Dict[str, Dict[str, Dict[str, object]]] = field(default_factory=lambda: {
         "engine_secret": {
             "ALL_TOOLS": {
                 "scanners": ["GITLEAKS", "TRUFFLEHOG"],
                 "file_separator": "#"
             }
         }
-    }
+    })
 
     def send_vulnerability_management(
         self, vulnerability_management: VulnerabilityManagement
@@ -210,10 +211,11 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             if print_url:
                 url_parts = response.url.split("//")
                 test_string = "//".join([url_parts[0] + "/", url_parts[1]])
-                print(
-                    "Report sent to vulnerability management: ",
-                    f"{test_string}/test_details" if vulnerability_management.config_tool['VULNERABILITY_MANAGER']['DEFECT_DOJO']['REDIRECT_NEW_VIEWS'] else test_string,
-                )
+                if "test/" in test_string:
+                    print(
+                        "Report sent to vulnerability management: ",
+                        f"{test_string}/test_details" if vulnerability_management.config_tool['VULNERABILITY_MANAGER']['DEFECT_DOJO']['REDIRECT_NEW_VIEWS'] else test_string,
+                    )
         else:
             raise ExceptionVulnerabilityManagement(response)
 
@@ -703,7 +705,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                         **kwargs,
                     )
                 )
-            elif finding.risk_status == "Transfer Accepted":
+            elif finding.risk_status == "Transfer Accepted" and not finding.mitigated:
                 exclusions.append(
                     self._create_report_exclusion(
                         finding,
@@ -714,7 +716,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                         **kwargs,
                     )
                 )
-            elif finding.risk_status == self.ON_WHITELIST:
+            elif finding.risk_status == self.ON_WHITELIST and not finding.mitigated:
                 exclusions.append(
                     self._create_report_exclusion(
                         finding,

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/component.py

@@ -1,5 +1,5 @@
 import dataclasses
-from typing import List
+from typing import List, Optional
 from devsecops_engine_tools.engine_utilities.utils.dataclass_classmethod import FromDictMixin
 
 
@@ -15,6 +15,6 @@ class Component(FromDictMixin):
 @dataclasses.dataclass
 class ComponentList(FromDictMixin):
     count: int = 0
-    next = None
-    previous = None
+    next: Optional[str] = None
+    previous: Optional[str] = None
     results: List[Component] = dataclasses.field(default_factory=list)

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/engagement.py

@@ -6,7 +6,7 @@ from devsecops_engine_tools.engine_utilities.utils.dataclass_classmethod import
 @dataclasses.dataclass
 class Engagement(FromDictMixin):
     id: int = 0
-    tags = []
+    tags: List[None] = dataclasses.field(default_factory=list)
     name: str = ""
     description: str = ""
     version: str = ""

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/finding.py

@@ -1,5 +1,5 @@
 import dataclasses
-from typing import List, Optional
+from typing import Any, List, Optional
 from devsecops_engine_tools.engine_utilities.utils.dataclass_classmethod import FromDictMixin
 
 @dataclasses.dataclass
@@ -12,7 +12,7 @@ class TransferFinding(FromDictMixin):
 class Finding(FromDictMixin):
     id: int = 0
     tags: List[None] = dataclasses.field(default_factory=list)
-    request_response = None
+    request_response: Optional[Any] = None
     req_resp: List[None] = dataclasses.field(default_factory=list)
     accepted_risks: List[None] = dataclasses.field(default_factory=list)
     transfer_finding: Optional[TransferFinding] = None
@@ -20,29 +20,29 @@ class Finding(FromDictMixin):
     age: int = 0
     sla_days_remaining: int = 0
     finding_meta: List[None] = dataclasses.field(default_factory=list)
-    related_fields = None
-    jira_creation = None
-    jira_change = None
+    related_fields: Optional[Any] = None
+    jira_creation: Optional[str] = None
+    jira_change: Optional[str] = None
     display_status: str = ""
     finding_groups: List[None] = dataclasses.field(default_factory=list)
     vulnerability_ids: List[None] = dataclasses.field(default_factory=list)
     reporter: int = 0
     title: int = 0
     date: str = ""
-    sla_start_date = None
+    sla_start_date: Optional[str] = None
     cwe: int = 0
     epss_score: int = 0
     epss_percentile: int = 0
-    cvssv3 = None
-    cvssv3_score = None
+    cvssv3: Optional[str] = None
+    cvssv3_score: Optional[float] = None
     url: str = ""
     severity: str = ""
     description: str = ""
-    mitigation = None
-    impact = None
-    steps_to_reproduce = None
-    severity_justification = None
-    references = None
+    mitigation: Optional[str] = None
+    impact: Optional[str] = None
+    steps_to_reproduce: Optional[str] = None
+    severity_justification: Optional[str] = None
+    references: Optional[str] = None
     active: Optional[bool] = None
     verified: Optional[bool] = None
     false_p: Optional[bool] = None
@@ -55,13 +55,13 @@ class Finding(FromDictMixin):
     under_defect_review: Optional[bool] = None
     is_mitigated: Optional[bool] = None
     thread_id: int = -1
-    mitigated = None
+    mitigated: Optional[str] = None
     numerical_severity: str = ""
     last_reviewed: str = ""
-    param = None
-    payload = None
+    param: Optional[str] = None
+    payload: Optional[str] = None
     hash_code: str = ""
-    line = None
+    line: Optional[int] = None
     file_path: str = ""
     component_name: str = ""
     component_version: str = ""
@@ -69,25 +69,25 @@ class Finding(FromDictMixin):
     dynamic_finding: Optional[bool] = None
     created: str = ""
     service: str = ""
-    scanner_confidence = None
+    scanner_confidence: Optional[int] = None
     unique_id_from_tool: str = ""
     vuln_id_from_tool: str = ""
-    sast_source_object = None
-    sast_sink_object = None
-    sast_source_line = None
-    sast_source_file_path = None
-    nb_occurences = None
+    sast_source_object: Optional[str] = None
+    sast_sink_object: Optional[str] = None
+    sast_source_line: Optional[int] = None
+    sast_source_file_path: Optional[str] = None
+    nb_occurences: Optional[int] = None
     publish_date: str = ""
-    planned_remediation_date = None
-    planned_remediation_version = None
-    effort_for_fixing = None
+    planned_remediation_date: Optional[str] = None
+    planned_remediation_version: Optional[str] = None
+    effort_for_fixing: Optional[str] = None
     test: int = -1
-    duplicate_finding = None
-    review_requested_by = None
-    defect_review_requested_by = None
-    mitigated_by = None
+    duplicate_finding: Optional[int] = None
+    review_requested_by: Optional[int] = None
+    defect_review_requested_by: Optional[int] = None
+    mitigated_by: Optional[int] = None
     last_reviewed_by: int = -1
-    sonarqube_issue = None
+    sonarqube_issue: Optional[int] = None
     endpoints: List[None] = dataclasses.field(default_factory=list)
     reviewers: List[None] = dataclasses.field(default_factory=list)
     notes: List[None] = dataclasses.field(default_factory=list)
@@ -100,7 +100,7 @@ class Finding(FromDictMixin):
 @dataclasses.dataclass
 class FindingList(FromDictMixin):
     count: int = 0
-    next = None
-    previous = None
+    next: Optional[str] = None
+    previous: Optional[str] = None
     results: List[Finding] = dataclasses.field(default_factory=list)
-    prefetch = None
+    prefetch: Optional[Any] = None

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/finding_exclusion.py

@@ -1,5 +1,5 @@
 import dataclasses
-from typing import List
+from typing import List, Optional
 from devsecops_engine_tools.engine_utilities.utils.dataclass_classmethod import FromDictMixin
 
 
@@ -15,6 +15,6 @@ class FindingExclusion(FromDictMixin):
 @dataclasses.dataclass
 class FindingExclusionList(FromDictMixin):
     count: int = 0
-    next = None
-    previous = None
+    next: Optional[str] = None
+    previous: Optional[str] = None
     results: List[FindingExclusion] = dataclasses.field(default_factory=list)

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/product_list.py

@@ -12,7 +12,7 @@ class Prefetch(FromDictMixin):
 @dataclasses.dataclass
 class ProductList(FromDictMixin):
     count: int = 0
-    next = None
-    previous = None
+    next: Optional[str] = None
+    previous: Optional[str] = None
     results: List[Product] = dataclasses.field(default_factory=list)
     prefetch: Optional[Prefetch] = None

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/product_type_list.py

@@ -1,5 +1,5 @@
 import dataclasses
-from typing import List
+from typing import List, Optional, Any
 from devsecops_engine_tools.engine_utilities.utils.dataclass_classmethod import FromDictMixin
 from devsecops_engine_tools.engine_utilities.defect_dojo.domain.models.product_type import ProductType
 
@@ -7,7 +7,7 @@ from devsecops_engine_tools.engine_utilities.defect_dojo.domain.models.product_t
 @dataclasses.dataclass
 class ProductTypeList(FromDictMixin):
     count: int = 0
-    next = None
-    previous = None
+    next: Optional[str] = None
+    previous: Optional[str] = None
     results: List[ProductType] = dataclasses.field(default_factory=list)
-    prefetch = None
+    prefetch: Optional[Any] = None

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py

@@ -61,6 +61,14 @@ class ImportScanUserCase:
                     response = self.__rest_import_scan.import_scan(request, files)
 
             except Exception as e:
+                if "504 Gateway Time-out" in str(e):
+                    logger.warning("Timeout balancer response, Vulnerability management keep Processing Import Scan in Background")
+                    response = ImportScanRequest()
+                    response.url = f"{request.host_defect_dojo}"
+                    return response
+                if response is not None:
+                    logger.error(f"Response status code {response.status_code}")
+                    logger.error(f"Error {response.text}")
                 raise ApiError(e)
 
         response.url = f"{request.host_defect_dojo}/test/{str(response.test_id)}"
@@ -143,8 +151,11 @@ class ImportScanUserCase:
                         request.product_name = product_eng.name
                         request.product_type_name = product_engagement.prefetch.prod_type[str(product_eng.prod_type)].name
                         logger.debug(f"Hold Product engagement found: {request.product_name} with product type: {request.product_type_name}")
-                if request.engagement_description and engagement[0].description != request.engagement_description:
-                    engagement = self.__rest_engagement.patch_engagement(request, engagement[0].id)
+                description_changed = request.engagement_description and engagement[0].description != request.engagement_description
+                scm_uri_changed = request.source_code_management_uri and engagement[0].source_code_management_uri != request.source_code_management_uri
+                scm_server_changed = request.tool_scm_configuration and str(engagement[0].source_code_management_server) != str(request.tool_scm_configuration)
+                if description_changed or scm_uri_changed or scm_server_changed:
+                    engagement = self.__rest_engagement.patch_engagement(request, engagement[0].id, request.tool_scm_configuration)
                     logger.debug(f"Engagement updated: {engagement.name}")
 
             else:

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/engagement.py

@@ -92,11 +92,18 @@ class EngagementRestConsumer:
             raise ApiError(e)
         return response
 
-    def patch_engagement(self, request: ImportScanRequest, engagement_id):
+    def patch_engagement(self, request: ImportScanRequest, engagement_id, tool_scm_configuration_id=None):
         url = f"{self.__host}/api/v2/engagements/{engagement_id}/"
         data = {
             "description": request.engagement_description,
         }
+
+        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": CONTENT_TYPE_JSON,

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/import_scan.py

@@ -68,7 +68,6 @@ class ImportScanRestConsumer:
                 raise ApiError(response.text)
             response = ImportScanRequest().from_dict(response.json())
         except Exception as e:
-            logger.error(f"from dict import Scan: {e} with data: {data}")
             raise ApiError(e)
         return response
 
@@ -121,12 +120,9 @@ class ImportScanRestConsumer:
                                            files=files,
                                            verify=VERIFY_CERTIFICATE)
             if response.status_code != 201:
-                logger.error(f"Response status code {response.status_code}")
-                logger.error(f"Error {response.text}")
                 raise ApiError(response.text)
             logger.debug(f"Sucessfull {response}")
             response = ImportScanRequest.from_dict(response.json())
         except Exception as e:
-            logger.error(f"from dict import Scan: {e} with data: {data}")
             raise ApiError(e)
         return response

devsecops_engine_tools-1.169.1/devsecops_engine_tools/version.py

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

{devsecops_engine_tools-1.168.0 → devsecops_engine_tools-1.169.1}/devsecops_engine_tools.egg-info/PKG-INFO

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

devsecops_engine_tools-1.168.0/devsecops_engine_tools/version.py

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