devsecops-engine-tools 1.16.0__py3-none-any.whl → 1.17.0__py3-none-any.whl

devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py

@@ -191,8 +191,8 @@ def application_core():
             "github": GithubActions(),
             "local": RuntimeLocal(),
         }.get(args["platform_devops"])
-        printer_table_gateway = PrinterPrettyTable()
         metrics_manager_gateway = S3Manager()
+        printer_table_gateway = PrinterPrettyTable()
 
         init_engine_core(
             vulnerability_management_gateway,

devsecops_engine_tools/engine_core/src/domain/model/exclusions.py

@@ -12,3 +12,7 @@ class Exclusions:
         self.severity = kwargs.get("severity", "")
         self.hu = kwargs.get("hu", "")
         self.reason = kwargs.get("reason", "Risk Accepted")
+        self.vm_id = kwargs.get("vm_id", "")
+        self.vm_id_url = kwargs.get("vm_id_url", "")
+        self.service = kwargs.get("service", "")
+        self.tags = kwargs.get("tags", [])

devsecops_engine_tools/engine_core/src/domain/model/report.py

@@ -4,6 +4,8 @@ from dataclasses import dataclass
 @dataclass
 class Report:
     def __init__(self, **kwargs):
+        self.vm_id = kwargs.get("vm_id", "")
+        self.vm_id_url = kwargs.get("vm_id_url", "")
         self.id = kwargs.get("id", [])
         self.vuln_id_from_tool = kwargs.get("vuln_id_from_tool", "")
         self.where = kwargs.get("where", "")

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

@@ -51,7 +51,7 @@ class HandleRisk:
                 "Error getting finding list in handle risk: {0}".format(str(e))
             )
 
-    def _filter_engagements(self, engagements, service, risk_config):
+    def _filter_engagements(self, engagements, service, initial_services, risk_config):
         filtered_engagements = []
         min_word_length = risk_config["HANDLE_SERVICE_NAME"]["MIN_WORD_LENGTH"]
         words = [
@@ -65,20 +65,22 @@ class HandleRisk:
         min_word_amount = risk_config["HANDLE_SERVICE_NAME"]["MIN_WORD_AMOUNT"]
         endings = risk_config["HANDLE_SERVICE_NAME"]["CHECK_ENDING"]
 
+        initial_services_lower = [service.lower() for service in initial_services]
+
         for engagement in engagements:
-            if service.lower() == engagement.name.lower():
-                filtered_engagements += [engagement.name]
+            if engagement.name.lower() in initial_services_lower:
+                filtered_engagements += [engagement]
             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]
+                filtered_engagements += [engagement]
             elif endings:
                 if any(
                     (service.lower() + ending.lower() == engagement.name.lower())
                     for ending in endings
                 ):
-                    filtered_engagements += [engagement.name]
+                    filtered_engagements += [engagement]
 
         return filtered_engagements
 
@@ -94,15 +96,28 @@ class HandleRisk:
             services_to_exclude = set(
                 risk_exclusions[pipeline_name]["SKIP_SERVICE"].get("services", [])
             )
-            service_set = set(service_list)
-
-            remaining_services = list(service_set - services_to_exclude)
-            service_excluded = list(service_set & services_to_exclude)
 
-            print(f"Services to exclude: {service_excluded}")
-            logger.info(f"Services to exclude: {service_excluded}")
+            remaining_engagements = [
+                engagement
+                for engagement in service_list
+                if engagement.name.lower()
+                not in [service.lower() for service in services_to_exclude]
+            ]
+            excluded_engagements = [
+                engagement
+                for engagement in service_list
+                if engagement.name.lower()
+                in [service.lower() for service in services_to_exclude]
+            ]
+
+            print(
+                f"Services to exclude: {[engagement.name for engagement in excluded_engagements]}"
+            )
+            logger.info(
+                f"Services to exclude: {[engagement.name for engagement in excluded_engagements]}"
+            )
 
-            return remaining_services
+            return remaining_engagements
         return service_list
 
     def _should_skip_analysis(self, remote_config, pipeline_name, exclusions):
@@ -141,6 +156,15 @@ class HandleRisk:
 
         service = pipeline_name
         service_list = []
+        initial_services = []
+        initial_services += [service]
+
+        match_parent = re.match(
+            risk_config["PARENT_ANALYSIS"]["REGEX_GET_PARENT"], service
+        )
+        if risk_config["PARENT_ANALYSIS"]["ENABLED"].lower() == "true" and match_parent:
+            parent_service = match_parent.group(0)
+            initial_services += [parent_service]
 
         if risk_config["HANDLE_SERVICE_NAME"]["ENABLED"].lower() == "true":
             service = next(
@@ -156,7 +180,7 @@ class HandleRisk:
             )
             if match_service_code:
                 service_code = match_service_code.group(0)
