feat(packages): the rpm epoch in the version, and the installed advisories
driver / standard (pull_request) Failing after 15s
driver / lint (pull_request) Successful in 13s
driver / test (3.12) (pull_request) Failing after 39s
driver / types (pull_request) Failing after 47s
driver / test (3.13) (pull_request) Failing after 39s
driver / lowest (pull_request) Failing after 46s
driver / build (pull_request) Successful in 42s
driver / security (pull_request) Successful in 1m25s
CI / driver (pull_request) Failing after 2m35s
driver / publish (pull_request) Skipped
driver / standard (pull_request) Failing after 15s
driver / lint (pull_request) Successful in 13s
driver / test (3.12) (pull_request) Failing after 39s
driver / types (pull_request) Failing after 47s
driver / test (3.13) (pull_request) Failing after 39s
driver / lowest (pull_request) Failing after 46s
driver / build (pull_request) Successful in 42s
driver / security (pull_request) Successful in 1m25s
CI / driver (pull_request) Failing after 2m35s
driver / publish (pull_request) Skipped
On an rpm host a package's version now carries its epoch where it has one (1:6.2.0-13.el9), as on a dpkg host: Oracle's and Red Hat's fixes name it, and without it an epoch-1 fix read as newer than every installed build. get_installed_advisory_cves() reads, as root and from the cache, the CVEs the installed security advisories close, through napalm-device-types 4.37.0; dnf only (NetOrk/netork#2394).
This commit is contained in:
1 parent
235c1e9a91
commit
257efdef8e
4 files changed
+108
-2
No files matched your search
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- `get_installed_advisory_cves()` through napalm-device-types' `UpdateMixin` (4.37.0): the
|
||||||
|
CVEs a dnf host's installed security advisories close, per package, read as root from
|
||||||
|
the cache. netOrk reads it where its knowledge base holds no records of the host's
|
||||||
|
release (NetOrk/netork#2394). dnf only; other package managers raise
|
||||||
|
`NotImplementedError`.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- On an rpm host a package's version carries its epoch where it has one
|
||||||
|
(`1:6.2.0-13.el9`), as on a dpkg host. Oracle's and Red Hat's fixes name it, and without
|
||||||
|
it an epoch-1 fix read as newer than every installed build (NetOrk/netork#2394).
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
- `get_time_sync()` and `configure_time_sync()` through napalm-device-types'
|
- `get_time_sync()` and `configure_time_sync()` through napalm-device-types'
|
||||||
`PosixTimeSyncMixin` (4.35.0): the host's NTP servers in its client's order, its time zone,
|
`PosixTimeSyncMixin` (4.35.0): the host's NTP servers in its client's order, its time zone,
|
||||||
|
|||||||
+32
-1
@@ -27,6 +27,7 @@ from napalm.base.exceptions import ConnectionClosedException, ConnectionExceptio
|
|||||||
from napalm.base.netmiko_helpers import netmiko_args
|
from napalm.base.netmiko_helpers import netmiko_args
|
||||||
from napalm_device_types import (
|
from napalm_device_types import (
|
||||||
APT_UPGRADABLE_COMMAND,
|
APT_UPGRADABLE_COMMAND,
|
||||||
|
DNF_INSTALLED_CVES_COMMAND,
|
||||||
DNF_SECURITY_COMMAND,
|
DNF_SECURITY_COMMAND,
|
||||||
LLDPCTL_KEYVALUE_COMMAND,
|
LLDPCTL_KEYVALUE_COMMAND,
|
||||||
AptProxyMixin,
|
AptProxyMixin,
|
||||||
@@ -51,6 +52,7 @@ from napalm_device_types import (
|
|||||||
lldp_neighbors,
|
lldp_neighbors,
|
||||||
open_stream_on_transport,
|
open_stream_on_transport,
|
||||||
parse_apt_upgradable,
|
parse_apt_upgradable,
|
||||||
|
parse_dnf_installed_cves,
|
||||||
parse_dnf_security,
|
parse_dnf_security,
|
||||||
parse_lldpctl_keyvalue,
|
parse_lldpctl_keyvalue,
|
||||||
run_fix_steps,
|
run_fix_steps,
|
||||||
@@ -1138,9 +1140,16 @@ class LinuxDriver(
|
|||||||
return parse_dpkg_query(self._send(DPKG_QUERY_COMMAND))
|
return parse_dpkg_query(self._send(DPKG_QUERY_COMMAND))
|
||||||
|
|
||||||
def _get_packages_rpm(self) -> list[PackageDict]:
|
def _get_packages_rpm(self) -> list[PackageDict]:
|
||||||
|
"""``rpm -qa``, the version as ``[epoch:]version-release``, as dpkg writes it.
|
||||||
|
|
||||||
|
The epoch is there only where the package has one: Oracle's and Red Hat's
|
||||||
|
fixes name it (``1:6.2.0-13.el9``), and without it an epoch-1 fix reads as
|
||||||
|
newer than every installed build (NetOrk/netork#2394).
|
||||||
|
"""
|
||||||
out = self._send(
|
out = self._send(
|
||||||
"rpm -qa --queryformat "
|
"rpm -qa --queryformat "
|
||||||
"'%{NAME}\\t%{VERSION}-%{RELEASE}\\t%{SIZE}\\t%{SUMMARY}\\n' 2>/dev/null"
|
"'%{NAME}\\t%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\t%{SIZE}\\t%{SUMMARY}\\n'"
|
||||||
|
" 2>/dev/null"
|
||||||
)
|
)
|
||||||
packages: list[PackageDict] = []
|
packages: list[PackageDict] = []
|
||||||
for line in out.splitlines():
|
for line in out.splitlines():
|
||||||
@@ -1477,6 +1486,28 @@ class LinuxDriver(
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def get_installed_advisory_cves(self) -> dict[str, list[str]]:
|
||||||
|
"""The CVEs the installed security advisories close, per package (dnf 4).
|
||||||
|
|
||||||
|
As root, from the cache, as the security read does: root's cache is the one
|
||||||
|
the host's own updates keep. The output is long (90 000 lines on an Oracle
|
||||||
|
Linux 9 host), so it gets a longer budget; netOrk reads it only where its
|
||||||
|
knowledge base holds no records of the release (NetOrk/netork#2394).
|
||||||
|
|
||||||
|
:raises NotImplementedError: on any package manager but dnf.
|
||||||
|
:raises ValueError: when dnf failed or its output was cut short.
|
||||||
|
"""
|
||||||
|
if self._pkg_manager != "dnf":
|
||||||
|
raise NotImplementedError(
|
||||||
|
f"Installed advisories are not read for {self._pkg_manager!r}"
|
||||||
|
)
|
||||||
|
cmd = DNF_INSTALLED_CVES_COMMAND
|
||||||
|
output, status = _split_status(self._run_privileged(f"{cmd}; echo {_RC_MARKER}$?", 300))
|
||||||
|
if status != 0:
|
||||||
|
hint = f"\n{_SUDO_PASSWORD_HINT}" if "password is required" in output else ""
|
||||||
|
raise RuntimeError(f"dnf updateinfo failed (exit {status}): {output[-200:]}{hint}")
|
||||||
|
return parse_dnf_installed_cves(output)
|
||||||
|
|
||||||
def refresh_available_updates(self) -> dict[str, Any]:
|
def refresh_available_updates(self) -> dict[str, Any]:
|
||||||
"""Refresh the package index (apt-get update, dnf makecache, apk update)."""
|
"""Refresh the package index (apt-get update, dnf makecache, apk update)."""
|
||||||
cmd = _REFRESH.get(self._pkg_manager or "")
|
cmd = _REFRESH.get(self._pkg_manager or "")
|
||||||
|
|||||||
+1
-1
@@ -34,7 +34,7 @@ classifiers = [
|
|||||||
]
|
]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"napalm>=4.0",
|
"napalm>=4.0",
|
||||||
"napalm-device-types>=4.35.0",
|
"napalm-device-types>=4.37.0",
|
||||||
"netmiko>=4.0.0",
|
"netmiko>=4.0.0",
|
||||||
"paramiko>=5.0.0", # CVE-2026-44405
|
"paramiko>=5.0.0", # CVE-2026-44405
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import re
|
|||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
from napalm_device_types import DNF_INSTALLED_CVES_COMMAND
|
||||||
|
|
||||||
from napalm_linux._routes import IpRoute, parse_ip_route
|
from napalm_linux._routes import IpRoute, parse_ip_route
|
||||||
from napalm_linux.linux import (
|
from napalm_linux.linux import (
|
||||||
@@ -2591,3 +2592,65 @@ class TestIpv6NextHops:
|
|||||||
out = "10.50.0.0/16 via inet 192.0.2.1 dev eth0\n"
|
out = "10.50.0.0/16 via inet 192.0.2.1 dev eth0\n"
|
||||||
|
|
||||||
assert [r.nexthop for r in parse_ip_route(out, "ipv4")] == ["192.0.2.1"]
|
assert [r.nexthop for r in parse_ip_route(out, "ipv4")] == ["192.0.2.1"]
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# get_packages (rpm) and the installed advisories (NetOrk/netork#2394)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# rpm -qa on Oracle Linux 9.8 (aarch64): gmp and openssl carry epoch 1.
|
||||||
|
RPM_QA = (
|
||||||
|
"glibc-common\t2.34-284.0.1.el9_8.4\t1210460\tCommon binaries and locale data for glibc\n"
|
||||||
|
"gmp\t1:6.2.0-13.el9\t805146\tA GNU arbitrary precision library\n"
|
||||||
|
"openssl\t1:3.5.8-2.0.1.el9_8\t2106925\tUtilities from the general purpose cryptography library\n"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestRpmPackages:
|
||||||
|
def test_the_version_carries_the_epoch_where_the_package_has_one(self, driver):
|
||||||
|
"""Oracle's and Red Hat's fixes name it (`1:6.2.0-13.el9`); without it an
|
||||||
|
epoch-1 fix reads as newer than every installed build."""
|
||||||
|
driver._pkg_manager = "dnf"
|
||||||
|
with patch.object(driver, "_send", return_value=RPM_QA) as send:
|
||||||
|
pkgs = {p["name"]: p for p in driver.get_packages()}
|
||||||
|
|
||||||
|
assert "%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}" in send.call_args.args[0]
|
||||||
|
assert pkgs["gmp"]["version"] == "1:6.2.0-13.el9"
|
||||||
|
assert pkgs["openssl"]["version"] == "1:3.5.8-2.0.1.el9_8"
|
||||||
|
assert pkgs["glibc-common"]["version"] == "2.34-284.0.1.el9_8.4"
|
||||||
|
assert pkgs["glibc-common"]["source"] == "dnf"
|
||||||
|
assert pkgs["glibc-common"]["size"] == 1210460
|
||||||
|
|
||||||
|
|
||||||
|
class TestInstalledAdvisoryCves:
|
||||||
|
def test_dnf_reads_the_installed_advisories_as_root(self, driver):
|
||||||
|
driver._pkg_manager = "dnf"
|
||||||
|
driver._device.send_command.side_effect = [
|
||||||
|
"0", # id -u
|
||||||
|
(
|
||||||
|
"CVE-2023-4911 Important/Sec. glibc-common-2.34-60.0.3.el9_2.7.aarch64\n"
|
||||||
|
"CVE-2023-38545 Important/Sec. curl-7.76.1-26.el9_3.2.aarch64\n"
|
||||||
|
"__DNF_RC=0\n__NETORK_RC=0"
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
assert driver.get_installed_advisory_cves() == {
|
||||||
|
"glibc-common": ["CVE-2023-4911"],
|
||||||
|
"curl": ["CVE-2023-38545"],
|
||||||
|
}
|
||||||
|
sent = driver._device.send_command.call_args.args[0]
|
||||||
|
assert DNF_INSTALLED_CVES_COMMAND in sent
|
||||||
|
|
||||||
|
def test_a_failed_dnf_raises_instead_of_reading_as_nothing_installed(self, driver):
|
||||||
|
driver._pkg_manager = "dnf"
|
||||||
|
driver._device.send_command.side_effect = ["0", "__DNF_RC=1\n__NETORK_RC=0"]
|
||||||
|
|
||||||
|
with pytest.raises(ValueError, match="exit status 1"):
|
||||||
|
driver.get_installed_advisory_cves()
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("manager", ["yum", "apt", "apk", "pacman"])
|
||||||
|
def test_other_package_managers_keep_no_such_advisories(self, driver, manager):
|
||||||
|
driver._pkg_manager = manager
|
||||||
|
|
||||||
|
with pytest.raises(NotImplementedError):
|
||||||
|
driver.get_installed_advisory_cves()
|
||||||
Reference in new issue
Block a user