anta 1.10.0.dev2__tar.gz → 1.10.0.dev3__tar.gz

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anta
-Version: 1.10.0.dev2
+Version: 1.10.0.dev3
 Summary: Arista Network Test Automation (ANTA) Framework
 Author-email: Arista Networks ANTA maintainers <anta-dev@arista.com>
 Maintainer-email: Arista Networks ANTA maintainers <anta-dev@arista.com>, Khelil Sator <ksator@arista.com>, Matthieu Tâche <mtache@arista.com>, Thomas Grimonet <tgrimonet@arista.com>, Guillaume Mulocher <gmulocher@arista.com>, Carl Baillargeon <carl.baillargeon@arista.com>

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/anta/_advisory/reporter/csv_reporter.py

@@ -54,7 +54,7 @@ class SecurityAdvisoryReportCsv(ReportCsv):
     def _format_remediations(result: TestResult | AtomicTestResult) -> str:
         """Flatten advisory remediation entries into a plain-text CSV cell."""
         if isinstance(result, (_AdvisoryTestResult, _AdvisoryAtomicTestResult)):
-            return "\n".join(result.remediations)
+            return ReportCsv.split_list_to_txt_list(result.remediations, "\\n")
         return ""
 
     @classmethod
@@ -70,9 +70,9 @@ class SecurityAdvisoryReportCsv(ReportCsv):
             str(result.name),
             result.test,
             cls._format_result(result),
-            "\n".join(result.messages),
+            cls.split_list_to_txt_list(result.messages, "\\n"),
             cls._format_result(row_result),
-            "\n".join(row_result.messages),
+            cls.split_list_to_txt_list(row_result.messages, "\\n"),
             cls._format_remediations(row_result),
             cls._format_remediations(result),
             f"SA{advisory.sa_number}",

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/anta/_advisory/reporter/md_reporter.py