-                service_list += [
+                initial_services += [
                     service.format(service_code=service_code)
                     for service in risk_config["HANDLE_SERVICE_NAME"]["ADD_SERVICES"]
                 ]
@@ -164,31 +188,33 @@ class HandleRisk:
                     service_code, dict_args, secret_tool, remote_config
                 )
                 service_list += self._filter_engagements(
-                    engagements, service, risk_config
+                    engagements, service, initial_services, risk_config
                 )
+        else:
+            for service in initial_services:
+                engagements = self.vulnerability_management.get_active_engagements(
+                    service, dict_args, secret_tool, remote_config
+                )
+                for engagement in engagements:
+                    if engagement.name.lower() == service.lower():
+                        service_list += [engagement]
+                        break
 
-        service_list += [service]
-
-        match_parent = re.match(
-            risk_config["PARENT_ANALYSIS"]["REGEX_GET_PARENT"], service
-        )
-        if risk_config["PARENT_ANALYSIS"]["ENABLED"].lower() == "true" and match_parent:
-            parent_service = match_parent.group(0)
-            service_list += [parent_service]
-
-        service_list = list(set(service_list))
         new_service_list = self._exclude_services(
             dict_args, pipeline_name, service_list
         )
 
-        print(f"Services to analyze: {new_service_list}")
-        logger.info(f"Services to analyze: {new_service_list}")
+        for engagement in new_service_list:
+            print(f"Service to analyze: {engagement.name}, URL: {engagement.vm_url}")
+            logger.info(
+                f"Service to analyze: {engagement.name}, URL: {engagement.vm_url}"
+            )
 
         findings = []
         exclusions = []
         for service in new_service_list:
             findings_list, exclusions_list = self._get_all_from_vm(
-                dict_args, secret_tool, remote_config, service
+                dict_args, secret_tool, remote_config, service.name
             )
             findings += findings_list
             exclusions += exclusions_list
@@ -197,7 +223,7 @@ class HandleRisk:
             dict_args,
             findings,
             exclusions,
-            new_service_list,
+            [service.name for service in new_service_list],
             self.devops_platform_gateway,
             self.print_table_gateway,
         )

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

@@ -263,6 +263,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             max_retries = config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"][
                 "MAX_RETRIES_QUERY"
             ]
+            host_dd = config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["HOST_DEFECT_DOJO"]
 
             findings = self._get_findings(
                 self._get_session_manager(dict_args, secret_tool, config_tool),
@@ -273,13 +274,13 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
 
             all_findings = list(
                 map(
-                    partial(self._create_report),
+                    partial(self._create_report, host_dd=host_dd),
                     findings,
                 )
             )
 
             all_exclusions = self._get_report_exclusions(
-                all_findings, self._format_date_to_dd_format
+                all_findings, self._format_date_to_dd_format, host_dd=host_dd
             )
 
             return all_findings, all_exclusions
@@ -310,7 +311,14 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                 "active": "true",
             }
 
-            return Engagement.get_engagements(request_is, request_active).results
+            engagements = Engagement.get_engagements(request_is, request_active).results
+
+            host_dd = config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["HOST_DEFECT_DOJO"]
+
+            for engagement in engagements:
+                engagement.vm_url = f"{host_dd}/engagement/{engagement.id}/finding/open"
+
+            return engagements
 
         except Exception as ex:
             raise ExceptionGettingEngagements(
@@ -326,25 +334,25 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["HOST_DEFECT_DOJO"],
         )
 
