devsecops-engine-tools 1.41.0__py3-none-any.whl → 1.42.0__py3-none-any.whl

devsecops_engine_tools/engine_utilities/defect_dojo/applications/defect_dojo.py

@@ -3,9 +3,6 @@ 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,
 )
@@ -51,16 +48,12 @@ 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/engine_utilities/defect_dojo/domain/user_case/import_scan.py

@@ -5,7 +5,6 @@ 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 (
@@ -26,14 +25,12 @@ 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 get_file_type(self, path_file):
@@ -49,7 +46,6 @@ class ImportScanUserCase:
 
     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}")
@@ -70,31 +66,6 @@ class ImportScanUserCase:
         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
 
@@ -162,8 +133,4 @@ 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 request.reimport_scan is True:
-            logger.debug("reimport scan flow")
-            return self.reimport_scan(request, api_scan_bool)
-        else:
-            return self.import_scan(request, api_scan_bool)
+        return self.import_scan(request, api_scan_bool)

devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/import_scan.py

@@ -16,7 +16,6 @@ class ImportScanRestConsumer:
         self.__session = session._instance
 
     def import_scan_api(self, request: ImportScanRequest) -> ImportScanRequest:
-        url = f"{self.__host}/api/v2/import-scan/"
         data = {
             "scan_date": request.scan_date,
             "minimum_severity": request.minimum_severity,
@@ -24,14 +23,12 @@ class ImportScanRestConsumer:
             "verified": request.verified,
             "scan_type": request.scan_type,
             "endpoint_to_add": request.endpoint_to_add,
-            # "file": request.file,
             "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,
             "engagement": str(request.engagement) if request.engagement != 0 else "",
-            "auto_create_context": "false",
             "deduplication_on_engagement": request.deduplication_on_engagement,
             "lead": request.lead,
             "tags": ",".join(request.tags) if request.tags else "",
@@ -49,6 +46,15 @@ class ImportScanRestConsumer:
             "service": request.service,
             "group_by": request.group_by,
         }
+
+        if request.reimport_scan:
+            url = f"{self.__host}/api/v2/reimport-scan/"
+            data["auto_create_context"] = "true"
+
+        else:
+            url = f"{self.__host}/api/v2/import-scan/"
+            data["auto_create_context"] = "false"
+
         multipart_data = MultipartEncoder(fields=data)
 
         headers = {"Authorization": f"Token {self.__token}", "Content-Type": multipart_data.content_type}
@@ -65,8 +71,7 @@ class ImportScanRestConsumer:
         return response
 
     def import_scan(self, request: ImportScanRequest, files) -> ImportScanRequest:
