devsecops-engine-tools 1.7.33__py3-none-any.whl → 1.7.35__py3-none-any.whl

devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/defect_dojo.py

@@ -24,6 +24,12 @@ from devsecops_engine_tools.engine_core.src.infrastructure.helpers.util import (
 )
 from functools import partial
 
+from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
+from devsecops_engine_tools.engine_utilities import settings
+import time
+
+logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
+
 
 @dataclass
 class DefectDojoPlatform(VulnerabilityManagementGateway):
@@ -56,7 +62,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 "TRUFFLEHOG": "Trufflehog Scan",
                 "TRIVY": "Trivy Scan",
                 "KUBESCAPE": "Kubescape Scanner",
-                "KICS": "KICS Scanner"
+                "KICS": "KICS Scanner",
             }
 
             if any(
@@ -64,7 +70,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 for branch in vulnerability_management.config_tool[
                     "VULNERABILITY_MANAGER"
                 ]["BRANCH_FILTER"].split(",")
-            ) or (vulnerability_management.dict_args["tool"] == 'engine_secret'):
+            ) or (vulnerability_management.dict_args["tool"] == "engine_secret"):
                 request: ImportScanRequest = Connect.cmdb(
                     cmdb_mapping={
                         "product_type_name": "nombreevc",
@@ -105,7 +111,17 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                     tags=vulnerability_management.dict_args["tool"],
                 )
 
-                response = DefectDojo.send_import_scan(request)
+                def request_func():
+                    return DefectDojo.send_import_scan(request)
+
+                response = self._retries_requests(
+                    request_func,
+                    vulnerability_management.config_tool["VULNERABILITY_MANAGER"][
+                        "DEFECT_DOJO"
+                    ]["MAX_RETRIES_QUERY"],
+                    retry_delay=5,
+                )
+
                 if hasattr(response, "url"):
                     url_parts = response.url.split("//")
                     test_string = "//".join([url_parts[0] + "/", url_parts[1]])
@@ -124,11 +140,17 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
 
     def get_findings_excepted(self, service, dict_args, secret_tool, config_tool):
         try:
-            session_manager = self._get_session_manager(dict_args, secret_tool, config_tool)
+            session_manager = self._get_session_manager(
+                dict_args, secret_tool, config_tool
+            )
 
             dd_limits_query = config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"][
                 "LIMITS_QUERY"
             ]
+            dd_max_retries = config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"][
+                "MAX_RETRIES_QUERY"
+            ]
+
             tool = dict_args["tool"]
 
             risk_accepted_query_params = {
@@ -145,6 +167,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             exclusions_risk_accepted = self._get_findings_with_exclusions(
                 session_manager,
                 service,
+                dd_max_retries,
                 risk_accepted_query_params,
                 tool,
                 self._format_date_to_dd_format,
@@ -154,6 +177,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             exclusions_false_positive = self._get_findings_with_exclusions(
                 session_manager,
                 service,
+                dd_max_retries,
                 false_positive_query_params,
                 tool,
                 self._format_date_to_dd_format,
@@ -168,23 +192,29 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 )
             )
 
-    def get_all_findings(
-        self, service, dict_args, secret_tool, config_tool
-    ):
+    def get_all_findings(self, service, dict_args, secret_tool, config_tool):
         try:
             all_findings_query_params = {
-                "limit": config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["LIMITS_QUERY"]
+                "limit": config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"][
+                    "LIMITS_QUERY"
+                ]
             }
+            max_retries = config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"][
+                "MAX_RETRIES_QUERY"
+            ]
 
             findings = self._get_findings(
                 self._get_session_manager(dict_args, secret_tool, config_tool),
-                service, 
-                all_findings_query_params
+                service,
+                max_retries,
+                all_findings_query_params,
             )
 
             maped_list = list(
                 map(
-                    partial(self._create_report, date_fn=self._format_date_to_dd_format),
+                    partial(
+                        self._create_report, date_fn=self._format_date_to_dd_format
+                    ),
                     findings,
                 )
             )