-    def _get_report_exclusions(self, total_findings, date_fn):
+    def _get_report_exclusions(self, total_findings, date_fn, host_dd):
         exclusions = []
         for finding in total_findings:
             if finding.risk_accepted:
                 exclusions.append(
-                    self._create_exclusion(
-                        finding, date_fn, "engine_risk", "Risk Accepted"
+                    self._create_report_exclusion(
+                        finding, date_fn, "engine_risk", "Risk Accepted", host_dd
                     )
                 )
             elif finding.false_p:
                 exclusions.append(
-                    self._create_exclusion(
-                        finding, date_fn, "engine_risk", "False Positive"
+                    self._create_report_exclusion(
+                        finding, date_fn, "engine_risk", "False Positive", host_dd
                     )
                 )
             elif finding.risk_status == "Transfer Accepted":
                 exclusions.append(
-                    self._create_exclusion(
-                        finding, date_fn, "engine_risk", "Transferred Finding"
+                    self._create_report_exclusion(
+                        finding, date_fn, "engine_risk", "Transferred Finding", host_dd
                     )
                 )
         return exclusions
@@ -381,7 +389,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
                     logger.error("Maximum number of retries reached, aborting.")
                     raise e
 
-    def _create_exclusion(self, finding, date_fn, tool, reason):
+    def _date_reason_based(self, finding, date_fn, reason):
         if reason == "False Positive":
             create_date = date_fn(finding.last_status_update)
             expired_date = date_fn(None)
@@ -393,6 +401,24 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             create_date = date_fn(last_accepted_risk["created"])
             expired_date = date_fn(last_accepted_risk["expiration_date"])
 
+        return create_date, expired_date
+
+
+    def _create_exclusion(self, finding, date_fn, tool, reason):
+        create_date, expired_date = self._date_reason_based(finding, date_fn, reason)
+
+        return Exclusions(
+            id=finding.vuln_id_from_tool,
+            where=self._get_where(finding, tool),
+            create_date=create_date,
+            expired_date=expired_date,
+            severity=finding.severity,
+            reason=reason,
+        )
+    
+    def _create_report_exclusion(self, finding, date_fn, tool, reason, host_dd):
+        create_date, expired_date = self._date_reason_based(finding, date_fn, reason)
+
         return Exclusions(
             id=finding.vuln_id_from_tool,
             where=self._get_where(finding, tool),
@@ -400,10 +426,16 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             expired_date=expired_date,
             severity=finding.severity,
             reason=reason,
+            vm_id=str(finding.vm_id),
+            vm_id_url=f"{host_dd}/finding/{finding.vm_id}",
+            service=finding.service,
+            tags=finding.tags,
         )
 
-    def _create_report(self, finding):
+    def _create_report(self, finding, host_dd):
         return Report(
+            vm_id=str(finding.id),
+            vm_id_url=f"{host_dd}/finding/{finding.id}",
             id=finding.vulnerability_ids,
             vuln_id_from_tool=finding.vuln_id_from_tool,
             status=finding.display_status,
@@ -449,5 +481,6 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
         elif tool == "engine_risk":
             for tag in finding.tags:
                 return self._get_where(finding, tag)
+            return finding.file_path
         else:
             return finding.file_path

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

@@ -10,7 +10,7 @@ from devsecops_engine_tools.engine_core.src.domain.model.report import (
     Report,
 )
 from devsecops_engine_tools.engine_core.src.infrastructure.helpers.util import (
-    format_date
+    format_date,
 )
 from prettytable import PrettyTable, DOUBLE_BORDER
 
@@ -63,24 +63,20 @@ class PrinterPrettyTable(PrinterTableGateway):
             print(sorted_table)
 
     def print_table_report(self, report_list: "list[Report]"):
-        headers = ["Risk Score", "Severity", "ID", "Tags", "Where", "Service"]
+        headers = ["Risk Score", "VM ID", "Services", "Tags"]
         table = PrettyTable(headers)
         for report in report_list:
             row_data = [
                 report.risk_score,
-                report.severity.lower(),
-                report.vuln_id_from_tool if report.vuln_id_from_tool else report.id,
-                report.tags,
-                report.where,
-                report.service
+                self._check_spaces(report.vm_id),
+                self._check_spaces(report.service),
+                ", ".join(report.tags),
             ]
             table.add_row(row_data)
 
         sorted_table = PrettyTable()
         sorted_table.field_names = table.field_names
-        sorted_table.add_rows(
-            sorted(table._rows, key=lambda row: row[0], reverse=True)
-        )
+        sorted_table.add_rows(sorted(table._rows, key=lambda row: row[0], reverse=True))
 
         for column in table.field_names:
             sorted_table.align[column] = "l"
@@ -90,9 +86,52 @@ class PrinterPrettyTable(PrinterTableGateway):
         if len(sorted_table.rows) > 0:
             print(sorted_table)
 
+    def print_table_report_exlusions(self, exclusions):
+        if exclusions:
+            headers = [
+                "VM ID",
+                "Tags",
+                "Services",
+                "Created Date",
+                "Expired Date",
+                "Reason",
+            ]
+
+        table = PrettyTable(headers)
+
+        for exclusion in exclusions:
+            row_data = [
+                self._check_spaces(exclusion["vm_id"]),
+                ", ".join(exclusion["tags"]),
+                self._check_spaces(exclusion["service"]),
+                format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
+                (
+                    format_date(exclusion["expired_date"], "%d%m%Y", "%d/%m/%Y")
+                    if exclusion["expired_date"]
+                    and exclusion["expired_date"] != "undefined"
+                    else "NA"
+                ),
+                exclusion["reason"],
+            ]
+            table.add_row(row_data)
+
+        for column in table.field_names:
+            table.align[column] = "l"
+
+        table.set_style(DOUBLE_BORDER)
+        if len(table.rows) > 0:
+            print(table)
+
     def print_table_exclusions(self, exclusions):
-        if (exclusions):
-            headers = ["Severity", "ID", "Where", "Create Date", "Expired Date", "Reason"]
+        if exclusions:
+            headers = [
+                "Severity",
+                "ID",
+                "Where",
+                "Create Date",
+                "Expired Date",
+                "Reason",
+            ]
 
         table = PrettyTable(headers)
 
@@ -102,7 +141,12 @@ class PrinterPrettyTable(PrinterTableGateway):
                 exclusion["id"],
                 exclusion["where"],
                 format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
-                format_date(exclusion["expired_date"], "%d%m%Y", "%d/%m/%Y") if exclusion["expired_date"] and exclusion["expired_date"] != "undefined" else "NA",
+                (
+                    format_date(exclusion["expired_date"], "%d%m%Y", "%d/%m/%Y")
+                    if exclusion["expired_date"]
+                    and exclusion["expired_date"] != "undefined"
+                    else "NA"
+                ),
                 exclusion["reason"],
             ]
             table.add_row(row_data)
@@ -113,3 +157,12 @@ class PrinterPrettyTable(PrinterTableGateway):
         table.set_style(DOUBLE_BORDER)
         if len(table.rows) > 0:
             print(table)
+
+    def _check_spaces(self, value):
+        values = value.split()
+        new_value = ""
+        if len(values) > 1:
+            new_value = "\n".join(values)
+        else:
+            new_value = f"{values[0]}"
+        return new_value

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

@@ -0,0 +1,86 @@
+from dataclasses import dataclass
+
+from devsecops_engine_tools.engine_core.src.domain.model.gateway.printer_table_gateway import (
+    PrinterTableGateway,
+)
+from devsecops_engine_tools.engine_core.src.domain.model.finding import (
+    Finding,
+)
+from devsecops_engine_tools.engine_core.src.domain.model.report import (
+    Report,
+)
+from devsecops_engine_tools.engine_core.src.infrastructure.helpers.util import (
+    format_date,
+)
+from rich.console import Console
+from rich.table import Table
+from rich import box
+
+
+@dataclass
+class PrinterRichTable(PrinterTableGateway):
+    def print_table_findings(self, finding_list: "list[Finding]"):
+        # To implement
+        return
+
+    def print_table_report(self, report_list: "list[Report]"):
+        sorted_report_list = sorted(
+            report_list, key=lambda report: report.risk_score, reverse=True
+        )
+        headers = ["Risk Score", "ID", "Tags", "Services"]
+        table = Table(
+            show_header=True, header_style="bold magenta", box=box.DOUBLE_EDGE
+        )
+        for header in headers:
+            table.add_column(header)
+        for report in sorted_report_list:
+            row_data = [
+                str(report.risk_score),
+                self._check_spaces(report.vm_id, report.vm_id_url),
+                ", ".join(report.tags),
+                report.service,
+            ]
+            table.add_row(*row_data)
+        console = Console()
+        console.print(table)
+
+    def print_table_exclusions(self, exclusions_list):
+        headers = []
+        if exclusions_list:
+            headers = ["ID", "Tags", "Service", "Create Date", "Expired Date", "Reason"]
+        table = Table(
+            show_header=True, header_style="bold magenta", box=box.DOUBLE_EDGE
+        )
+        for header in headers:
+            table.add_column(header)
+        for exclusion in exclusions_list:
+            row_data = [
+                self._check_spaces(exclusion["vm_id"], exclusion["vm_id_url"]),
+                ", ".join(exclusion["tags"]),
+                exclusion["service"],
+                format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
+                (
+                    format_date(exclusion["expired_date"], "%d%m%Y", "%d/%m/%Y")
+                    if exclusion["expired_date"]
+                    and exclusion["expired_date"] != "undefined"
+                    else "NA"
+                ),
+                exclusion["reason"],
+            ]
+            table.add_row(*row_data)
+        console = Console()
+        console.print(table)
+
+    def _check_spaces(self, value, url):
+        values = value.split()
+        urls = url.split()
+        new_value = ""
+        if len(values) > 1 or len(urls) > 1:
+            for value, url in zip(values, urls):
+                new_value += self._make_hyperlink(value, url) + " "
+        else:
+            new_value = self._make_hyperlink(values[0], urls[0])
+        return new_value
+
+    def _make_hyperlink(self, value, url):
+        return f"[link={url}]{value}[/link]"

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

@@ -130,14 +130,14 @@ class BreakBuild:
             print(
                 self.devops_platform_gateway.message(
                     "succeeded",
-                    f"Remediation Rate {remediation_rate_value}% is greater than {risk_threshold}%",
+                    f"Remediation rate {remediation_rate_value}% is greater than {risk_threshold}%",
                 )
             )
         elif remediation_rate_value >= risk_threshold:
             print(
                 self.devops_platform_gateway.message(
                     "warning",
-                    f"Remediation Rate {remediation_rate_value}% is close to {risk_threshold}%",
+                    f"Remediation rate {remediation_rate_value}% is close to {risk_threshold}%",
                 )
             )
             self.warning_build = True
@@ -145,7 +145,7 @@ class BreakBuild:
             print(
                 self.devops_platform_gateway.message(
                     "error",
-                    f"Remediation Rate {remediation_rate_value}% is less than {risk_threshold}%",
+                    f"Remediation rate {remediation_rate_value}% is less than {risk_threshold}%",
                 )
             )
             self.break_build = True
@@ -162,6 +162,10 @@ class BreakBuild:
                 "create_date": exclusion.create_date,
                 "expired_date": exclusion.expired_date,
                 "reason": exclusion.reason,
+                "vm_id": exclusion.vm_id,
+                "vm_id_url": exclusion.vm_id_url,
+                "service": exclusion.service,
+                "tags": exclusion.tags,
             }
             for exclusion in exclusions
         ]
@@ -179,9 +183,15 @@ class BreakBuild:
                         and report.vuln_id_from_tool == exclusion.id
                     )
                     or (report.id and report.id == exclusion.id)
