devsecops-engine-tools 1.169.0__tar.gz → 1.169.2__tar.gz

{devsecops_engine_tools-1.169.0 → devsecops_engine_tools-1.169.2}/PKG-INFO

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

{devsecops_engine_tools-1.169.0 → devsecops_engine_tools-1.169.2}/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
@@ -288,12 +289,14 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             }
             transfer_finding_query_params = {
                 "risk_status": "Transfer Accepted",
+                "is_mitigated": False,
                 "tags": tool,
                 "limit": dd_limits_query,
                 "fields": "id,vuln_id_from_tool,vulnerability_ids,severity,priority_classification,transfer_finding,endpoints,component_name,component_version,tags,file_path"
             }
             white_list_query_params = {
                 "risk_status": self.ON_WHITELIST,
+                "is_mitigated": False,
                 "tags": tool,
                 "limit": dd_limits_query,
                 "fields": "id,vuln_id_from_tool,vulnerability_ids,severity,priority_classification,endpoints,component_name,component_version,tags,file_path"
@@ -704,7 +707,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,
@@ -715,7 +718,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.169.0 → devsecops_engine_tools-1.169.2}/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.169.0 → devsecops_engine_tools-1.169.2}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/engagement.py

@@ -1,12 +1,12 @@
 import dataclasses
-from typing import List
+from typing import Any, List, Optional
 from devsecops_engine_tools.engine_utilities.utils.dataclass_classmethod import FromDictMixin
 
 
 @dataclasses.dataclass
 class Engagement(FromDictMixin):
     id: int = 0
-    tags = []
+    tags: List[None] = dataclasses.field(default_factory=list)
     name: str = ""
     description: str = ""
     version: str = ""
@@ -42,15 +42,15 @@ class Engagement(FromDictMixin):
     source_code_management_server: str = ""
     orchestration_engine: str = ""
     vm_url: str = ""
-    notes = []
-    files = []
-    risk_acceptance = []
+    notes: List[None] = dataclasses.field(default_factory=list)
+    files: List[None] = dataclasses.field(default_factory=list)
+    risk_acceptance: List[None] = dataclasses.field(default_factory=list)
 
 
 @dataclasses.dataclass
 class EngagementList(FromDictMixin):
     count: int = 0
-    next = None
-    previous = None
+    next: Optional[str] = None
+    previous: Optional[str] = None
     results: List[Engagement] = dataclasses.field(default_factory=list)
-    prefetch = None
+    prefetch: Optional[Any] = None

{devsecops_engine_tools-1.169.0 → devsecops_engine_tools-1.169.2}/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.169.0 → devsecops_engine_tools-1.169.2}/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.169.0 → devsecops_engine_tools-1.169.2}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/product.py

@@ -14,20 +14,20 @@ class Product(FromDictMixin):
     description: str = ""
     created: str = ""
     prod_numeric_grade: int = 0
-    business_criticality = None
-    platform = None
-    lifecycle = None
-    origin = None
-    user_records = None
-    revenue = None
+    business_criticality: Optional[str] = None
+    platform: Optional[str] = None
+    lifecycle: Optional[str] = None
+    origin: Optional[str] = None
+    user_records: Optional[int] = None
+    revenue: Optional[str] = None
     external_audience: Optional[bool] = None
     internet_accessible: Optional[bool] = None
     enable_simple_risk_acceptance: Optional[bool] = None
     enable_full_risk_acceptance: Optional[bool] = None
     disable_sla_breach_notifications: Optional[bool] = None
-    product_manager = None
-    technical_contact = None
-    team_manager = None
+    product_manager: Optional[int] = None
+    technical_contact: Optional[int] = None
+    team_manager: Optional[int] = None
     prod_type: int = 0
     sla_configuration: int = 0
     members: List[int] = dataclasses.field(default_factory=list)

{devsecops_engine_tools-1.169.0 → devsecops_engine_tools-1.169.2}/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.169.0 → devsecops_engine_tools-1.169.2}/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.169.0 → devsecops_engine_tools-1.169.2}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/scan_configuration.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
 
 
@@ -16,6 +16,6 @@ class ScanConfiguration(FromDictMixin):
 @dataclasses.dataclass
 class ScanConfigurationList(FromDictMixin):
     count: int = 2
-    next = None
-    previous = None
+    next: Optional[str] = None
+    previous: Optional[str] = None
     results: List[ScanConfiguration] = dataclasses.field(default_factory=list)

{devsecops_engine_tools-1.169.0 → devsecops_engine_tools-1.169.2}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/request_objects/finding.py

