python-netgear-switch-library 0.0.post344__tar.gz → 0.0.post346__tar.gz

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-netgear-switch-library
-Version: 0.0.post344
+Version: 0.0.post346
 Summary: Python library and CLI to query and control Netgear switches over SNMP, NSDP and HTTP.
 Author-email: Tim Ansell <me@mith.ro>
 License-Expression: Apache-2.0

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/src/netgear_switch/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.0.post344'
-__version_tuple__ = version_tuple = (0, 0, 'post344')
+__version__ = version = '0.0.post346'
+__version_tuple__ = version_tuple = (0, 0, 'post346')
 
 __commit_id__ = commit_id = None

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/src/netgear_switch/aio_api.py

@@ -95,6 +95,8 @@ if TYPE_CHECKING:
         PortStats,
         PortStatus,
         Sensor,
+        ServiceStatus,
+        SwitchUser,
         SyslogConfig,
         VLANInfo,
         VlanMode,
@@ -452,6 +454,20 @@ class AsyncSwitch:
         """Async twin of ``SyncSwitch.get_syslog`` -- see there."""
         return await self._read(lambda r: r.get_syslog(), backend)
 
+    async def get_users(self, *, backend: Backend | None = None) -> list[SwitchUser]:
+        """Async twin of ``SyncSwitch.get_users``.
+
+        AsyncSwitch has no CLI backend, so this refuses on every model -- the
+        same honest refusal every async CLI read gives.
+        """
+        return await self._read(lambda r: r.get_users(), backend)
+
+    async def get_services(
+        self, *, backend: Backend | None = None
+    ) -> list[ServiceStatus]:
+        """Async twin of ``SyncSwitch.get_services`` -- CLI only, see there."""
+        return await self._read(lambda r: r.get_services(), backend)
+
     async def get_hostname(self, *, backend: Backend | None = None) -> str:
         """Async twin of ``SyncSwitch.get_hostname`` -- see there."""
         return await self._read(lambda r: r.get_hostname(), backend)

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/src/netgear_switch/capabilities.py