@@ -34,7 +34,7 @@ SEVERITY_ICONS = {
 RESULT_ICONS = {
     AntaTestStatus.SUCCESS: "✅",
     AntaTestStatus.INCONCLUSIVE: "❓",
-    AntaTestStatus.FAILURE: "❌",
+    AntaTestStatus.FAILURE: "🛑",
     AntaTestStatus.ERROR: "❗",
     AntaTestStatus.SKIPPED: "⏭️",
     AntaTestStatus.UNSET: "-",
@@ -81,9 +81,47 @@ class SecurityAdvisoryMDReportBase(MDReportBase):
             ]
             remediations.extend(atomic_remediations)
         unique_remediations = dict.fromkeys(remediations)
+        formatted_remediations = []
+        for remediation in unique_remediations:
+            vulnerability_ids = self._remediation_vulnerability_ids(result, remediation)
+            prefix = f"{', '.join(vulnerability_ids)}: " if vulnerability_ids else ""
+            formatted_remediations.append(f"{prefix}{remediation}")
         if atomic_remediations:
-            return "<br>".join(f"•&nbsp;{self.safe_markdown(remediation)}" for remediation in unique_remediations)
-        return self.safe_markdown("\n".join(unique_remediations)) or "-"
+            return "<br>".join(f"•&nbsp;{self.safe_markdown(remediation)}" for remediation in formatted_remediations)
+        return self.safe_markdown("\n".join(formatted_remediations)) or "-"
+
+    @staticmethod
+    def _remediation_vulnerability_ids(result: TestResult | AtomicTestResult, remediation: str) -> tuple[str, ...]:
+        """Return advisory-ordered vulnerability IDs sharing a parent remediation."""
+        if not isinstance(result, _AdvisoryTestResult):
+            return ()
+
+        associated_ids: set[str] = set()
+        for atomic in result.atomic_results:
+            if not isinstance(atomic, _AdvisoryAtomicTestResult) or remediation not in atomic.remediations:
+                continue
+            if not atomic.vulnerability_ids:
+                return ()
+            associated_ids.update(atomic.vulnerability_ids)
+        return tuple(vulnerability.id for vulnerability in result.advisory.vulnerabilities if vulnerability.id in associated_ids)
+
+    def format_findings(self, result: TestResult) -> str:
+        """Format findings and label associated atomic findings with vulnerability IDs."""
+        messages = list(result.messages)
+        if isinstance(result, _AdvisoryTestResult):
+            for atomic in result.atomic_results:
+                vulnerability_ids = _get_atomic_vulnerability_ids(atomic)
+                if not vulnerability_ids:
+                    continue
+                prefix = f"{', '.join(vulnerability_ids)}: "
+                for message in atomic.messages:
+                    inherited_message = f"{atomic.description} - {message}"
+                    try:
+                        index = messages.index(inherited_message)
+                    except ValueError:
+                        continue
+                    messages[index] = f"{prefix}{message}"
+        return self.safe_markdown("<br>".join(messages)) or "-"
 
 
 class ANTASecurityAdvisoryReport(SecurityAdvisoryMDReportBase):
@@ -99,7 +137,7 @@ class ANTASecurityAdvisoryReport(SecurityAdvisoryMDReportBase):
             toc += "- [Advisory Assessment Summary](#advisory-assessment-summary)\n- [Security Advisory Details](#security-advisory-details)\n"
             for group in self.groups:
                 advisory = group.advisory
-                toc += f"  - [SA{advisory.sa_number}: {self.safe_markdown(advisory.title)}](#sa-{advisory.sa_number.lower()})\n"
+                toc += f"  - [{self.safe_markdown(advisory.title)}](#sa-{advisory.sa_number.lower()})\n"
         toc += "- [Run Overview](#run-overview)"
         self.mdfile.write(toc + "\n\n")
 
@@ -112,7 +150,7 @@ class AdvisoryAssessmentSummary(SecurityAdvisoryMDReportBase):
         "Security Advisory",
         "Severity",
         "Devices",
-        "❌&nbsp;Affected",
+        "🛑&nbsp;Affected",
         "❓&nbsp;Inconclusive",
         "✅&nbsp;Mitigated",
         "✅&nbsp;Not Affected",
@@ -130,7 +168,7 @@ class AdvisoryAssessmentSummary(SecurityAdvisoryMDReportBase):
         """Generate one summary row per security advisory."""
         for group in self.groups:
             advisory = group.advisory
-            advisory_link = f"[SA{advisory.sa_number}: {self.safe_markdown(advisory.title)}](#sa-{advisory.sa_number.lower()})"
+            advisory_link = f"[{self.safe_markdown(advisory.title)}](#sa-{advisory.sa_number.lower()})"
             severity = self.format_severity(group.severity)
             devices = len({result.name for result in group.results})
             yield (
@@ -181,7 +219,7 @@ class SecurityAdvisoryDetails(SecurityAdvisoryMDReportBase):
         heading = self.generate_table_heading(["Device", "Result", "Findings", "Remediations"])
         self.mdfile.write("\n".join(heading) + "\n")
         for result in group.results:
-            findings = self.safe_markdown("<br>".join(result.messages)) or "-"
+            findings = self.format_findings(result)
             remediation = self.format_remediations(result)
             self.mdfile.write(f"| {self.safe_markdown(result.name)} | {self.format_advisory_result(result)} | {findings} | {remediation} |\n")
 
@@ -203,7 +241,7 @@ class SecurityAdvisoryDetails(SecurityAdvisoryMDReportBase):
 
     def _write_expanded_findings(self, group: AdvisoryResultGroup) -> None:
         """Write parent advisory results followed by their actual detailed issue results."""
-        heading = self.generate_table_heading(["Device", "Description", "Vulnerability ID(s)", "Result", "Findings", "Remediations"])
+        heading = self.generate_table_heading(["Device", "Vulnerability ID(s)", "Result", "Findings", "Remediations"])
         self.mdfile.write("\n".join(heading) + "\n")
         vulnerability_by_id = {vulnerability.id: vulnerability for vulnerability in group.advisory.vulnerabilities}
         for result in group.results:
@@ -211,20 +249,14 @@ class SecurityAdvisoryDetails(SecurityAdvisoryMDReportBase):
             if has_details:
                 findings = f"**Detailed findings:** {self._atomic_summary(result)}"
                 if result.messages:
-                    findings += f"<br>**Overall evidence:** {self.safe_markdown('<br>'.join(result.messages))}"
+                    findings += f"<br>**Overall evidence:** {self.format_findings(result)}"
             else:
                 findings = self.safe_markdown("<br>".join(result.messages)) or "-"
-            description = self.safe_markdown(result.description) or "-"
             remediation = self.format_remediations(result)
-            self.mdfile.write(f"| {self.safe_markdown(result.name)} | {description} | - | {self.format_advisory_result(result)} | {findings} | {remediation} |\n")
+            self.mdfile.write(f"| {self.safe_markdown(result.name)} | - | {self.format_advisory_result(result)} | {findings} | {remediation} |\n")
             for index, atomic in enumerate(result.atomic_results):
                 tree = "└──" if index == len(result.atomic_results) - 1 else "├──"
                 vulnerability_ids = _get_atomic_vulnerability_ids(atomic)
-                if vulnerability_ids:
-                    atomic_description = "<br>".join(self.safe_markdown(vulnerability_by_id[vulnerability_id].description) for vulnerability_id in vulnerability_ids)
-                else:
-                    atomic_description = self.safe_markdown(atomic.description) or "-"
-                description = f"&nbsp;&nbsp;{tree}&nbsp;{atomic_description}"
                 vulnerabilities = (
                     "<br>".join(
                         f"{SEVERITY_ICONS[vulnerability_by_id[vulnerability_id].severity]}&nbsp;{self.safe_markdown(vulnerability_id)}"
@@ -235,7 +267,7 @@ class SecurityAdvisoryDetails(SecurityAdvisoryMDReportBase):
                 )
                 atomic_findings = self.safe_markdown("<br>".join(atomic.messages)) or "-"
                 remediation = self.format_remediations(atomic)
-                self.mdfile.write(f"| | {description} | {vulnerabilities} | {self.format_advisory_result(atomic)} | {atomic_findings} | {remediation} |\n")
+                self.mdfile.write(f"| &nbsp;&nbsp;{tree} | {vulnerabilities} | {self.format_advisory_result(atomic)} | {atomic_findings} | {remediation} |\n")
 
     def generate_section(self) -> None:
         """Generate detailed advisory metadata and findings."""
@@ -244,7 +276,7 @@ class SecurityAdvisoryDetails(SecurityAdvisoryMDReportBase):
             advisory = group.advisory
             anchor = f"sa-{advisory.sa_number.lower()}"
             title = self.safe_markdown(advisory.title)
-            self.mdfile.write(f'### SA{advisory.sa_number}: {title} <a id="{anchor}"></a>\n\n')
+            self.mdfile.write(f'### {title} <a id="{anchor}"></a>\n\n')
             advisory_severity = group.severity
             severity = f"**Severity:** {SEVERITY_ICONS[advisory_severity]} {advisory_severity.value.title()}"
             description = self.safe_markdown(advisory.description)

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/anta/tests/advisories/sa_117.py

@@ -62,7 +62,7 @@ ADVISORY = _AdvisoryMetadata(
         _AdvisoryVulnerability(
             id="CVE-2025-0936",
             severity=_AdvisoryVulnerabilitySeverity.MEDIUM,
-            description=("CVE-2025-0936: gNOI TransferToRemote credential exposure through OpenConfig accounting or tracing."),
+            description=("gNOI TransferToRemote credential exposure through OpenConfig accounting or tracing."),
         ),
     ),
     url=("https://www.arista.com/en/support/advisories-notices/security-advisory/21394-security-advisory-0117"),
@@ -289,7 +289,7 @@ class VerifySA117(OptionalCommandsMixin, _AntaAdvisoryTest):
         )
         vulnerability = ADVISORY.vulnerabilities[0]
         atomic_result = self.result.add(
-            vulnerability.description,
+            f"Verify {vulnerability.id}.",
             vulnerability_ids=(vulnerability.id,),
         )
         project_advisory_status(atomic_result, status, message, remediation)

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/anta/tests/advisories/sa_140.py

@@ -53,7 +53,7 @@ ADVISORY = _AdvisoryMetadata(
         _AdvisoryVulnerability(
             id="CVE-2026-10040",
             severity=_AdvisoryVulnerabilitySeverity.MEDIUM,
-            description="CVE-2026-10040: Secure Boot Software Image verification bypass.",
+            description="Secure Boot Software Image verification bypass.",
         ),
     ),
     url=("https://www.arista.com/en/support/advisories-notices/security-advisory/24074-security-advisory-0140"),
@@ -163,7 +163,7 @@ class VerifySA140(_AntaAdvisoryTest):
         )
         vulnerability = ADVISORY.vulnerabilities[0]
         atomic_result = self.result.add(
-            vulnerability.description,
+            f"Verify {vulnerability.id}.",
             vulnerability_ids=(vulnerability.id,),
         )
         project_advisory_status(atomic_result, status, message, remediation)

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/anta/tests/advisories/sa_142.py

@@ -226,7 +226,7 @@ ADVISORY = _AdvisoryMetadata(
         _AdvisoryVulnerability(
             id="CVE-2026-12546",
             severity=_AdvisoryVulnerabilitySeverity.MEDIUM,
-            description=("CVE-2026-12546: Next-hop redirection bypass for packets requiring exception handling."),
+            description=("Next-hop redirection bypass for packets requiring exception handling."),
         ),
     ),
     url=("https://www.arista.com/en/support/advisories-notices/security-advisory/24111-security-advisory-0142"),
@@ -732,7 +732,7 @@ class VerifySA142(OptionalCommandsMixin, _AntaAdvisoryTest):
         )
         vulnerability = ADVISORY.vulnerabilities[0]
         atomic_result = self.result.add(
-            vulnerability.description,
+            f"Verify {vulnerability.id}.",
             vulnerability_ids=(vulnerability.id,),
         )
         project_advisory_status(atomic_result, status, message, remediation)

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/anta/tests/advisories/sa_146.py

