linuxfabrik-lib 4.3.0__tar.gz → 5.0.0__tar.gz

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linuxfabrik-lib
-Version: 4.3.0
+Version: 5.0.0
 Summary: Python libraries used in various Linuxfabrik projects, including the 'Linuxfabrik Monitoring Plugins' project.
 Author-email: "Linuxfabrik GmbH, Zurich, Switzerland" <info@linuxfabrik.ch>
 License: This is free and unencumbered software released into the public domain.
@@ -59,7 +59,6 @@ License-File: LICENSE
 Requires-Dist: beautifulsoup4
 Requires-Dist: httpx[http2]
 Requires-Dist: lxml
-Requires-Dist: netifaces
 Requires-Dist: psutil
 Requires-Dist: pymysql
 Requires-Dist: pypsrp

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/base.py

@@ -11,7 +11,7 @@
 """Provides very common every-day functions."""
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026051002'
+__version__ = '2026061201'
 
 import html
 import numbers
@@ -119,6 +119,9 @@ def cu(msg=None):
     tb = format_exc() if has_traceback else None
 
     if msg is not None:
+        # Normalize line endings to LF (see oao); error output may also carry
+        # CRLF, for example when a Windows command prints its error to stdout.
+        msg = msg.replace('\r\n', '\n').replace('\r', '\n')
         msg = (
             txt.sanitize_sensitive_data(msg).strip().replace('<', "'").replace('>', "'")
         )
@@ -628,6 +631,10 @@ def oao(msg, state=STATE_OK, perfdata='', always_ok=False):
     (and exits with code 2)
 
     """
+    # Normalize line endings to LF. Output captured on Windows (or read from a
+    # file or HTTP response) can carry CRLF or stray CR, which a web UI showing
+    # the output with `white-space: pre-wrap` would render as an extra line break.
+    msg = msg.replace('\r\n', '\n').replace('\r', '\n')
     msg = html.escape(
         txt.sanitize_sensitive_data(msg.strip()),
         quote=False,

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/db_mysql.py

@@ -20,7 +20,7 @@ from .globals import STATE_UNKNOWN
 warnings.filterwarnings('ignore', category=UserWarning, module='pymysql')
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026060201'
+__version__ = '2026061201'
 
 try:
     import pymysql.cursors
@@ -302,7 +302,9 @@ def _align_session_collation(conn):
         # Whitelist identifiers to keep the formatted `SET NAMES` safe from
         # any caller-controlled value (the row comes from a system view, but
         # defence in depth doesn't cost anything).
-        if not (re.match(r'^[A-Za-z0-9_]+$', cs) and re.match(r'^[A-Za-z0-9_]+$', coll)):
+        if not (
+            re.match(r'^[A-Za-z0-9_]+$', cs) and re.match(r'^[A-Za-z0-9_]+$', coll)
+        ):
             return
         with conn.cursor() as cursor:
             cursor.execute(f'set names {cs} collate {coll}')
@@ -541,10 +543,10 @@ def get_server_info(banner=None):
     from . import shell
 
     for command in (
-        'mysqld --version',
-        'mariadbd --version',
-        'mariadb --version',
-        'mysql --version',
+        ['mysqld', '--version'],
+        ['mariadbd', '--version'],
+        ['mariadb', '--version'],
+        ['mysql', '--version'],
     ):
         success, result = shell.shell_exec(command)
         if not success:

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/disk.py

@@ -13,7 +13,7 @@ partitions, grepping a file, etc.
 """
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026060601'
+__version__ = '2026061201'
 
 import csv
 import os
@@ -693,6 +693,36 @@ def rm_file(filename):
         return False, f'Unknown error deleting {filename}: {e}'
 
 
+def shorten_path(path):
+    """
+    Shorten a path for display.
+
+    Abbreviate a slash-separated path by reducing every component except the last one to its
+    first character, the way the zsh prompt shortens a long working directory. The last
+    component is kept in full because it usually carries the identifying information. This is
+    a pure string transformation; the path is not resolved and the filesystem is not touched.
+
+    ### Parameters
+    - **path** (`str`): A slash-separated path, for example `/etc/pki/tls/certs/002c0b4f.0`.
+
+    ### Returns
+    - **str**: The abbreviated path, for example `/e/p/t/c/002c0b4f.0`. A value without a
+      slash (a bare basename, an empty string, a sentinel like `-`) is returned unchanged.
+
+    ### Example
+    >>> shorten_path('/etc/pki/tls/certs/002c0b4f.0')
+    '/e/p/t/c/002c0b4f.0'
+
+    >>> shorten_path('index.php')
+    'index.php'
+    """
+    if not path or '/' not in path:
+        return path
+    head, _, tail = path.rpartition('/')
+    abbrev = '/'.join(part[:1] for part in head.split('/'))
+    return f'{abbrev}/{tail}'
+
+
 def udevadm(device, _property):
     """
     Run `udevadm info` and extract a specific property manually.
@@ -717,7 +747,14 @@ def udevadm(device, _property):
     >>> udevadm('/dev/linuxfabrik', 'DEVNAME')
     ''
     """