@@ -114,6 +114,28 @@ READ_OPERATIONS: tuple[Operation, ...] = (
     Operation("get_sensors", OperationKind.READ, "Fan/PSU/temperature sensors"),
     Operation("get_mgmt_ip", OperationKind.READ, "Management IP configuration"),
     Operation("get_hostname", OperationKind.READ, "The switch's host name"),
+    Operation(
+        "get_users",
+        OperationKind.READ,
+        "Local login accounts and their access level",
+        # CLI only, deliberately. The S3300's vendor SNMP user table holds ONE
+        # account where its own CLI lists two, so the two backends do not report
+        # the same set; claiming both serve this would assert an equivalence the
+        # hardware contradicts. Restricting it to the CLI makes no cross-backend
+        # claim at all, and leaves the SNMP question open rather than answered
+        # wrongly.
+        backends=_CLI_BACKENDS,
+    ),
+    Operation(
+        "get_services",
+        OperationKind.READ,
+        "Which management services (http/https/telnet/ssh) are enabled",
+        # CLI only so far: `show ip http`, `show telnetcon` and `show ip ssh`
+        # are measured, and the SNMP/HTTP/NSDP equivalents are unlocated rather
+        # than absent. The four models with no CLI backend therefore have no
+        # route to this yet, which the support table now shows as a hole.
+        backends=_CLI_BACKENDS,
+    ),
     Operation(
         "get_syslog",
         OperationKind.READ,

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/src/netgear_switch/cli_read.py

@@ -36,6 +36,7 @@ if TYPE_CHECKING:
         PortStats,
         PortStatus,
         Sensor,
+        ServiceStatus,
         SwitchUser,
         SyslogConfig,
         VLANInfo,
@@ -105,6 +106,19 @@ class CliReader:
     def get_mgmt_ip(self) -> MgmtIpConfig:
         return parse.parse_mgmt_ip(self.session.run(self._spec.network_cmd))
 
+    def get_services(self) -> list[ServiceStatus]:
+        """Which management services are enabled, and on which ports.
+
+        Three commands, because the switch splits it that way -- and the telnet
+        one is ``show telnetcon``, not ``show telnet``. See
+        ``parse.parse_services`` for why that distinction matters.
+        """
+        return parse.parse_services(
+            self.session.run(self._spec.http_service_cmd),
+            self.session.run(self._spec.telnet_service_cmd),
+            self.session.run(self._spec.ssh_service_cmd),
+        )
+
     def get_users(self) -> list[SwitchUser]:
         """The switch's local login accounts, from ``show users``.
 

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/src/netgear_switch/models.py

@@ -119,6 +119,23 @@ class MgmtIpConfig:
     base_mac: str | None = None
 
 
+@dataclass(frozen=True)
+class ServiceStatus:
+    """One management service the switch offers, and whether it is on.
+
+    Covers the four protocols an operator turns on or off to control how the
+    switch itself can be reached: ``http``, ``https``, ``telnet`` and ``ssh``.
+    """
+
+    #: One of ``http``, ``https``, ``telnet``, ``ssh``.
+    name: str
+    enabled: bool
+    #: The TCP port the service listens on, or ``None`` where the firmware does
+    #: not report one. Measured: gsm7252ps omits the ``SSH Port`` line that
+    #: m4300-24x prints, so this is genuinely absent rather than defaulted to 22.
+    port: int | None = None
+
+
 @dataclass(frozen=True)
 class SwitchUser:
     """One local login account on the switch."""

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/src/netgear_switch/protocols/cli/commands.py

@@ -106,6 +106,12 @@ class CliModelSpec:
     # Local login accounts. Present on both FASTPATH images measured; the
     # ACCESS-MODE vocabulary differs between them (see parse.parse_users).
     users_cmd: str = "show users"
+    # Management services. `show ip http` covers BOTH web servers; the inbound
+    # telnet server is `show telnetcon` and NOT `show telnet`, which reports
+    # the switch as an outbound telnet CLIENT (measured 2026-08-02).
+    http_service_cmd: str = "show ip http"
+    telnet_service_cmd: str = "show telnetcon"
+    ssh_service_cmd: str = "show ip ssh"
     # Remote logging. `show syslog` does NOT exist -- all three FASTPATH
     # switches answered "% Invalid input detected" on 2026-08-02.
     logging_cmd: str = "show logging"

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/src/netgear_switch/protocols/cli/parse.py

@@ -42,6 +42,7 @@ from ...models import (
     PortStats,
     PortStatus,
     Sensor,
+    ServiceStatus,
     SwitchUser,
     SyslogConfig,
     SyslogServer,
@@ -609,6 +610,76 @@ def parse_environment(text: str) -> list[Sensor]:
     return out
 
 
+# ---------------------------------------------------------------------------
+# show ip http / show telnetcon / show ip ssh -> management services
+# ---------------------------------------------------------------------------
+
+
+def _enabled(text: str) -> bool:
+    """FASTPATH spells this two ways: "Enabled" and "Enable"."""
+    return text.strip().lower() in {"enabled", "enable", "yes"}
+
+
+def parse_services(
+    http_text: str, telnet_text: str, ssh_text: str
+) -> list[ServiceStatus]:
+    """The four management services, from the three commands that report them.
+
+    Captured 2026-08-02 from m4300-24x (10.1.5.13) and gsm7252ps (10.1.5.22).
+
+    ``show ip http`` carries BOTH the plain and secure web servers::
+
+        HTTP Mode (Unsecure)........................... Enabled
+        HTTP Port...................................... 80
+        HTTP Mode (Secure)............................. Enabled
+        Secure Port.................................... 443
+
+    ``show telnetcon`` -- NOT ``show telnet`` -- reports the INBOUND server::
+
+        Telnet Server Admin Mode....................... Enable
+        Telnet Server Port............................. 23
+
+    ``show telnet`` describes the switch as a telnet *client* ("Allow New
+    Outbound Telnet Sessions"), which says nothing about whether the server this
+    library's TELNET backend connects to is running. Reading it as the server
+    state would be wrong in the way that looks right.
+
+    ``show ip ssh`` reports SSH, and its field set differs by firmware: the
+    gsm7252ps prints no ``SSH Port`` line at all, so that port is honestly None
+    rather than assumed to be 22.
+    """
+    http = labelled_values(http_text)
+    telnet = labelled_values(telnet_text)
+    # `show ip ssh` writes its labels WITH a trailing colon before the dotted
+    # leader ("Administrative Mode: ......... Enabled"), unlike every other
+    # FASTPATH scalar command. Measured on both m4300-24x and gsm7252ps. Without
+    # stripping it the lookup misses and SSH reads as disabled on a switch whose
+    # own output says Enabled -- which is exactly what the first live run did.
+    ssh = {k.rstrip(":").strip(): v for k, v in labelled_values(ssh_text).items()}
+    return [
+        ServiceStatus(
+            name="http",
+            enabled=_enabled(http.get("HTTP Mode (Unsecure)", "")),
+            port=_int(http.get("HTTP Port", "")),
+        ),
+        ServiceStatus(
+            name="https",
+            enabled=_enabled(http.get("HTTP Mode (Secure)", "")),
+            port=_int(http.get("Secure Port", "")),
+        ),
+        ServiceStatus(
+            name="telnet",
+            enabled=_enabled(telnet.get("Telnet Server Admin Mode", "")),
+            port=_int(telnet.get("Telnet Server Port", "")),
+        ),
+        ServiceStatus(
+            name="ssh",
+            enabled=_enabled(ssh.get("Administrative Mode", "")),
+            port=_int(ssh.get("SSH Port", "")),
+        ),
+    ]
+
+
 # ---------------------------------------------------------------------------
 # show users -> local login accounts
 # ---------------------------------------------------------------------------

{python_netgear_switch_library-0.0.post344 → python_netgear_switch_library-0.0.post346}/src/netgear_switch/sync_api.py

@@ -157,6 +157,8 @@ if TYPE_CHECKING:
         PortStats,
         PortStatus,
         Sensor,
+        ServiceStatus,
+        SwitchUser,
         SyslogConfig,
         VLANInfo,
         VlanMode,
@@ -564,6 +566,23 @@ class SyncSwitch:
         """
         return self._read(lambda r: r.get_syslog(), backend)
 
+    def get_users(self, *, backend: Backend | None = None) -> list[SwitchUser]:
+        """The switch's local login accounts.
+
+        Served over the FASTPATH CLI. ``SwitchUser.access_mode`` keeps the
+        firmware's own wording, which differs between images, and
+        ``privileged`` carries the normalised reading.
+        """
+        return self._read(lambda r: r.get_users(), backend)
+
+    def get_services(self, *, backend: Backend | None = None) -> list[ServiceStatus]:
+        """Which management services are enabled, and on which ports.
+
+        Served over the FASTPATH CLI. A ``port`` of ``None`` means the firmware
+        reports no port for that service, not that a default applies.
+        """
+        return self._read(lambda r: r.get_services(), backend)
+
     def get_hostname(self, *, backend: Backend | None = None) -> str:
         """The switch's host name.