-        url = f"{self.__host}/api/v2/import-scan/"
-        payload = {
+        data = {
             "scan_date": request.scan_date,
             "minimum_severity": request.minimum_severity,
             "active": request.active,
@@ -80,7 +85,6 @@ class ImportScanRestConsumer:
             "engagement_end_date": request.engagement_end_date,
             "source_code_management_uri": request.source_code_management_uri,
             "engagement": request.engagement if request.engagement != 0 else "",
-            "auto_create_context": "false",
             "deduplication_on_engagement": request.deduplication_on_engagement,
             "lead": request.lead,
             "tags": request.tags,
@@ -98,12 +102,23 @@ class ImportScanRestConsumer:
             "service": request.service,
             "group_by": request.group_by,
         }
+        if request.reimport_scan is True:
+            url = f"{self.__host}/api/v2/reimport-scan/"
+            data["auto_create_context"] = "true"
+            data["test_title"] = request.test_title
+        else:
+            url = f"{self.__host}/api/v2/import-scan/"
+            data["auto_create_context"] = "false"
 
         headers = {"Authorization": f"Token {self.__token}"}
         try:
-            response = self.__session.post(url, headers=headers, data=payload, files=files, verify=VERIFY_CERTIFICATE)
+            response = self.__session.post(url,
+                                           headers=headers,
+                                           data=data,
+                                           files=files,
+                                           verify=VERIFY_CERTIFICATE)
             if response.status_code != 201:
-                logger.error(payload)
+                logger.error(data)
                 logger.error(response.json())
                 logger.error(response)
                 raise ApiError(response.json())

devsecops_engine_tools/version.py

@@ -1 +1 @@
-version = '1.41.0'
+version = '1.42.0'

{devsecops_engine_tools-1.41.0.dist-info → devsecops_engine_tools-1.42.0.dist-info}/METADATA

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

{devsecops_engine_tools-1.41.0.dist-info → devsecops_engine_tools-1.42.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=-B41LzxW9MaDd_gk-GaUDRhpW1fsMeynOvaN5fZXPV4,19
+devsecops_engine_tools/version.py,sha256=lImSWY-_RWXVBAAKLg7CiJoHxDRvObxtgqXGqYqoSeg,19
 devsecops_engine_tools/engine_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/applications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -257,7 +257,7 @@ devsecops_engine_tools/engine_utilities/defect_dojo/hello_world.py,sha256=WDvgS2
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/component.py,sha256=Y6vA1nRfMCoqJEceRBDQ_QLpIKASqB-t8V1yqao-eUQ,1175
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/connect.py,sha256=tRvNN-zVKBJbHMvfW97SCsZoyjGaKttcQhLOKrbjK9E,2079
-devsecops_engine_tools/engine_utilities/defect_dojo/applications/defect_dojo.py,sha256=WKx_nBZV9bZj-Y9UAg-C4SeCapbRhQb7475lcuzlGVg,2943
+devsecops_engine_tools/engine_utilities/defect_dojo/applications/defect_dojo.py,sha256=gJMBVtE--Kvdc908fQa2T35mYyBXAWNTxM0DKsZ7e-w,2615
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/engagement.py,sha256=sPTeQs6QHg07QNthqhY3caVbG54vDkd_E_KJpBvgTk4,878
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/finding.py,sha256=Cw5_TElo0D0Ec8X0lu-La2H9Pp1rsrmw-2Wv-0w_9oI,1451
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/finding_exclusion.py,sha256=StnDFV3vGhBffBEs-jfV9nMprzRucm5VJqtZFWKF3Fo,689
@@ -286,7 +286,7 @@ devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/component.p
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/engagement.py,sha256=SVX-weFRPT3DK7w6IBrLuWS4L6vboMuZtwXAQmIHfEE,406
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/finding.py,sha256=TjfpdJtaBwQvT8XNJKBf6tuOASOAw7ZiOxJbqsKadaA,1689
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/finding_exclusion.py,sha256=VqdwBiQGc9XFpatvbXGL837LtTxkWlfhWH46W1cTbCg,455
-devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py,sha256=N31WBga-wu0inWOuikasSUP9ASemDJtrcHg31whCALM,8573
+devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py,sha256=iXfvv_MDQODC6jU-OSVIMj3_MAOzCZCY6Hay56es0Gg,7047
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/product.py,sha256=6f6eABdC79zOopMe_Rif3XoGG-yFfq9x_EOkevTuGDY,368
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -295,10 +295,9 @@ devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapt
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/engagement.py,sha256=39qqmTxECRY5IoFvK_B_R0vfwfJwLbdhGt_pcdvdVIE,3571
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/finding.py,sha256=k-z2tg_NPKMni7rZgXMZa2-t8_8F35r8YtF1EcjMyDs,2355
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/finding_exclusion.py,sha256=BL4xf1FE5tMsBri0LetxBRUgOgLogdoHX97rQkHh10g,1524
-devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/import_scan.py,sha256=SwkW-2Znzs_RiCPPsIgZKSG_VSO2afoQH5DTTg-dKPQ,5929
+devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/import_scan.py,sha256=1oTQs7ML8DM29qPdgxSHhX4J5tLc9bsTaaAF1iKE0fI,6462
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/product.py,sha256=DhiLPv8KyRhHBRhvF0ULhchhGAT8SQyn1ftiuou_aKw,2576
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/product_type.py,sha256=x-Gh2BEP6IZccS2m_DLB8xI6aEkS19J0ZUpP2mjY88o,3078
-devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/reimport_scan.py,sha256=6Wtg88p9WFdWjEAfNT2qjUcRGRg6wmruvuKcmajG3A8,3469
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/scan_configurations.py,sha256=YVIHiXPkJ8m1nOW7lG8LGbST16eMZoJwFQcrRRU7R6k,3089
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/settings/settings.py,sha256=5ni59GuAHT-avpWNc4FSedVpoFRTGRNzjQJkAXpWv6c,28
@@ -348,8 +347,8 @@ devsecops_engine_tools/engine_utilities/utils/name_conversion.py,sha256=ADJrRGax
 devsecops_engine_tools/engine_utilities/utils/printers.py,sha256=amYAr9YQfYgR6jK9a2l26z3oovFPQ3FAKmhq6BKhEBA,623
 devsecops_engine_tools/engine_utilities/utils/session_manager.py,sha256=Z0fdhB3r-dxU0nGSD9zW_B4r2Qol1rUnUCkhFR0U-HQ,487
 devsecops_engine_tools/engine_utilities/utils/utils.py,sha256=XFap4yOK7ItLWsqbwDhvLd7NpDhs7i-UGJAMD6jjd7w,6687
-devsecops_engine_tools-1.41.0.dist-info/METADATA,sha256=aYG37gdm8hbtdPKsGJpfQqcjO2rOldAfqfWhANIh5ps,11750
-devsecops_engine_tools-1.41.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-devsecops_engine_tools-1.41.0.dist-info/entry_points.txt,sha256=MHCTFFs9bdNKo6YcWCcBW2_8X6yTisgLOlmVx-V8Rxc,276
-devsecops_engine_tools-1.41.0.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.41.0.dist-info/RECORD,,
+devsecops_engine_tools-1.42.0.dist-info/METADATA,sha256=x3BvCitJpws34kkpjw2AatvJGQr_WE-e_bI2AqMTcLc,11750
+devsecops_engine_tools-1.42.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+devsecops_engine_tools-1.42.0.dist-info/entry_points.txt,sha256=MHCTFFs9bdNKo6YcWCcBW2_8X6yTisgLOlmVx-V8Rxc,276
+devsecops_engine_tools-1.42.0.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.42.0.dist-info/RECORD,,

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

@@ -1,74 +0,0 @@
-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