devsecops-engine-tools 1.13.3__py3-none-any.whl → 1.14.1__py3-none-any.whl

devsecops_engine_tools/engine_core/src/domain/usecases/handle_risk.py

@@ -51,9 +51,7 @@ class HandleRisk:
                 "Error getting finding list in handle risk: {0}".format(str(e))
             )
 
-    def _filter_engagements(
-        self, engagements, service, endings_to_exclude, risk_config
-    ):
+    def _filter_engagements(self, engagements, service, risk_config):
         filtered_engagements = []
         min_word_length = risk_config["HANDLE_SERVICE_NAME"]["MIN_WORD_LENGTH"]
         words = [
@@ -65,21 +63,22 @@ class HandleRisk:
         ]
         check_words_regex = risk_config["HANDLE_SERVICE_NAME"]["REGEX_CHECK_WORDS"]
         min_word_amount = risk_config["HANDLE_SERVICE_NAME"]["MIN_WORD_AMOUNT"]
+        endings = risk_config["HANDLE_SERVICE_NAME"]["CHECK_ENDING"]
 
         for engagement in engagements:
-            if service.lower() in engagement.name.lower():
+            if service.lower() == engagement.name.lower():
                 filtered_engagements += [engagement.name]
             elif re.search(check_words_regex, engagement.name.lower()) and (
                 sum(1 for word in words if word.lower() in engagement.name.lower())
                 >= min_word_amount
             ):
                 filtered_engagements += [engagement.name]
-        if endings_to_exclude:
-            filtered_engagements = [
-                engagement
-                for engagement in filtered_engagements
-                if not any(engagement.endswith(ending) for ending in endings_to_exclude)
-            ]
+            elif endings:
+                if any(
+                    (service.lower() + ending.lower() == engagement.name.lower())
+                    for ending in endings
+                ):
+                    filtered_engagements += [engagement.name]
 
         return filtered_engagements
 
@@ -144,16 +143,10 @@ class HandleRisk:
         service_list = []
 
         if risk_config["HANDLE_SERVICE_NAME"]["ENABLED"].lower() == "true":
-            exclusive_endings = risk_config["HANDLE_SERVICE_NAME"]["EXCLUSIVE_ENDING"]
-            endings_to_exclude = [
-                ending
-                for ending in exclusive_endings
-                if not pipeline_name.endswith(ending)
-            ]
             service = next(
                 (
                     pipeline_name.replace(ending, "")
-                    for ending in exclusive_endings
+                    for ending in risk_config["HANDLE_SERVICE_NAME"]["CHECK_ENDING"]
                     if pipeline_name.endswith(ending)
                 ),
                 pipeline_name,
@@ -171,7 +164,7 @@ class HandleRisk:
                     service_code, dict_args, secret_tool, remote_config
                 )
                 service_list += self._filter_engagements(
-                    engagements, service, endings_to_exclude, risk_config
+                    engagements, service, risk_config
                 )
 
         service_list += [service]

devsecops_engine_tools/engine_risk/src/domain/usecases/break_build.py

