PyPI - devsecops-engine-tools - Versions diffs - 1.167.0__tar.gz → 1.169.0__tar.gz - Mend

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

@@ -210,10 +210,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)

@@ -46,6 +46,6 @@ class CheckovDeserealizator:
                     )
                     list_open_findings.append(finding_open)
-            if "'error'" in str(result):
+            if isinstance(result, dict) and "error" in result:
                 raise Exception(result.get("error"))
         return list_open_findings

@@ -413,7 +413,11 @@ class CheckovTool(ToolGateway):
         result = []
         try:
             output = self._execute(checkov_config, command_prefix)
-            result.append(json.loads(output))
+            parsed_output = json.loads(output)
+            if isinstance(parsed_output, list):
+                result.extend(parsed_output)
+            else:
+                result.append(parsed_output)
         except json.JSONDecodeError as e:
             error_msg = f"Failed to parse Checkov output as JSON: {e}"
             logger.error(error_msg)

@@ -61,6 +61,12 @@ 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
+                logger.error(f"from dict import Scan: {e}")
                 raise ApiError(e)
         response.url = f"{request.host_defect_dojo}/test/{str(response.test_id)}"
@@ -143,8 +149,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:

@@ -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,

@@ -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
@@ -127,6 +126,5 @@ class ImportScanRestConsumer:
             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

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

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

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

devsecops-engine-tools 1.167.0tar.gz → 1.169.0tar.gz