-    success, result = shell.shell_exec(f'udevadm info --query=property --name={device}')
+    # Only query real device nodes under /dev. Resolving the path first defends
+    # against a crafted `device` that points elsewhere or smuggles arguments.
+    device = os.path.realpath(device)
+    if not device.startswith('/dev/'):
+        return ''
+    success, result = shell.shell_exec(
+        ['udevadm', 'info', '--query=property', f'--name={device}']
+    )
     if not success:
         return ''
     stdout, _, _ = result

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/distro.py

@@ -17,15 +17,13 @@ Source Code is taken, converted, shortened and modified from:
 """
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2025061001'
+__version__ = '2026061201'
 
 
 import os
 import platform
 import re
 
-from . import shell
-
 # --- Static mappings ---
 
 OSDIST_LIST = (
@@ -430,15 +428,22 @@ def get_distribution_facts():
     distro = facts.get('distribution_file_variety', 'distribution')
     facts['os_family'] = _map_os_family(distro)  # returns 'RedHat', for example
 
-    # hardcoded command, no user input; shell=True needed to source the file
-    cmd = '. /etc/os-release && echo "$NAME $VERSION"'
-    success, result = shell.shell_exec(cmd, shell=True)  # nosec B604
-    if not success:
+    # read NAME and VERSION from /etc/os-release
+    values = {}
+    try:
+        with open('/etc/os-release', encoding='utf-8') as os_release:
+            for line in os_release:
+                line = line.strip()
+                if not line or line.startswith('#') or '=' not in line:
+                    continue
+                key, value = line.split('=', 1)
+                values[key] = value.strip().strip('"').strip("'")
+    except OSError:
         return facts
 
-    stdout, _, _ = result
-    facts['os_info'] = (
-        stdout.strip()
-    )  # returns 'Fedora Linux 41 (Workstation Edition)', for example
+    # returns 'Fedora Linux 41 (Workstation Edition)', for example
+    facts['os_info'] = ' '.join(
+        part for part in (values.get('NAME'), values.get('VERSION')) if part
+    )
 
     return facts

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/dmidecode.py

@@ -14,7 +14,7 @@ Copied and refactored from py-dmidecode (https://github.com/zaibon/py-dmidecode)
 """
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026060201'
+__version__ = '2026061201'
 
 import re
 