@@ -517,7 +517,7 @@ class VerifySA146(OptionalCommandsMixin, _AntaAdvisoryTest):
         )
         vulnerability = ADVISORY.vulnerabilities[0]
         atomic_result = self.result.add(
-            vulnerability.description,
+            f"Verify {vulnerability.id}.",
             vulnerability_ids=(vulnerability.id,),
         )
         project_advisory_status(atomic_result, status, message, remediation)

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/anta/tests/advisories/sa_147.py

@@ -61,22 +61,22 @@ ADVISORY = _AdvisoryMetadata(
         _AdvisoryVulnerability(
             id="CVE-2026-59995",
             severity=_AdvisoryVulnerabilitySeverity.MEDIUM,
-            description="CVE-2026-59995: SFTP client issue when connecting to an untrusted server.",
+            description="SFTP client issue when connecting to an untrusted server.",
         ),
         _AdvisoryVulnerability(
             id="CVE-2026-59996",
             severity=_AdvisoryVulnerabilitySeverity.MEDIUM,
-            description=("CVE-2026-59996: SCP remote-to-remote client issue involving an untrusted server."),
+            description=("SCP remote-to-remote client issue involving an untrusted server."),
         ),
         _AdvisoryVulnerability(
             id="CVE-2026-60001",
             severity=_AdvisoryVulnerabilitySeverity.MEDIUM,
-            description="CVE-2026-60001: OpenSSH server issue affecting accepted SSH connections.",
+            description="OpenSSH server issue affecting accepted SSH connections.",
         ),
         _AdvisoryVulnerability(
             id="CVE-2026-60002",
             severity=_AdvisoryVulnerabilitySeverity.CRITICAL,
-            description=("CVE-2026-60002: SSH client issue when connecting to a malicious or compromised server."),
+            description=("SSH client issue when connecting to a malicious or compromised server."),
         ),
     ),
     url=("https://www.arista.com/en/support/advisories-notices/security-advisory/24515-security-advisory-0147"),