@@ -193,33 +223,49 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
 
         except Exception as ex:
             raise ExceptionGettingFindings(
-                "Error getting all findings with the following error: {0} ".format(
-                    ex
-                )
+                "Error getting all findings with the following error: {0} ".format(ex)
             )
 
     def _get_session_manager(self, dict_args, secret_tool, config_tool):
-        token_dd = dict_args.get(
-                "token_vulnerability_management"
-            ) or secret_tool.get("token_defect_dojo")
+        token_dd = dict_args.get("token_vulnerability_management") or secret_tool.get(
+            "token_defect_dojo"
+        )
         return SessionManager(
             token_dd,
             config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["HOST_DEFECT_DOJO"],
         )
 
     def _get_findings_with_exclusions(
-        self, session_manager, service, query_params, tool, date_fn, reason
+        self, session_manager, service, max_retries, query_params, tool, date_fn, reason
     ):
-        findings = self._get_findings(session_manager, service, query_params)
+        findings = self._get_findings(
+            session_manager, service, max_retries, query_params
+        )
         return map(
             partial(self._create_exclusion, date_fn=date_fn, tool=tool, reason=reason),
             findings,
         )
 
-    def _get_findings(self, session_manager, service, query_params):
-        return Finding.get_finding(
-            session=session_manager, service=service, **query_params
-        ).results
+    def _get_findings(self, session_manager, service, max_retries, query_params):
+        def request_func():
+            return Finding.get_finding(
+                session=session_manager, service=service, **query_params
+            ).results
+
+        return self._retries_requests(request_func, max_retries, retry_delay=5)
+
+    def _retries_requests(self, request_func, max_retries, retry_delay):
+        for attempt in range(max_retries):
+            try:
+                return request_func()
+            except Exception as e:
+                logger.error(f"Error making the request: {e}")
+                if attempt < max_retries - 1:
+                    logger.warning(f"Retry in {retry_delay} seconds...")
+                    time.sleep(retry_delay)
+                else:
+                    logger.error("Maximum number of retries reached, aborting.")
+                    raise e
 
     def _create_exclusion(self, finding, date_fn, tool, reason):
         return Exclusions(
@@ -241,9 +287,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
     def _create_report(self, finding, date_fn):
         return Report(
             id=finding.vuln_id_from_tool,
-            date=date_fn(
-                finding.date
-            ),
+            date=date_fn(finding.date),
             status=finding.display_status,
             where=self._get_where_report(finding),
             tags=finding.tags,
@@ -257,7 +301,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             if date_string
             else None
         )
-    
+
     def _get_where_report(self, finding):
         for tag in finding.tags:
             return self._get_where(finding, tag)

devsecops_engine_tools/engine_utilities/defect_dojo/applications/defect_dojo.py

@@ -34,7 +34,6 @@ class DefectDojo:
                 rest_scan_configuration,
                 rest_engagement=rest_engagement,
             )
-            response = uc.execute(request)
-            return response
+            return uc.execute(request)
         except ApiError as e:
-            return e
+            raise e

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

@@ -25,7 +25,7 @@ class ProductRestConsumer:
                 raise ApiError(response.json())
             products_object = ProductList.from_dict(response.json())
         except Exception as e:
-            logger.error(f"from dict product: {response.json()}")
+            logger.error(f"from dict product: {e}")
             raise ApiError(e)
         return products_object
 

devsecops_engine_tools/version.py

@@ -1 +1 @@
-version = '1.7.33'
+version = '1.7.35'