@@ -1,4 +1,5 @@
 import dataclasses
+from typing import Optional
 
 
 @dataclasses.dataclass
@@ -11,40 +12,40 @@ class FindingRequest:
     epss_percentile: float = 0.0
     cvssv3: str = ""
     cvssv3_score: float = 0.0
-    cwe = None
+    cwe: Optional[int] = None
     date: str = ""
-    defect_review_requested_by = None
+    defect_review_requested_by: Optional[int] = None
     description: str = ""
     duplicate: bool = True
-    duplicate_finding = 0
+    duplicate_finding: int = 0
     dynamic_finding: bool = False
     effort_for_fixing: str = ""
-    endpoints = None
+    endpoints: Optional[int] = None
     false_p: bool = False
     file_path: str = ""
-    finding_group = None
+    finding_group: Optional[int] = None
     found_by: int = 0
     has_jira: bool = False
     has_tags: bool = False
     hash_code: str = ""
-    id = None
+    id: Optional[int] = None
     impact: str = ""
-    inherited_tags = None
+    inherited_tags: Optional[str] = None
     is_mitigated: bool = False
     jira_change: str = ""
     jira_creation: str = ""
     last_reviewed: str = ""
-    last_reviewed_by = None
+    last_reviewed_by: Optional[int] = None
     limit: int = 0
     mitigated: str = ""
-    mitigated_by = None
+    mitigated_by: Optional[int] = None
     mitigation: str = ""
-    nb_occurences = None
+    nb_occurences: Optional[int] = None
     not_tag: str = ""
-    not_tags = None
-    not_test__engagement__product__tags = None
-    not_test__engagement__tags = None
-    not_test__tags = None
+    not_tags: Optional[str] = None
+    not_test__engagement__product__tags: Optional[str] = None
+    not_test__engagement__tags: Optional[str] = None
+    not_test__tags: Optional[str] = None
     numerical_severity: str = ""
     offset: int = 0
     out_of_scope: bool = False
@@ -53,37 +54,37 @@ class FindingRequest:
     payload: str = ""
     planned_remediation_date: str = ""
     planned_remediation_version: str = ""
-    prefetch = None
+    prefetch: Optional[str] = None
     product_name: str = ""
     product_name_contains: str = ""
     publish_date: str = ""
     references: str = ""
     related_fields: str = ""
-    reporter = None
-    review_request_by = None
-    reviewers = None
+    reporter: Optional[int] = None
+    review_request_by: Optional[int] = None
+    reviewers: Optional[str] = None
     risk_accetance: int = 0
     risk_accepted: bool = False
     sast_sink_object: str = ""
     sast_source_object: str = ""
-    scanner_confidence = None
+    scanner_confidence: Optional[int] = None
     service: str = ""
     severity: str = ""
     severity_justification: str = ""
     sla_start_date: str = ""
-    sonarqube_issue = None
+    sonarqube_issue: Optional[int] = None
     static_finding: bool = False
     steps_to_reproduce: str = ""
     tag: str = ""
     tags: str = ""
-    test = None
-    test__engagement = None
-    test__engagement__product = None
-    test__engagement__product__prod_type = None
-    test__engagement__product__tags = None
-    test__engagement__tags = None
-    test__tags = None
-    test__test_type = None
+    test: Optional[int] = None
+    test__engagement: Optional[int] = None
+    test__engagement__product: Optional[int] = None
+    test__engagement__product__prod_type: Optional[int] = None
+    test__engagement__product__tags: Optional[str] = None
+    test__engagement__tags: Optional[str] = None
+    test__tags: Optional[str] = None
+    test__test_type: Optional[int] = None
     title: str = ""
     under_defect_review: bool = False
     under_review: bool = False

{devsecops_engine_tools-1.169.0 → devsecops_engine_tools-1.169.2}/devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py

@@ -66,7 +66,9 @@ class ImportScanUserCase:
                     response = ImportScanRequest()
                     response.url = f"{request.host_defect_dojo}"
                     return response
-                logger.error(f"from dict import Scan: {e}")
+                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)}"

{devsecops_engine_tools-1.169.0 → devsecops_engine_tools-1.169.2}/devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/import_scan.py

@@ -120,8 +120,6 @@ 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())

devsecops_engine_tools-1.169.2/devsecops_engine_tools/version.py

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

{devsecops_engine_tools-1.169.0 → devsecops_engine_tools-1.169.2}/devsecops_engine_tools.egg-info/PKG-INFO

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

devsecops_engine_tools-1.169.0/devsecops_engine_tools/version.py

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