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

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

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

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

@@ -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.37.0}/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.37.0}/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.37.0}/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.37.0}/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.37.0/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.37.0/devsecops_engine_tools/version.py

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

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.37.0}/devsecops_engine_tools.egg-info/PKG-INFO

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

{devsecops_engine_tools-1.36.0 → devsecops_engine_tools-1.37.0}/devsecops_engine_tools.egg-info/SOURCES.txt

@@ -306,6 +306,7 @@ devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapt
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/import_scan.py
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/product.py
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/product_type.py
+devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/reimport_scan.py
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/scan_configurations.py
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/settings/__init__.py
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/settings/settings.py

devsecops_engine_tools-1.36.0/devsecops_engine_tools/version.py

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