+                    or (report.vm_id and exclusion.id in report.vm_id)
                 ) and ((exclusion.where in report.where) or (exclusion.where == "all")):
                     exclude = True
-                    applied_exclusions.append(exclusion)
+                    exclusion_copy = copy.deepcopy(exclusion)
+                    exclusion_copy.vm_id = report.vm_id
+                    exclusion_copy.vm_id_url = report.vm_id_url
+                    exclusion_copy.service = report.service
+                    exclusion_copy.tags = report.tags
+                    applied_exclusions.append(exclusion_copy)
                     break
             if not exclude:
                 report.reason = "Remediation Rate"
@@ -214,7 +224,7 @@ class BreakBuild:
                 print(
                     self.devops_platform_gateway.message(
                         "error",
-                        f"Report {report.vuln_id_from_tool if report.vuln_id_from_tool else report.id} with tag {tag} is blacklisted and age {report.age} is above threshold {tag_age_threshold}",
+                        f"Report {report.vm_id} with tag {tag} is blacklisted and age {report.age} is above threshold {tag_age_threshold}",
                     )
                 )
 
@@ -222,7 +232,7 @@ class BreakBuild:
                 print(
                     self.devops_platform_gateway.message(
                         "warning",
-                        f"Report {report.vuln_id_from_tool if report.vuln_id_from_tool else report.id} with tag {tag} is blacklisted but age {report.age} is below threshold {tag_age_threshold}",
+                        f"Report {report.vm_id} with tag {tag} is blacklisted but age {report.age} is below threshold {tag_age_threshold}",
                     )
                 )
 
