feat(ssh): offer the SSH hardening, into the drop-in only (#20) #21

Merged
christianmanivong merged 1 commits from fix/ssh-hardening-dropin into main 2026-11-03 07:10:51 +00:00
6 changed files with 39 additions and 23 deletions

No files matched your search

+4
View File
@@ -32,6 +32,10 @@ All notable changes to this driver. The format follows
### Changed
- Python 3.12 is the floor (`requires-python = ">=3.12"`): netOrk runs every driver
on 3.12, so 3.10 and 3.11 are no longer tested (NAPALM/driver-standard#6).
- The SSH hardening is offered again (#20, NetOrk/netork#1950): it goes into the drop-in under
`/etc/ssh/sshd_config.d`, which OpenMediaVault's generated `sshd_config` includes and salt
leaves alone, never into `sshd_config` itself (`SSHD_CONFIG_GENERATED`, napalm-device-types
4.26.0). Requires napalm-device-types 4.26.0.
### Fixed
- `get_disks()` reports each disk's SMART verdict: `healthy` when smartctl's overall
+7 -2
View File
@@ -45,11 +45,16 @@ with driver("192.0.2.10", "admin", "secret", optional_args={"sudo_password": "se
"Upgrade everything" is a full upgrade (`FULL_UPGRADE = True`): a plain `apt-get upgrade` holds
back OpenMediaVault's own packages and the kernel.
The SSH hardening of napalm-linux (`harden_ssh_server`) writes only the drop-in under
`/etc/ssh/sshd_config.d` (`SSHD_CONFIG_GENERATED = True`). OpenMediaVault generates
`sshd_config` from its own database and would write over a change to it, but its template
includes that directory, and salt leaves the drop-in alone. An algorithm set in the SSH
settings' "Extra options" comes before the include and wins; the hardening sees that, puts
its change back and says so.
## Not supported
- `get_volume_snapshots`, `get_replication_jobs`, `get_quotas` raise `NotImplementedError`.
- `harden_ssh_server` is not offered: OpenMediaVault generates `sshd_config` from its own
database and would undo a drop-in on the next apply of its SSH settings.
- Configuration changes to shares, disks or arrays.
## Installation
+4 -4
View File
@@ -187,10 +187,10 @@ class OpenMediaVaultDriver(OmvLocalAccountsMixin, StorageDriver, LinuxDriver):
FingerprintRule("openmediavault", weight=9.0, mandatory=True),
]
#: OMV generates sshd_config from its own database; a drop-in netOrk wrote
#: would be dropped on the next apply of the SSH settings. Inherited from
#: napalm-linux, so opted out here (NetOrk/netork#1027).
harden_ssh_server = None # type: ignore[assignment]
#: OMV generates sshd_config from its own database, but its template includes
#: /etc/ssh/sshd_config.d, which salt leaves alone: the SSH hardening from
#: napalm-linux goes into a drop-in there and never into sshd_config itself.
SSHD_CONFIG_GENERATED = True
# ── Facts override ─────────────────────────────────────────────────────────
+1 -1
View File
@@ -27,7 +27,7 @@ classifiers = [
]
dependencies = [
"napalm>=4.0",
"napalm-device-types>=4.22.0",
"napalm-device-types>=4.26.0",
"napalm-linux>=0.15.0",
]
+23
View File
@@ -0,0 +1,23 @@
"""OpenMediaVault writes sshd_config itself, from its own database.
The Linux driver offers to harden the SSH server by writing a drop-in under
/etc/ssh/sshd_config.d (NetOrk/netork#1027). OMV's template ends with
``Include /etc/ssh/sshd_config.d/*.conf`` and salt manages only sshd_config,
so the drop-in survives the next apply of the SSH settings
(``omv-salt deploy run ssh``) and the hardening is offered. Only sshd_config
itself is off limits: that apply would write over it, so an OMV whose
sshd_config does not include the directory is left alone
(``SSHD_CONFIG_GENERATED``).
"""
from __future__ import annotations
from napalm_openmediavault.openmediavault import OpenMediaVaultDriver
def test_offers_ssh_hardening():
assert callable(getattr(OpenMediaVaultDriver, "harden_ssh_server", None))
def test_writes_only_the_dropin():
assert OpenMediaVaultDriver.SSHD_CONFIG_GENERATED is True
-16
View File
@@ -1,16 +0,0 @@
"""OpenMediaVault writes sshd_config itself, from its own database.
The Linux driver offers to harden the SSH server by writing a drop-in under
/etc/ssh/sshd_config.d (NetOrk/netork#1027). On OMV the next apply of the SSH
settings (``omv-salt deploy run ssh``) would regenerate the configuration and
take the change back without a word, so this driver opts out: netOrk's
capability probe asks ``callable(harden_ssh_server)``.
"""
from __future__ import annotations
from napalm_openmediavault.openmediavault import OpenMediaVaultDriver
def test_does_not_offer_ssh_hardening():
assert not callable(getattr(OpenMediaVaultDriver, "harden_ssh_server", None))