@@ -244,7 +244,10 @@ class BreakBuild:
                 report.risk_score = round(
                     remote_config["WEIGHTS"]["severity"].get(report.severity.lower(), 0)
                     + remote_config["WEIGHTS"]["epss_score"] * report.epss_score
-                    + remote_config["WEIGHTS"]["age"] * report.age
+                    + min(
+                        remote_config["WEIGHTS"]["age"] * report.age,
+                        remote_config["WEIGHTS"]["max_age"],
+                    )
                     + sum(
                         remote_config["WEIGHTS"]["tags"].get(tag, 0)
                         for tag in report.tags

devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/secret_scan.py

@@ -1,3 +1,4 @@
+import re
 from devsecops_engine_tools.engine_core.src.domain.model.input_core import InputCore
 from devsecops_engine_tools.engine_sast.engine_secret.src.domain.model.DeserializeConfigTool import (
     DeserializeConfigTool,
@@ -66,18 +67,24 @@ class SecretScan:
         )
         config_tool = DeserializeConfigTool(json_data=init_config_tool, tool=tool)
         config_tool.scope_pipeline = self.devops_platform_gateway.get_variable("pipeline_name")
-        return config_tool
+
+        skip_tool = bool(re.match(config_tool.ignore_search_pattern, config_tool.scope_pipeline, re.IGNORECASE))
+        
+        return config_tool, skip_tool
         
-    def skip_from_exclusion(self, exclusions):
+    def skip_from_exclusion(self, exclusions, skip_tool_isp):
         """
         Handle skip tool.
 
         Return: bool: True -> skip tool, False -> not skip tool.
         """
-        pipeline_name = self.devops_platform_gateway.get_variable("pipeline_name")
-        if (pipeline_name in exclusions) and (
-            exclusions[pipeline_name].get("SKIP_TOOL", 0)
-        ):
+        if(skip_tool_isp):
             return True
         else:
-            return False
+            pipeline_name = self.devops_platform_gateway.get_variable("pipeline_name")
+            if (pipeline_name in exclusions) and (
+                exclusions[pipeline_name].get("SKIP_TOOL", 0)
+            ):
+                return True
+            else:
+                return False

devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/entry_points/entry_point_tool.py

@@ -9,8 +9,8 @@ def engine_secret_scan(devops_platform_gateway, tool_gateway, dict_args, tool, t
         dict_args["remote_config_repo"], "engine_sast/engine_secret/Exclusions.json"
     )
     secret_scan = SecretScan(tool_gateway, devops_platform_gateway, tool_deserealizator, git_gateway)
-    config_tool = secret_scan.complete_config_tool(dict_args, tool)
-    skip_tool = secret_scan.skip_from_exclusion(exclusions)
+    config_tool, skip_tool_isp = secret_scan.complete_config_tool(dict_args, tool)
+    skip_tool = secret_scan.skip_from_exclusion(exclusions, skip_tool_isp)
     finding_list, file_path_findings = secret_scan.process(skip_tool, config_tool, secret_tool, dict_args)
     input_core = SetInputCore(devops_platform_gateway, dict_args, tool, config_tool)
     return finding_list, input_core.set_input_core(file_path_findings)

devsecops_engine_tools/version.py

@@ -1 +1 @@
-version = '1.13.3'
+version = '1.14.1'

{devsecops_engine_tools-1.13.3.dist-info → devsecops_engine_tools-1.14.1.dist-info}/METADATA

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

{devsecops_engine_tools-1.13.3.dist-info → devsecops_engine_tools-1.14.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=K0TqUoKMyUACp24cTZtCbXIzkTCAez5eGSJvHG9llqs,19
+devsecops_engine_tools/version.py,sha256=xv2wmLelfn460ABKZW6zS5-YHtS6u54h1jksuJQyBJw,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
@@ -26,7 +26,7 @@ devsecops_engine_tools/engine_core/src/domain/model/gateway/secrets_manager_gate
 devsecops_engine_tools/engine_core/src/domain/model/gateway/vulnerability_management_gateway.py,sha256=c98JSdYYPyr82VZR4MRy49xSBVxueERbAS1mWwKqV6g,878
 devsecops_engine_tools/engine_core/src/domain/usecases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/domain/usecases/break_build.py,sha256=JP-i5SFaMN7Yi4uDCe_AE1kJ197g1IJGcwQdq-RYbk4,16198
-devsecops_engine_tools/engine_core/src/domain/usecases/handle_risk.py,sha256=nx71btr6Ma7I_TPtGNIPFDMxebYy_M1O8hENFycmaJs,8344
+devsecops_engine_tools/engine_core/src/domain/usecases/handle_risk.py,sha256=1vctNN5aSPGsSgrldPiYg2Fq86q6Z9DzFdazjWAm2Do,8133
 devsecops_engine_tools/engine_core/src/domain/usecases/handle_scan.py,sha256=yrPQdNvFNDeS4g4UxdxFDj-yw17K_OZ3T-HDEiePknE,7041
 devsecops_engine_tools/engine_core/src/domain/usecases/metrics_manager.py,sha256=Xi0iNnPrFgqd2cBdAA5E_tgouhxs-BTo016aolnGgv8,2413
 devsecops_engine_tools/engine_core/src/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -73,7 +73,7 @@ devsecops_engine_tools/engine_risk/src/domain/model/gateways/__init__.py,sha256=
 devsecops_engine_tools/engine_risk/src/domain/model/gateways/add_epss_gateway.py,sha256=cTm4QSxiaUt7ETCdXWZxKEus8pmEDA3e9k5b39SLDDE,178
 devsecops_engine_tools/engine_risk/src/domain/usecases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_risk/src/domain/usecases/add_data.py,sha256=4wqDj-q7hJfJscvrbMDcy7tONqxdxl-CSl_TWTRUGKA,402
-devsecops_engine_tools/engine_risk/src/domain/usecases/break_build.py,sha256=GFSRXp_PU4kp4Jx2Qdc0exg2j-65If5DK0UqRwIWq4w,11267
+devsecops_engine_tools/engine_risk/src/domain/usecases/break_build.py,sha256=sYcsReL3FF_9_NTEcK-sFCFHK5Hi9zJrMpD4cDLAX4w,11380
 devsecops_engine_tools/engine_risk/src/domain/usecases/get_exclusions.py,sha256=o4vMpmgt5q1BsaWpGZWdCHPVs1CFyj-P3TrgOSEBcqM,2327
 devsecops_engine_tools/engine_risk/src/domain/usecases/handle_filters.py,sha256=w18CVVSs0mkfLYo7f-wZJv1afoPWzEU-IBKUzk7LMYI,832
 devsecops_engine_tools/engine_risk/src/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -147,7 +147,7 @@ devsecops_engine_tools/engine_sast/engine_secret/src/domain/model/gateway/__init
 devsecops_engine_tools/engine_sast/engine_secret/src/domain/model/gateway/gateway_deserealizator.py,sha256=4fYPengHW3K0uVP6wHgOiNu-gRb08m78E7QZayZ2LC4,441
 devsecops_engine_tools/engine_sast/engine_secret/src/domain/model/gateway/tool_gateway.py,sha256=KncnzIAmjmnt3qNWiRY0bnEvk_L68V16xQIILsWjhUg,778
 devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/secret_scan.py,sha256=si5QB_2fB3XpigVlEZlSi1OICL0d8KFusYT3CxKFupM,3990
+devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/secret_scan.py,sha256=oo1_vnrWagU1u6W9-xA_3OrviFNgzucT2phzcWwE7zw,4249
 devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/set_input_core.py,sha256=k0LZd9PJpqEDns6DLYRGu9DzpRZeFsxAnowcjP5Rml4,2838
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -155,7 +155,7 @@ devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapt
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/trufflehog/trufflehog_deserealizator.py,sha256=MdE76XrltkegHjVnDdHWJptUNUZg_bJnsUynVG0MEKI,2565
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/trufflehog/trufflehog_run.py,sha256=r3JvkTE8injqbFcymevPw4rn-5w6dsOGxWz0NRKx4kg,7367
 devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/entry_points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/entry_points/entry_point_tool.py,sha256=TAEZ2HquyM_0ZWMh5_8-qE0OI5EMG0VfyOlypZswbLI,1019
+devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/entry_points/entry_point_tool.py,sha256=NiA5-pRL6-tMuOa2Al-wIYq3uIMFBQrJd0w7ur16kgs,1049
 devsecops_engine_tools/engine_sca/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_container/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_container/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -286,8 +286,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=yNtlT-8Legz1sHbGPH8LNYjL-LgDUE0zXG2rYjiab7U,290
 devsecops_engine_tools/engine_utilities/utils/utils.py,sha256=esLnDBxP9MQBvV8noVohTrdWSVuljTKRpZgrn2kaD_c,192
-devsecops_engine_tools-1.13.3.dist-info/METADATA,sha256=LTUr9T20OkPTGYM7m8ddBghwS0gyIcMhI1Ol8jnfEck,10854
-devsecops_engine_tools-1.13.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-devsecops_engine_tools-1.13.3.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
-devsecops_engine_tools-1.13.3.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.13.3.dist-info/RECORD,,
+devsecops_engine_tools-1.14.1.dist-info/METADATA,sha256=dFexub6hqzGqPL3h5tGnPpGj14w0D3WJZi034J0tZrE,10854
+devsecops_engine_tools-1.14.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+devsecops_engine_tools-1.14.1.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
+devsecops_engine_tools-1.14.1.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.14.1.dist-info/RECORD,,