devsecops-engine-tools 1.15.0__tar.gz → 1.17.0__tar.gz

{devsecops_engine_tools-1.15.0 → devsecops_engine_tools-1.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.15.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
 
@@ -67,7 +68,7 @@ pip3 install devsecops-engine-tools
 ### Scan running - flags (CLI)
 
 ```bash
-devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --tool ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container", "engine_risk", "engine_code"] --folder_path ["Folder path scan engine_iac, engine_code and engine_dependencies"] --platform ["k8s","cloudformation","docker", "openapi"] --use_secrets_manager ["false", "true"] --use_vulnerability_management ["false", "true"] --send_metrics ["false", "true"] --token_cmdb ["token_cmdb"] --token_vulnerability_management ["token_vulnerability_management"] --token_engine_container ["token_engine_container"] --token_engine_dependencies ["token_engine_dependencies"] --token_external_checks ["token_external_checks"] --xray_mode ["scan", "audit"] --image_to_scan ["image_to_scan"]
+devsecops-engine-tools --platform_devops ["local","azure","github"] --remote_config_repo ["remote_config_repo"] --tool ["engine_iac", "engine_dast", "engine_secret", "engine_dependencies", "engine_container", "engine_risk", "engine_code"] --folder_path ["Folder path scan engine_iac, engine_code and engine_dependencies"] --platform ["k8s","cloudformation","docker", "openapi", "terraform"] --use_secrets_manager ["false", "true"] --use_vulnerability_management ["false", "true"] --send_metrics ["false", "true"] --token_cmdb ["token_cmdb"] --token_vulnerability_management ["token_vulnerability_management"] --token_engine_container ["token_engine_container"] --token_engine_dependencies ["token_engine_dependencies"] --token_external_checks ["token_external_checks"] --xray_mode ["scan", "audit"] --image_to_scan ["image_to_scan"]
 ```
 
 ### Structure Remote Config

{devsecops_engine_tools-1.15.0 → devsecops_engine_tools-1.17.0}/devsecops_engine_tools/engine_core/src/applications/runner_engine_core.py

@@ -97,7 +97,7 @@ def get_inputs_from_cli(args):
     parser.add_argument(
         "-p",
         "--platform",
-        type=parse_choices({"all", "docker", "k8s", "cloudformation", "openapi"}),
+        type=parse_choices({"all", "docker", "k8s", "cloudformation", "openapi", "terraform"}),
         required=False,
         default="all",
         help="Platform to scan, only apply engine_iac tool",
@@ -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-1.15.0 → devsecops_engine_tools-1.17.0}/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-1.15.0 → devsecops_engine_tools-1.17.0}/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-1.15.0 → devsecops_engine_tools-1.17.0}/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-1.15.0 → devsecops_engine_tools-1.17.0}/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-1.15.0 → devsecops_engine_tools-1.17.0}/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-1.17.0/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-1.15.0 → devsecops_engine_tools-1.17.0}/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():