Skip to content

Commit

Permalink
Create GMP 22.4 and GMP 22.5 specific request modules
Browse files Browse the repository at this point in the history
Allow to version the request classes for specific GMP versions. With
this change we can add new requests that are only available for specific
GMP versions.
  • Loading branch information
bjoernricks committed Jun 5, 2024
1 parent cc64777 commit 7076707
Show file tree
Hide file tree
Showing 89 changed files with 353 additions and 191 deletions.
2 changes: 1 addition & 1 deletion gvm/protocols/gmp/_gmp224.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from gvm.utils import SupportsStr, to_dotted_types_dict

from .._protocol import GvmProtocol, T
from .requests import (
from .requests.v224 import (
Aggregates,
AggregateStatistic,
AlertCondition,
Expand Down
2 changes: 1 addition & 1 deletion gvm/protocols/gmp/_gmp225.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from .._protocol import T
from ._gmp224 import GMPv224
from .requests import (
from .requests.v225 import (
ResourceNames,
ResourceType,
)
Expand Down
112 changes: 0 additions & 112 deletions gvm/protocols/gmp/requests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,122 +2,10 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later

from ._aggregates import Aggregates, AggregateStatistic, SortOrder
from ._alerts import AlertCondition, AlertEvent, AlertMethod, Alerts
from ._audits import Audits
from ._auth import Authentication
from ._cert_bund_advisories import CertBundAdvisories
from ._cpes import Cpes
from ._credentials import (
CredentialFormat,
Credentials,
CredentialType,
SnmpAuthAlgorithm,
SnmpPrivacyAlgorithm,
)
from ._cves import Cves
from ._dfn_cert_advisories import DfnCertAdvisories
from ._entity_id import EntityID
from ._entity_type import EntityType
from ._feed import Feed, FeedType
from ._filters import Filters, FilterType
from ._groups import Groups
from ._help import Help, HelpFormat
from ._hosts import Hosts, HostsOrdering
from ._notes import Notes
from ._nvts import Nvts
from ._operating_systems import OperatingSystems
from ._overrides import Overrides
from ._permissions import Permissions, PermissionSubjectType
from ._policies import Policies
from ._port_lists import PortLists, PortRangeType
from ._report_formats import ReportFormats, ReportFormatType
from ._reports import Reports
from ._resource_names import ResourceNames, ResourceType
from ._results import Results
from ._roles import Roles
from ._scan_configs import ScanConfigs
from ._scanners import Scanners, ScannerType
from ._schedules import Schedules
from ._secinfo import InfoType, SecInfo
from ._severity import Severity
from ._system_reports import SystemReports
from ._tags import Tags
from ._targets import AliveTest, Targets
from ._tasks import Tasks
from ._tickets import Tickets, TicketStatus
from ._tls_certificates import TLSCertificates
from ._trashcan import TrashCan
from ._user_settings import UserSettings
from ._users import UserAuthType, Users
from ._version import Version
from ._vulnerabilities import Vulnerabilities

__all__ = (
"Aggregates",
"AggregateStatistic",
"Alerts",
"AlertCondition",
"AlertEvent",
"AlertMethod",
"AliveTest",
"Audits",
"Authentication",
"CertBundAdvisories",
"Cpes",
"Credentials",
"CredentialFormat",
"CredentialType",
"Cves",
"DfnCertAdvisories",
"EntityID",
"EntityType",
"Feed",
"FeedType",
"Filters",
"FilterType",
"Groups",
"Help",
"HelpFormat",
"Hosts",
"HostsOrdering",
"InfoType",
"Notes",
"Nvts",
"OperatingSystems",
"Overrides",
"Permissions",
"PermissionSubjectType",
"Policies",
"PortLists",
"PortRangeType",
"ReportFormatType",
"ReportFormats",
"Reports",
"ResourceNames",
"ResourceType",
"Results",
"Roles",
"ScanConfigs",
"Scanners",
"ScannerType",
"Schedules",
"SecInfo",
"Severity",
"SortOrder",
"SnmpAuthAlgorithm",
"SnmpPrivacyAlgorithm",
"SystemReports",
"Tags",
"Targets",
"Tasks",
"Tickets",
"TicketStatus",
"TLSCertificates",
"TrashCan",
"UserAuthType",
"UserSettings",
"Users",
"Version",
"Vulnerabilities",
)
125 changes: 125 additions & 0 deletions gvm/protocols/gmp/requests/v224/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
# SPDX-FileCopyrightText: 2018-2024 Greenbone AG
#
# SPDX-License-Identifier: GPL-3.0-or-later
#
"""
GMP Request implementations for GMP version 22.4.
"""

from .._entity_id import EntityID
from .._version import Version
from ._aggregates import Aggregates, AggregateStatistic, SortOrder
from ._alerts import AlertCondition, AlertEvent, AlertMethod, Alerts
from ._audits import Audits
from ._auth import Authentication
from ._cert_bund_advisories import CertBundAdvisories
from ._cpes import Cpes
from ._credentials import (
CredentialFormat,
Credentials,
CredentialType,
SnmpAuthAlgorithm,
SnmpPrivacyAlgorithm,
)
from ._cves import Cves
from ._dfn_cert_advisories import DfnCertAdvisories
from ._entity_type import EntityType
from ._feed import Feed, FeedType
from ._filters import Filters, FilterType
from ._groups import Groups
from ._help import Help, HelpFormat
from ._hosts import Hosts, HostsOrdering
from ._notes import Notes
from ._nvts import Nvts
from ._operating_systems import OperatingSystems
from ._overrides import Overrides
from ._permissions import Permissions, PermissionSubjectType
from ._policies import Policies
from ._port_lists import PortLists, PortRangeType
from ._report_formats import ReportFormats, ReportFormatType
from ._reports import Reports
from ._results import Results
from ._roles import Roles
from ._scan_configs import ScanConfigs
from ._scanners import Scanners, ScannerType
from ._schedules import Schedules
from ._secinfo import InfoType, SecInfo
from ._severity import Severity
from ._system_reports import SystemReports
from ._tags import Tags
from ._targets import AliveTest, Targets
from ._tasks import Tasks
from ._tickets import Tickets, TicketStatus
from ._tls_certificates import TLSCertificates
from ._trashcan import TrashCan
from ._user_settings import UserSettings
from ._users import UserAuthType, Users
from ._vulnerabilities import Vulnerabilities

__all__ = (
"Aggregates",
"AggregateStatistic",
"Alerts",
"AlertCondition",
"AlertEvent",
"AlertMethod",
"AliveTest",
"Audits",
"Authentication",
"CertBundAdvisories",
"Cpes",
"Credentials",
"CredentialFormat",
"CredentialType",
"Cves",
"DfnCertAdvisories",
"EntityID",
"EntityType",
"Feed",
"FeedType",
"Filters",
"FilterType",
"Groups",
"Help",
"HelpFormat",
"Hosts",
"HostsOrdering",
"InfoType",
"Notes",
"Nvts",
"OperatingSystems",
"Overrides",
"Permissions",
"PermissionSubjectType",
"Policies",
"PortLists",
"PortRangeType",
"ReportFormatType",
"ReportFormats",
"Reports",
"ResourceType",
"Results",
"Roles",
"ScanConfigs",
"Scanners",
"ScannerType",
"Schedules",
"SecInfo",
"Severity",
"SortOrder",
"SnmpAuthAlgorithm",
"SnmpPrivacyAlgorithm",
"SystemReports",
"Tags",
"Targets",
"Tasks",
"Tickets",
"TicketStatus",
"TLSCertificates",
"TrashCan",
"UserAuthType",
"UserSettings",
"Users",
"Version",
"Vulnerabilities",
)
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.protocols.core import Request
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID
from ._entity_type import EntityType


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID
from ._report_formats import ReportFormatType


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from gvm.utils import to_bool, to_comma_list
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID
from ._hosts import HostsOrdering


Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class CertBundAdvisories:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class Cpes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class CredentialFormat(Enum):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class Cves:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class DfnCertAdvisories:
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class FilterType(Enum):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.utils import to_bool, to_comma_list
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class Groups:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class HostsOrdering(Enum):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.utils import check_port, to_bool, to_comma_list
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID
from ._severity import Severity


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class Nvts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from gvm.utils import to_bool
from gvm.xml import XmlCommand

from ._entity_id import EntityID
from .._entity_id import EntityID


class OperatingSystems:
Expand Down
Loading

0 comments on commit 7076707

Please sign in to comment.