@@ -428,7 +428,7 @@ class VerifySA147(OptionalCommandsMixin, _AntaAdvisoryTest):
         )
         for vulnerability, (status, message, remediation) in zip(ADVISORY.vulnerabilities, assessments, strict=True):
             atomic_result = self.result.add(
-                vulnerability.description,
+                f"Verify {vulnerability.id}.",
                 vulnerability_ids=(vulnerability.id,),
             )
             project_advisory_status(atomic_result, status, message, remediation)

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/anta.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anta
-Version: 1.10.0.dev2
+Version: 1.10.0.dev3
 Summary: Arista Network Test Automation (ANTA) Framework
 Author-email: Arista Networks ANTA maintainers <anta-dev@arista.com>
 Maintainer-email: Arista Networks ANTA maintainers <anta-dev@arista.com>, Khelil Sator <ksator@arista.com>, Matthieu Tâche <mtache@arista.com>, Thomas Grimonet <tgrimonet@arista.com>, Guillaume Mulocher <gmulocher@arista.com>, Carl Baillargeon <carl.baillargeon@arista.com>

{anta-1.10.0.dev2 → anta-1.10.0.dev3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "anta"
-version = "v1.10.0.dev2"
+version = "v1.10.0.dev3"
 readme = "README.md"
 authors = [{ name = "Arista Networks ANTA maintainers", email = "anta-dev@arista.com" }]
 maintainers = [
@@ -121,7 +121,7 @@ namespaces = false
 # Version
 ################################
 [tool.bumpver]
-current_version = "1.10.0.dev2"
+current_version = "1.10.0.dev3"
 version_pattern = "MAJOR.MINOR.PATCH[.PYTAGNUM]"
 commit_message  = "bump: Version {old_version} -> {new_version}"
 commit = true