Merge branch 'main' into add/get-report-tls-certs

Author: ozgen

gvm/protocols/gmp/_gmpnext.py

@@ -20,6 +20,7 @@
     IntegrationConfigs,
     OCIImageTargets,
     ReportApplications,
+    ReportCVEs,
     ReportHosts,
     ReportOperatingSystems,
     ReportPorts,
@@ -1147,3 +1148,33 @@ def get_report_applications(
                 details=details,
             )
         )
+
+    def get_report_cves(
+        self,
+        report_id: EntityID,
+        *,
+        filter_string: str | None = None,
+        filter_id: str | None = None,
+        ignore_pagination: bool | None = None,
+        details: bool | None = True,
+    ) -> T:
+        """Request CVEs of a single report.
+
+        Args:
+            report_id: UUID of an existing report.
+            filter_string: Filter term to use to filter results in the report
+            filter_id: UUID of filter to use to filter results in the report
+            ignore_pagination: Whether to ignore the filter terms "first" and
+                "rows".
+            details: Request additional report CVE information details.
+                Defaults to True.
+        """
+        return self._send_request_and_transform_response(
+            ReportCVEs.get_report_cves(
+                report_id=report_id,
+                filter_string=filter_string,
+                filter_id=filter_id,
+                ignore_pagination=ignore_pagination,
+                details=details,
+            )
+        )

gvm/protocols/gmp/requests/next/__init__.py

@@ -17,6 +17,9 @@
 from gvm.protocols.gmp.requests.next._report_applications import (
     ReportApplications,
 )
+from gvm.protocols.gmp.requests.next._report_cves import (
+    ReportCVEs,
+)
 from gvm.protocols.gmp.requests.next._report_hosts import (
     ReportHosts,
 )
@@ -148,6 +151,7 @@
     "PortLists",
     "PortRangeType",
     "ReportApplications",
+    "ReportCVEs",
     "ReportConfigParameter",
     "ReportConfigs",
     "ReportFormatType",

gvm/protocols/gmp/requests/next/_report_cves.py

@@ -0,0 +1,46 @@
+from gvm.errors import RequiredArgument
+from gvm.protocols.core import Request
+from gvm.protocols.gmp.requests import EntityID
+from gvm.utils import to_bool
+from gvm.xml import XmlCommand
+
+
+class ReportCVEs:
+    @classmethod
+    def get_report_cves(
+        cls,
+        report_id: EntityID,
+        *,
+        filter_string: str | None = None,
+        filter_id: str | None = None,
+        ignore_pagination: bool | None = None,
+        details: bool | None = True,
+    ) -> Request:
+        """Request CVEs of a single report.
+
+        Args:
+            report_id: UUID of an existing report.
+            filter_string: Filter term to use to filter results in the report
+            filter_id: UUID of filter to use to filter results in the report
+            ignore_pagination: Whether to ignore the filter terms "first" and
+                "rows".
+            details: Request additional report CVE information details.
+                Defaults to True.
+        """
+        cmd = XmlCommand("get_report_cves")
+
+        if not report_id:
+            raise RequiredArgument(
+                function=cls.get_report_cves.__name__, argument="report_id"
+            )
+
+        cmd.set_attribute("report_id", str(report_id))
+
+        cmd.add_filter(filter_string, filter_id)
+
+        if ignore_pagination is not None:
+            cmd.set_attribute("ignore_pagination", to_bool(ignore_pagination))
+
+        cmd.set_attribute("details", to_bool(details))
+
+        return cmd

tests/protocols/gmpnext/entities/report_cves/test_get_report_cves.py

@@ -0,0 +1,55 @@
+# SPDX-FileCopyrightText: 2026 Greenbone AG
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+from gvm.errors import RequiredArgument
+
+
+class GmpGetReportCVEsTestMixin:
+    def test_get_report_cves_without_id(self):
+        with self.assertRaises(RequiredArgument):
+            self.gmp.get_report_cves(None)
+
+        with self.assertRaises(RequiredArgument):
+            self.gmp.get_report_cves("")
+
+    def test_get_report_cves_with_filter_string(self):
+        self.gmp.get_report_cves(report_id="r1", filter_string="name=foo")
+
+        self.connection.send.has_been_called_with(
+            b'<get_report_cves report_id="r1" filter="name=foo" details="1"/>'
+        )
+
+    def test_get_report_cves_with_filter_id(self):
+        self.gmp.get_report_cves(report_id="r1", filter_id="f1")
+
+        self.connection.send.has_been_called_with(
+            b'<get_report_cves report_id="r1" filt_id="f1" details="1"/>'
+        )
+
+    def test_get_report_cves_with_ignore_pagination(self):
+        self.gmp.get_report_cves(report_id="r1", ignore_pagination=True)
+
+        self.connection.send.has_been_called_with(
+            b'<get_report_cves report_id="r1" ignore_pagination="1" details="1"/>'
+        )
+
+        self.gmp.get_report_cves(report_id="r1", ignore_pagination=False)
+
+        self.connection.send.has_been_called_with(
+            b'<get_report_cves report_id="r1" ignore_pagination="0" details="1"/>'
+        )
+
+    def test_get_report_cves_with_details(self):
+        self.gmp.get_report_cves(report_id="r1", details=True)
+
+        self.connection.send.has_been_called_with(
+            b'<get_report_cves report_id="r1" details="1"/>'
+        )
+
+        self.gmp.get_report_cves(report_id="r1", details=False)
+
+        self.connection.send.has_been_called_with(
+            b'<get_report_cves report_id="r1" details="0"/>'
+        )

tests/protocols/gmpnext/entities/test_report_cves.py

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2026 Greenbone AG
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+from ...gmpnext import GMPTestCase
+from .report_cves.test_get_report_cves import (
+    GmpGetReportCVEsTestMixin,
+)
+
+
+class GmpGetReportCVEsTestCase(GmpGetReportCVEsTestMixin, GMPTestCase):
+    pass