@@ -258,9 +268,7 @@ class BreakBuild:
                     break_build = True
                     report.reason = "Risk Score"
                     self.report_breaker.append(copy.deepcopy(report))
-            print(
-                "Below are open vulnerabilities from Vulnerability Management Platform"
-            )
+            print("Below are open findings from Vulnerability Management Platform")
             self.printer_table_gateway.print_table_report(
                 report_list,
             )
@@ -284,7 +292,8 @@ class BreakBuild:
         else:
             print(
                 self.devops_platform_gateway.message(
-                    "succeeded", "There are no vulnerabilities"
+                    "succeeded",
+                    "There are no open findings from Vulnerability Management Platform",
                 )
             )
 
@@ -295,7 +304,7 @@ class BreakBuild:
                     "warning", "Bellow are all findings that were excepted"
                 )
             )
-            self.printer_table_gateway.print_table_exclusions(applied_exclusions)
+            self.printer_table_gateway.print_table_report_exlusions(applied_exclusions)
             for reason, total in Counter(
                 map(lambda x: x["reason"], applied_exclusions)
             ).items():

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

@@ -1,9 +1,72 @@
+import copy
+
+
 class HandleFilters:
     def filter(self, findings):
         active_findings = self._get_active_findings(findings)
         self._get_priority_vulnerability(active_findings)
         return active_findings
 