{devsecops_engine_tools-1.7.33.dist-info → devsecops_engine_tools-1.7.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.7.33
+Version: 1.7.35
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -10,20 +10,20 @@ Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or l
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: requests ==2.31.0
-Requires-Dist: multipledispatch ==0.6.0
-Requires-Dist: PyYAML ==6.0.1
-Requires-Dist: checkov ==2.3.296
-Requires-Dist: pyfiglet ==0.7
-Requires-Dist: prettytable ==3.8.0
-Requires-Dist: azure-devops ==7.1.0b3
-Requires-Dist: marshmallow ==3.19.0
-Requires-Dist: pytz ==2023.3
-Requires-Dist: python-decouple ==3.8
-Requires-Dist: requests-toolbelt ==1.0.0
-Requires-Dist: python-dateutil ==2.8.2
-Requires-Dist: pexpect ==4.9.0
-Requires-Dist: PyGithub ==2.3.0
+Requires-Dist: requests==2.31.0
+Requires-Dist: multipledispatch==0.6.0
+Requires-Dist: PyYAML==6.0.1
+Requires-Dist: checkov==2.3.296
+Requires-Dist: pyfiglet==0.7
+Requires-Dist: prettytable==3.8.0
+Requires-Dist: azure-devops==7.1.0b3
+Requires-Dist: marshmallow==3.19.0
+Requires-Dist: pytz==2023.3
+Requires-Dist: python-decouple==3.8
+Requires-Dist: requests-toolbelt==1.0.0
+Requires-Dist: python-dateutil==2.8.2
+Requires-Dist: pexpect==4.9.0
+Requires-Dist: PyGithub==2.3.0
 
 # DevSecOps Engine Tools
 
@@ -150,9 +150,42 @@ $ set +a
 devsecops-engine-tools --platform_devops local --remote_config_repo DevSecOps_Remote_Config --tool engine_iac
 
 ```
-### Scan result sample (CLI)
 
-![Dashboard Grafana](docs/demo_session.svg)
+![Demo CLI Local](docs/demo_session.svg)
+
+
+### Scan running sample - Azure Pipelines
+
+The remote config should be in a Azure Devops repository.
+
+Note: By default the tool gets the token from the SYSTEM_ACCESSTOKEN variable to get the remote configuration repository. You must ensure that this token has permission to access this resource.
+
+```yaml
+name: $(Build.SourceBranchName).$(date:yyyyMMdd)$(rev:.r)
+
+trigger:
+  branches:
+    include:
+      - trunk
+      - feature/*
+
+stages:
+  - stage: engine_tools
+    displayName: Example Engine Tools
+    jobs:
+      - job: engine_tools
+        pool:
+          name: Azure Pipelines
+        steps:
+          - script: |
+              # Install devsecops-engine-tools
+              pip3 install -q devsecops-engine-tools
+              devsecops-engine-tools --platform_devops azure --remote_config_repo remote_config --tool engine_iac
+            displayName: "Engine Tools"
+        env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+```
 
 ### Scan running sample - Github Actions
 
@@ -167,7 +200,7 @@ For more information, refer to [Automatic token authentication](https://docs.git
 
 1. Create a personal access token with the necessary permissions to access the repository.
 2. Add the token as a secret in the GitHub repository.
-    ![Dashboard Grafana](docs/secret_token.png)
+    ![Demo Github](docs/secret_token.png)
 
 3. Configure the yml file containing the workflow using the created secret.
 

{devsecops_engine_tools-1.7.33.dist-info → devsecops_engine_tools-1.7.35.dist-info}/RECORD

@@ -1,5 +1,5 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=h11L2DDrYwZBoizyDdRE9iXihnMzBYqtD28vWFs75So,19
+devsecops_engine_tools/version.py,sha256=OhfuJ_hT9u5zxcpsZ-frhGCe3RVrLT8Y3u7VfOtZMC8,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
@@ -36,7 +36,7 @@ devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/aws/secret
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/azure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/azure/azure_devops.py,sha256=Ot1j5my-iEpU-ZYy9yNXkwmwLOmJ3f95JyyAUcpFN5g,4967
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/defect_dojo.py,sha256=6xQ9coU37r9g3lYlxWEVGiM8WBWSL_5TP-6EVr8BWAY,10992
+devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/defect_dojo.py,sha256=DCHx5xadwtuXf8dqjOOw_2Ssb9In-PikfwbWCW7oIww,12676
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/github/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/github/github_actions.py,sha256=JhTfHCR4G29VByrS7ntKZwXbfCHpO0C3D8vIQlBD4rQ,3855
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/printer_pretty_table/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -197,7 +197,7 @@ devsecops_engine_tools/engine_utilities/defect_dojo/__init__.py,sha256=RXqe3J12f
 devsecops_engine_tools/engine_utilities/defect_dojo/hello_world.py,sha256=WDvgS22lIJJNoIM4b6mrxT8Bu_6hADmrCOZgvf5yGVY,45
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/connect.py,sha256=RfHBfE0TFV9kEI21FIlfodqYIXNRCcux4h0sLgCkqhA,1879
-devsecops_engine_tools/engine_utilities/defect_dojo/applications/defect_dojo.py,sha256=d_V74Fq7ygI52sDDKmvMBGM5cUNSxDErAdSn8pmcYMA,2331
+devsecops_engine_tools/engine_utilities/defect_dojo/applications/defect_dojo.py,sha256=xC4rOfTv66uaBqbsP3Xe5_BfG84b8lgLq68-3Al9yag,2297
 devsecops_engine_tools/engine_utilities/defect_dojo/applications/finding.py,sha256=SBbFawywfvfpqFjFdnK-LaoC05bqJe2-ee6gYntMLUk,1727
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -225,7 +225,7 @@ devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapt
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/engagement.py,sha256=A4sTRzEN16c70wgxLbdBepRZ3acrOEzBnQXRJdpUBBc,2673
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/finding.py,sha256=_908m1MLeN77grEKzAQnZ9JFGtpFzT8T6B64YDlspMg,1913
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/import_scan.py,sha256=68Qd8o0oSxFG-3cRlX97BkX9muS6k64DGslGtX9sx6M,5897
-devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/product.py,sha256=te8-9ZvOEOboePg3KvyR1brHKT-XVZnuDg9vnG4YOo4,2674
+devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/product.py,sha256=viYd3_x-KAXGJE7b-AmLCRnfARTZ_1haLprEWcROcLc,2660
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/product_type.py,sha256=9Lzsh9HCs4rbJ2b6X11renvYU3g6s-1q2NUDwbYX0qY,3051
 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
@@ -249,8 +249,8 @@ devsecops_engine_tools/engine_utilities/utils/logger_info.py,sha256=4Mz8Bwlm9Mku
 devsecops_engine_tools/engine_utilities/utils/name_conversion.py,sha256=ADJrRGaxYSDe0ZRh6VHRf53H4sXPcb-vNP_i81PUn3I,307
 devsecops_engine_tools/engine_utilities/utils/printers.py,sha256=GAslbWaBpwP3mP6fBsgVl07TTBgcCggQTy8h2M9ibeo,612
 devsecops_engine_tools/engine_utilities/utils/session_manager.py,sha256=yNtlT-8Legz1sHbGPH8LNYjL-LgDUE0zXG2rYjiab7U,290
-devsecops_engine_tools-1.7.33.dist-info/METADATA,sha256=DEM9Bq8gpesoQ-IiHTaFD-MABTtAeAM77r_ufJNqUQE,7720
-devsecops_engine_tools-1.7.33.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-devsecops_engine_tools-1.7.33.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
-devsecops_engine_tools-1.7.33.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.7.33.dist-info/RECORD,,
+devsecops_engine_tools-1.7.35.dist-info/METADATA,sha256=PUNsb3dgI67eUI69PMGMgLPQfSdDjJXUCZonuh8hR4E,8614
+devsecops_engine_tools-1.7.35.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+devsecops_engine_tools-1.7.35.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
+devsecops_engine_tools-1.7.35.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.7.35.dist-info/RECORD,,

{devsecops_engine_tools-1.7.33.dist-info → devsecops_engine_tools-1.7.35.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any