@@ -511,7 +511,7 @@ def get_data():
         ...
     }
     """
-    success, result = shell.shell_exec('sudo dmidecode')
+    success, result = shell.shell_exec(['sudo', 'dmidecode'])
     if not success:
         return False
 

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/endoflifedate.py

@@ -15,11 +15,11 @@ Internet."""
 # pylint: disable=C0302
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026060201'  # adapt this if something in this script changed fundamentally
+__version__ = '2026061001'  # adapt this if something in this script changed fundamentally
 
 ENDOFLIFE_DATE = {
 
-    'https://endoflife.date/api/apache.json': [
+    'https://endoflife.date/api/apache-http-server.json': [
     {   'cycle': '2.4',
         'eol': False,
         'latest': '2.4.67',
@@ -503,22 +503,22 @@ ENDOFLIFE_DATE = {
     'https://endoflife.date/api/gitlab.json': [
     {   'cycle': '19.0',
         'eol': '2026-08-20',
-        'latest': '19.0.1',
-        'latestReleaseDate': '2026-05-26',
+        'latest': '19.0.2',
+        'latestReleaseDate': '2026-06-10',
         'lts': False,
         'releaseDate': '2026-05-21',
         'support': '2026-06-18'},
     {   'cycle': '18.11',
         'eol': '2026-07-16',
-        'latest': '18.11.4',
-        'latestReleaseDate': '2026-05-26',
+        'latest': '18.11.5',
+        'latestReleaseDate': '2026-06-10',
         'lts': False,
         'releaseDate': '2026-04-16',
         'support': '2026-05-21'},
     {   'cycle': '18.10',
         'eol': '2026-06-18',
-        'latest': '18.10.7',
-        'latestReleaseDate': '2026-05-26',
+        'latest': '18.10.8',
+        'latestReleaseDate': '2026-06-10',
         'lts': False,
         'releaseDate': '2026-03-19',
         'support': '2026-04-16'},
@@ -956,7 +956,7 @@ ENDOFLIFE_DATE = {
     {   'cycle': '12.4',
         'eol': '2027-05-24',
         'latest': '12.4.4',
-        'latestReleaseDate': '2026-06-04',
+        'latestReleaseDate': '2026-06-09',
         'lts': False,
         'releaseDate': '2026-02-24',
         'support': '2026-04-17'},
@@ -1927,8 +1927,8 @@ ENDOFLIFE_DATE = {
     'https://endoflife.date/api/matomo.json': [
     {   'cycle': '5',
         'eol': False,
-        'latest': '5.10.1',
-        'latestReleaseDate': '2026-05-29',
+        'latest': '5.11.1',
+        'latestReleaseDate': '2026-06-12',
         'lts': False,
         'releaseDate': '2023-12-18',
         'support': True},
@@ -1964,6 +1964,12 @@ ENDOFLIFE_DATE = {
 
 
     'https://endoflife.date/api/mediawiki.json': [
+    {   'cycle': '1.46',
+        'eol': '2027-05-31',
+        'latest': '1.46.0',
+        'latestReleaseDate': '2026-05-31',
+        'lts': False,
+        'releaseDate': '2026-05-31'},
     {   'cycle': '1.45',
         'eol': '2026-12-31',
         'latest': '1.45.3',
@@ -2291,6 +2297,12 @@ ENDOFLIFE_DATE = {
 
 
     'https://endoflife.date/api/nextcloud.json': [
+    {   'cycle': '34',
+        'eol': '2027-06-30',
+        'latest': '34.0.0',
+        'latestReleaseDate': '2026-06-08',
+        'lts': False,
+        'releaseDate': '2026-06-09'},
     {   'cycle': '33',
         'eol': '2027-02-28',
         'latest': '33.0.5',
@@ -2938,16 +2950,16 @@ ENDOFLIFE_DATE = {
     'https://endoflife.date/api/python.json': [
     {   'cycle': '3.14',
         'eol': '2030-10-31',
-        'latest': '3.14.5',
-        'latestReleaseDate': '2026-05-10',
+        'latest': '3.14.6',
+        'latestReleaseDate': '2026-06-10',
         'lts': False,
         'pep': 'PEP-0745',
         'releaseDate': '2025-10-07',
         'support': '2027-10-01'},
     {   'cycle': '3.13',
         'eol': '2029-10-31',
-        'latest': '3.13.13',
-        'latestReleaseDate': '2026-04-07',
+        'latest': '3.13.14',
+        'latestReleaseDate': '2026-06-10',
         'lts': False,
         'pep': 'PEP-0719',
         'releaseDate': '2024-10-07',
@@ -3267,7 +3279,7 @@ ENDOFLIFE_DATE = {
     ],
 
 
-    'https://endoflife.date/api/rocketchat.json': [
+    'https://endoflife.date/api/rocket-chat.json': [
     {   'cycle': '8.4',
         'eol': '2026-10-31',
         'latest': '8.4.3',

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/lftest.py

@@ -13,12 +13,13 @@
 import contextlib
 import os
 import re
+import shlex
 import tempfile
 
 from . import base, disk, shell
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026060202'
+__version__ = '2026061201'
 
 
 def run(test_instance, plugin, testcase):
@@ -73,8 +74,10 @@ def run(test_instance, plugin, testcase):
     ...             with self.subTest(id=t['id']):
     ...                 lib.lftest.run(self, self.check, t)
     """
+    # params come from the trusted testcase definition; tokenize them the way a
+    # shell would so quoted multi-word values stay intact, then build the argv.
     params = testcase.get('params', '')
-    cmd = f'{plugin} {params} --test={testcase["test"]}'.strip()
+    cmd = [plugin, *shlex.split(params), f'--test={testcase["test"]}']
     stdout, stderr, retc = base.coe(shell.shell_exec(cmd))
 
     test_instance.assertEqual(
@@ -133,7 +136,6 @@ def attach_tests(test_class, tests, plugin_attr='check'):
     ### Example
     >>> class TestCheck(unittest.TestCase):
     ...     check = '../my-plugin'
-    ...
     >>> attach_tests(TestCheck, TESTS)
     >>>
     >>> if __name__ == '__main__':
@@ -157,6 +159,7 @@ def attach_tests(test_class, tests, plugin_attr='check'):
         def _make(captured_testcase):
             def _method(self):
                 run(self, getattr(self, plugin_attr), captured_testcase)
+
             return _method
 
         setattr(test_class, method_name, _make(testcase))
@@ -222,6 +225,7 @@ def attach_each(test_class, items, action, id_func=str):
         def _make(captured_item):
             def _method(self):
                 action(self, captured_item)
+
             return _method
 
         setattr(test_class, method_name, _make(item))
@@ -339,8 +343,7 @@ def run_container(
         from testcontainers.core.wait_strategies import LogMessageWaitStrategy
     except ImportError as e:
         raise RuntimeError(
-            'testcontainers is not installed; run '
-            "`pip install testcontainers`"
+            'testcontainers is not installed; run `pip install testcontainers`'
         ) from e
 
     c = DockerContainer(image)
@@ -456,12 +459,15 @@ def _run_mysql_compatible_resolved(image_ref, command, seed):
             # in favour of `mariadb`; sclorg c10s ships both; MySQL
             # ships `mysql` only. Prefer `mariadb`, fall back to
             # `mysql` so all flavours work.
-            container.exec([
-                'sh', '-c',
-                'if command -v mariadb >/dev/null 2>&1; then CLIENT=mariadb; '
-                'else CLIENT=mysql; fi; '
-                f'"$CLIENT" -utest -ptest test -e "{seed}"',
-            ])
+            container.exec(
+                [
+                    'sh',
+                    '-c',
+                    'if command -v mariadb >/dev/null 2>&1; then CLIENT=mariadb; '
+                    'else CLIENT=mysql; fi; '
+                    f'"$CLIENT" -utest -ptest test -e "{seed}"',
+                ]
+            )
 
         host = container.get_container_host_ip()
         port = container.get_exposed_port(3306)
@@ -574,7 +580,8 @@ def run_mysql_compatible_from_containerfile(
     ... ) as (container, defaults_file):
     ...     result = subprocess.run(
     ...         ['python3', '../mysql-traffic', f'--defaults-file={defaults_file}'],
-    ...         capture_output=True, text=True,
+    ...         capture_output=True,
+    ...         text=True,
     ...     )
     """
     try:
@@ -592,6 +599,8 @@ def run_mysql_compatible_from_containerfile(
     dockerfile_name = os.path.basename(abspath)
     tag = f'lfmp-mysql-{dockerfile_name}'.lower().replace('_', '-')
 
+    # No parenthesized context managers: they are Python 3.10+ syntax and break
+    # parsing on RHEL 8's default Python 3.6.
     with (
         DockerImage(
             path=build_dir,
@@ -600,7 +609,9 @@ def run_mysql_compatible_from_containerfile(
             clean_up=False,
         ) as image,
         _run_mysql_compatible_resolved(
-            str(image.tag), command, seed,
+            str(image.tag),
+            command,
+            seed,
         ) as result,
     ):
         yield result

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/linuxfabrik_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linuxfabrik-lib
-Version: 4.3.0
+Version: 5.0.0
 Summary: Python libraries used in various Linuxfabrik projects, including the 'Linuxfabrik Monitoring Plugins' project.
 Author-email: "Linuxfabrik GmbH, Zurich, Switzerland" <info@linuxfabrik.ch>
 License: This is free and unencumbered software released into the public domain.
@@ -59,7 +59,6 @@ License-File: LICENSE
 Requires-Dist: beautifulsoup4
 Requires-Dist: httpx[http2]
 Requires-Dist: lxml
-Requires-Dist: netifaces
 Requires-Dist: psutil
 Requires-Dist: pymysql
 Requires-Dist: pypsrp

{linuxfabrik_lib-4.3.0 → linuxfabrik_lib-5.0.0}/linuxfabrik_lib.egg-info/requires.txt

@@ -1,7 +1,6 @@
 beautifulsoup4
 httpx[http2]
 lxml
-netifaces
 psutil
 pymysql
 pypsrp