+    def filter_duplicated(self, findings):
+        unique_findings = []
+        findings_map = {}
+
+        for finding in findings:
+            key = (finding.where, tuple(finding.id), finding.vuln_id_from_tool)
+            if key in findings_map:
+                existing_finding = findings_map[key]
+                combined_services = existing_finding.service.split() + [
+                    s
+                    for s in finding.service.split()
+                    if s not in existing_finding.service.split()
+                ]
+                combined_vm_ids = existing_finding.vm_id.split() + [
+                    vm
+                    for vm in finding.vm_id.split()
+                    if vm not in existing_finding.vm_id.split()
+                ]
+                combined_vm_id_urls = existing_finding.vm_id_url.split() + [
+                    vm_url
+                    for vm_url in finding.vm_id_url.split()
+                    if vm_url not in existing_finding.vm_id_url.split()
+                ]
+                if finding.age >= existing_finding.age:
+                    new_finding = copy.deepcopy(finding)
+                    new_finding.service = " ".join(combined_services)
+                    new_finding.vm_id = " ".join(combined_vm_ids)
+                    new_finding.vm_id_url = " ".join(combined_vm_id_urls)
+                    findings_map[key] = new_finding
+                else:
+                    existing_finding.service = " ".join(combined_services)
+                    new_finding.vm_id = " ".join(combined_vm_ids)
+                    new_finding.vm_id_url = " ".join(combined_vm_id_urls)
+            else:
+                findings_map[key] = copy.deepcopy(finding)
+
+        unique_findings = list(findings_map.values())
+        return unique_findings
+
+    def filter_tags_days(self, devops_platform_gateway, remote_config, findings):
+        tag_exclusion_days = remote_config["TAG_EXCLUSION_DAYS"]
+        filtered_findings = []
+
+        for finding in findings:
+            exclude = False
+            for tag in finding.tags:
+                if tag in tag_exclusion_days and finding.age < tag_exclusion_days[tag]:
+                    exclude = True
+                    print(
+                        devops_platform_gateway.message(
+                            "warning",
+                            f"Report {finding.vm_id} with tag '{tag}' and age {finding.age} days is being excluded. It will be considered in {tag_exclusion_days[tag] - finding.age} days.",
+                        )
+                    )
+                    break
+            if not exclude:
+                filtered_findings.append(finding)
+
+        return filtered_findings
+
     def _get_active_findings(self, findings):
         return list(
             filter(

devsecops_engine_tools/engine_risk/src/infrastructure/entry_points/entry_point_risk.py

@@ -12,8 +12,6 @@ from devsecops_engine_tools.engine_risk.src.domain.usecases.get_exclusions impor
 )
 
 
-import re
-
 from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
 from devsecops_engine_tools.engine_utilities import settings
 
@@ -36,30 +34,6 @@ def init_engine_risk(
         dict_args["remote_config_repo"], "engine_risk/Exclusions.json"
     )
 
-    return process_findings(
-        findings,
-        vm_exclusions,
-        dict_args,
-        services,
-        risk_exclusions,
-        remote_config,
-        add_epss_gateway,
-        devops_platform_gateway,
-        print_table_gateway,
-    )
-
-
-def process_findings(
-    findings,
-    vm_exclusions,
-    dict_args,
-    services,
-    risk_exclusions,
-    remote_config,
-    add_epss_gateway,
-    devops_platform_gateway,
-    print_table_gateway,
-):
     if not findings:
         print("No findings found in Vulnerability Management Platform")
         logger.info("No findings found in Vulnerability Management Platform")
@@ -67,33 +41,16 @@ def process_findings(
 
     handle_filters = HandleFilters()
 
-    return process_active_findings(
-        handle_filters.filter(findings),
-        findings,
-        vm_exclusions,
-        devops_platform_gateway,
-        dict_args,
-        remote_config,
-        risk_exclusions,
-        services,
-        add_epss_gateway,
-        print_table_gateway,
+    active_findings = handle_filters.filter(findings)
+
+    unique_findings = handle_filters.filter_duplicated(active_findings)
+
+    filtered_findings = handle_filters.filter_tags_days(
+        devops_platform_gateway, remote_config, unique_findings
     )
 
+    data_added = AddData(add_epss_gateway, filtered_findings).process()
 
-def process_active_findings(
-    active_findings,
-    total_findings,
-    vm_exclusions,
-    devops_platform_gateway,
-    dict_args,
-    remote_config,
-    risk_exclusions,
-    services,
-    add_epss_gateway,
-    print_table_gateway,
-):
-    data_added = AddData(add_epss_gateway, active_findings).process()
     get_exclusions = GetExclusions(
         devops_platform_gateway,
         dict_args,
@@ -103,6 +60,7 @@ def process_active_findings(
         services,
     )
     exclusions = get_exclusions.process()
+
     break_build = BreakBuild(
         devops_platform_gateway,
         print_table_gateway,
@@ -110,7 +68,7 @@ def process_active_findings(
         exclusions,
         vm_exclusions,
         data_added,
-        total_findings,
+        findings,
     )
 
     return break_build.process()

devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/engagement.py

@@ -41,6 +41,7 @@ class Engagement(FromDictMixin):
     build_server: str = ""
     source_code_management_server: str = ""
     orchestration_engine: str = ""
+    vm_url: str = ""
     notes = []
     files = []
     risk_acceptance = []

devsecops_engine_tools/version.py

@@ -1 +1 @@
-version = '1.16.0'
+version = '1.17.0'

{devsecops_engine_tools-1.16.0.dist-info → devsecops_engine_tools-1.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.16.0
+Version: 1.17.0
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -25,6 +25,7 @@ Requires-Dist: distro==1.9.0
 Requires-Dist: boto3==1.34.157
 Requires-Dist: docker==7.1.0
 Requires-Dist: setuptools==72.1.0
+Requires-Dist: rich==13.9.4
 
 # DevSecOps Engine Tools
 

{devsecops_engine_tools-1.16.0.dist-info → devsecops_engine_tools-1.17.0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=tT_8ISLXFdCq-Rgso5Q9lk3Q5eDlHoUO7dbUcqFExA0,19
+devsecops_engine_tools/version.py,sha256=MzQoSPABd45fuiVSL0Hxyz3S5B7-9HeNc1g4a1oKlOY,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
-devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py,sha256=9QaRFl_QYXSLxK_Qo5B84Jyeq7iZP9WeLc2ioSdkLOc,7209
+devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py,sha256=3IvzG7IfQFs8gxsv4Xo5722hV3jG6g0g4JWFq74i2iM,7209
 devsecops_engine_tools/engine_core/src/deployment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/deployment/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/domain/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/domain/model/customs_exceptions.py,sha256=YLeOj4O7kNsUx8RD6pwBQdFLYbkm7Eh-F-ohZ3jFGbs,599
-devsecops_engine_tools/engine_core/src/domain/model/exclusions.py,sha256=rFinY7wQsIu4nNPdT9WlvzB-1S1tS3J3oQgb8tDxbZk,499
+devsecops_engine_tools/engine_core/src/domain/model/exclusions.py,sha256=W9DXUWI7rGJWRHEulnUY5ybdJK2wknG4zY7CbTtSyfc,689
 devsecops_engine_tools/engine_core/src/domain/model/finding.py,sha256=MntDksQuPt1L-1Ww3nK7NbMLfVwRjxPGCN_oHYXbbWk,383
 devsecops_engine_tools/engine_core/src/domain/model/input_core.py,sha256=hc1WMzCwsGxnrlvvk84S5iNYJRDQWbaQP9MwR3N7tVM,422
 devsecops_engine_tools/engine_core/src/domain/model/level_compliance.py,sha256=ntn_UWqHc6sT5g_LozBdjdewTQxFsp7Kt8M0xqw-k_o,98
 devsecops_engine_tools/engine_core/src/domain/model/level_vulnerability.py,sha256=0sySEnFNkS2Y8uF5GUVAYehXw-i2OglUClkVobnSTPc,257
-devsecops_engine_tools/engine_core/src/domain/model/report.py,sha256=Lsp7CuAdhW8kJkbP6VyHJmFb5rPhxY_u_mEOLHzbD8Y,1772
+devsecops_engine_tools/engine_core/src/domain/model/report.py,sha256=6ByyjXmUbowWbZIkn3qfL-QyhkyCDzdTCdRj-I7wTXA,1870
 devsecops_engine_tools/engine_core/src/domain/model/threshold.py,sha256=TCBECuvoC3-9g8vg3iKWGIixssNecP0iUaZ9Qzv0n7w,596
 devsecops_engine_tools/engine_core/src/domain/model/vulnerability_management.py,sha256=5RcMHpeqznrTOpkjLuqekA_Bqf2Qr-w6OZ5Eoi3b-bs,465
 devsecops_engine_tools/engine_core/src/domain/model/gateway/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,7 +25,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=dT2YDlWJ4Zvny_5uCTtxBojw4i77UOgGbs8p2jlRo74,1137
 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=0JK4U5LGxzrLVZOw68j1PMxmLTDPru7Kts_-RtAG0jA,15965
-devsecops_engine_tools/engine_core/src/domain/usecases/handle_risk.py,sha256=1vctNN5aSPGsSgrldPiYg2Fq86q6Z9DzFdazjWAm2Do,8133
+devsecops_engine_tools/engine_core/src/domain/usecases/handle_risk.py,sha256=9Qhh1n8rUCYugEMJ72Mlk3R9SH_wYEbLdGlA6NetBrQ,9269
 devsecops_engine_tools/engine_core/src/domain/usecases/handle_scan.py,sha256=Li0NDwHwj_g2iM4tKF3wyKqXWYXspTThzKxkSma3S6E,8912
 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
@@ -36,11 +36,13 @@ 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=blI4ZrquRE4y6DJ7N2YRx1nL0wrAXvdpx0fLSUf5qwA,4831
 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=XKM107OQZ75sb1oeOqJKintyRAR9q8k1fkoe2sm7nBo,18190
+devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/defect_dojo/defect_dojo.py,sha256=A_xCCj7Gs5-LAJY8bs1p_nViTI_sdtegmO3_cdPjh-Q,19580
 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=pxlgjhX4-Dssn-XHKK8AdCOj6Ry6VcQtoDf5q8CxTks,3731
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/printer_pretty_table/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/printer_pretty_table/printer_pretty_table.py,sha256=oEhsYOS5dmTtNOzpWNurWgLxth6vBhWVvVlKul9Heys,3884
+devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/printer_pretty_table/printer_pretty_table.py,sha256=P0oavy_3AMbuRx5kPPiM2_LopVXqHK4Hz4Lb2UNfr-4,5369
+devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/printer_rich_table/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/printer_rich_table/printer_rich_table.py,sha256=LPr3xSv0I7ENEdu1xj8ve5PXzpUohs7hbQvHjDSaUuE,3028
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/runtime_local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/runtime_local/runtime_local.py,sha256=qKINENZGbfV8XFF7fzUK6grQ5Jx7Nwv9xOqjjKlXp3o,2475
 devsecops_engine_tools/engine_core/src/infrastructure/entry_points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -72,15 +74,15 @@ 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=sYcsReL3FF_9_NTEcK-sFCFHK5Hi9zJrMpD4cDLAX4w,11380
+devsecops_engine_tools/engine_risk/src/domain/usecases/break_build.py,sha256=TSZTXR8raKA1906dFl-Cv3J711iGUcBQmx82Jw6mF_M,11847
 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/domain/usecases/handle_filters.py,sha256=1yJKPzh64gu67g_pLyr7V8Ahzs3KK8tncigPzKWMX7Q,3533
 devsecops_engine_tools/engine_risk/src/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_risk/src/infrastructure/driven_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_risk/src/infrastructure/driven_adapters/first_csv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_risk/src/infrastructure/driven_adapters/first_csv/first_epss_csv.py,sha256=pWaRmIwVyiB5mlmWySHIx-DUgN9vtKQc-MqyRNVlTJo,2150
 devsecops_engine_tools/engine_risk/src/infrastructure/entry_points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_risk/src/infrastructure/entry_points/entry_point_risk.py,sha256=URwX6I8Rihhy8x-bUR1XsZ_S3jZT61WdIkGMjPJN0ZA,2820
+devsecops_engine_tools/engine_risk/src/infrastructure/entry_points/entry_point_risk.py,sha256=DQe1yUd5p83zecH53jKrsnS-JV2ZaN7YvdtQLwzEx0A,2073
 devsecops_engine_tools/engine_risk/src/infrastructure/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/engine_code/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -231,7 +233,7 @@ devsecops_engine_tools/engine_utilities/defect_dojo/applications/product.py,sha2
 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
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/cmdb.py,sha256=7EAzKzBJaDqP4Q57cyu_nCpl9WqcTZFjXydkYCh8h-k,320
-devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/engagement.py,sha256=x0mkWoLv8rRHZTh7hhI1aZb2g9XFJ-Gz_gC-f-rZdWM,1372
+devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/engagement.py,sha256=MXb7c526tz0zSDS8xGPC5IjTMF9g9qtzcEKLyfcY89c,1393
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/finding.py,sha256=0Xj7BOlC30LCdBjIkviB2QmmdSj0GlDvT1-TbnaT8nE,3201
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/product.py,sha256=KL5ue6icA8HH1xKkmAJzElAat3OOYU3_lt3xuNfo7Mc,1272
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/models/product_list.py,sha256=yFo8eYOGJiJMkU5pGpW0r1o5uVaNP5iA80-5w_MyWxU,664
@@ -305,8 +307,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=r_mng-OVWeqQyy6yIFsCeJrvH81VUPI3o1zdJO0JS0I,397
-devsecops_engine_tools-1.16.0.dist-info/METADATA,sha256=YXRISLfqURRXsKhLnN19CzANuAERAVKU_tNuUoCBoF4,10867
-devsecops_engine_tools-1.16.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-devsecops_engine_tools-1.16.0.dist-info/entry_points.txt,sha256=MHCTFFs9bdNKo6YcWCcBW2_8X6yTisgLOlmVx-V8Rxc,276
-devsecops_engine_tools-1.16.0.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.16.0.dist-info/RECORD,,
+devsecops_engine_tools-1.17.0.dist-info/METADATA,sha256=f-E-4AUfAQIKU1HUjIVKBd_d5X4IcETjUTl1BFIOlKA,10895
+devsecops_engine_tools-1.17.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+devsecops_engine_tools-1.17.0.dist-info/entry_points.txt,sha256=MHCTFFs9bdNKo6YcWCcBW2_8X6yTisgLOlmVx-V8Rxc,276
+devsecops_engine_tools-1.17.0.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.17.0.dist-info/RECORD,,