linuxfabrik-lib 4.0.0__tar.gz → 4.0.2__tar.gz

{linuxfabrik_lib-4.0.0 → linuxfabrik_lib-4.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linuxfabrik-lib
-Version: 4.0.0
+Version: 4.0.2
 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.

{linuxfabrik_lib-4.0.0 → linuxfabrik_lib-4.0.2}/db_mysql.py

@@ -15,7 +15,7 @@ import warnings
 warnings.filterwarnings('ignore', category=UserWarning, module='pymysql')
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026051101'
+__version__ = '2026051801'
 
 import re
 import sys
@@ -238,6 +238,14 @@ def connect(mysql_connection, **kwargs):
     - If connection fails, the error message contains the reason for failure.
     - `pymysql`'s `read_default_file` and `read_default_group` allow connection settings from a
       `.cnf` file.
+    - After the connection is up, the function aligns the session's character set and collation
+      with the `mysql` system schema (`SET NAMES ... COLLATE ...`). This stops queries against
+      system tables like `mysql.user` and `mysql.global_priv` from aborting with ER 1267
+      ("Illegal mix of collations") when the server's connection-collation default differs from
+      the column collations. On MariaDB 10.4+, `mysql.user` is a view over `mysql.global_priv`
+      whose JSON-derived columns return COERCIBLE results, so a plain `col = 'literal'` compare
+      breaks the moment `collation_connection` and the column collation differ. The alignment
+      is best-effort: on any error the connection stays usable with the server's defaults.
 
     ### Example
     >>> mysql_connection = {
@@ -260,10 +268,48 @@ def connect(mysql_connection, **kwargs):
             connect_timeout=mysql_connection.get('timeout', 3),
             **kwargs,
         )
-        return True, conn
     except Exception as e:
         return False, f'Connecting to DB failed: {e}'
 
+    _align_session_collation(conn)
+    return True, conn
+
+
+def _align_session_collation(conn):
+    """Match `collation_connection` to the `mysql` system schema's default collation.
+
+    Without this, queries that compare a JSON-derived column from the `mysql.user`
+    view (e.g. `IS_ROLE = 'N'`, `plugin = 'mysql_native_password'`) abort with
+    ER 1267 ("Illegal mix of collations") when the server's connection collation
+    default doesn't match the schema's column collation. Looking up the schema's
+    own defaults from `information_schema.schemata` keeps this working across
+    MySQL/MariaDB versions and locale-specific installs (utf8mb3 on older
+    servers, utf8mb4_general_ci on most current ones, utf8mb4_uca1400_ai_ci on
+    MariaDB 10.10+). Best-effort: on any error the connection stays usable.
+    """
+    try:
+        with conn.cursor(pymysql.cursors.DictCursor) as cursor:
+            cursor.execute(
+                'select default_character_set_name as cs, '
+                'default_collation_name as coll '
+                'from information_schema.schemata '
+                "where schema_name = 'mysql'"
+            )
+            row = cursor.fetchone()
+        if not row:
+            return
+        cs = (row.get('cs') or '').strip()
+        coll = (row.get('coll') or '').strip()
+        # 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)):
+            return
+        with conn.cursor() as cursor:
+            cursor.execute(f'set names {cs} collate {coll}')
+    except Exception:
+        pass
+
 
 def get_all_status(conn):
     """

{linuxfabrik_lib-4.0.0 → linuxfabrik_lib-4.0.2}/endoflifedate.py

@@ -1614,8 +1614,8 @@ ENDOFLIFE_DATE = {
     {   'cycle': '11.8',
         'eol': '2028-06-04',
         'extendedSupport': '2033-10-22',
-        'latest': '11.8.6',
-        'latestReleaseDate': '2026-02-04',
+        'latest': '11.8.7',
+        'latestReleaseDate': '2026-05-14',
         'lts': True,
         'releaseDate': '2025-06-04'},
     {   'cycle': '11.7',
@@ -1645,8 +1645,8 @@ ENDOFLIFE_DATE = {
     {   'cycle': '11.4',
         'eol': '2029-05-29',
         'extendedSupport': '2033-01-16',
-        'latest': '11.4.10',
-        'latestReleaseDate': '2026-02-04',
+        'latest': '11.4.11',
+        'latestReleaseDate': '2026-05-14',
         'lts': True,
         'releaseDate': '2024-05-29'},
     {   'cycle': '11.3',
@@ -1684,8 +1684,8 @@ ENDOFLIFE_DATE = {
     {   'cycle': '10.11',
         'eol': '2028-02-16',
         'extendedSupport': '2028-02-16',
-        'latest': '10.11.16',
-        'latestReleaseDate': '2026-02-04',
+        'latest': '10.11.17',
+        'latestReleaseDate': '2026-05-14',
         'lts': True,
         'releaseDate': '2023-02-16'},
     {   'cycle': '10.10',
@@ -1723,8 +1723,8 @@ ENDOFLIFE_DATE = {
     {   'cycle': '10.6',
         'eol': '2026-07-06',
         'extendedSupport': '2029-08-23',
-        'latest': '10.6.25',
-        'latestReleaseDate': '2026-02-04',
+        'latest': '10.6.26',
+        'latestReleaseDate': '2026-05-14',
         'lts': True,
         'releaseDate': '2021-07-06'},
     {   'cycle': '10.5',

{linuxfabrik_lib-4.0.0 → linuxfabrik_lib-4.0.2}/linuxfabrik_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linuxfabrik-lib
-Version: 4.0.0
+Version: 4.0.2
 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.

{linuxfabrik_lib-4.0.0 → linuxfabrik_lib-4.0.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "linuxfabrik-lib"
-version = "4.0.0"
+version = "4.0.2"
 description = "Python libraries used in various Linuxfabrik projects, including the 'Linuxfabrik Monitoring Plugins' project."
 readme = "README.md"
 authors = [

{linuxfabrik_lib-4.0.0 → linuxfabrik_lib-4.0.2}/url.py

@@ -11,7 +11,7 @@
 """Get for example HTML or JSON from an URL."""
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026051003'
+__version__ = '2026051802'
 
 import base64
 import json
@@ -35,13 +35,20 @@ except ImportError:
 from . import txt
 
 
-# stdlib ssl version names; '1.0' first because it is the most permissive minimum
-_TLS_VERSIONS = {
-    '1.0': ssl.TLSVersion.TLSv1,
-    '1.1': ssl.TLSVersion.TLSv1_1,
-    '1.2': ssl.TLSVersion.TLSv1_2,
-    '1.3': ssl.TLSVersion.TLSv1_3,
-}
+# stdlib ssl version names; '1.0' first because it is the most permissive minimum.
+# `ssl.TLSVersion` was added in Python 3.7. Build the dict only when available so
+# `import lib.url` still works on older interpreters (e.g. RHEL 8's default `python3`
+# = 3.6) - any plugin that doesn't actually use TLS version pinning then continues
+# to work. Callers that pass `tls_min` / `tls_max` get a clearer RuntimeError in
+# `_build_ssl_context()` instead of an AttributeError at import time.
+_TLS_VERSIONS = {}
+if hasattr(ssl, 'TLSVersion'):
+    _TLS_VERSIONS = {
+        '1.0': ssl.TLSVersion.TLSv1,
+        '1.1': ssl.TLSVersion.TLSv1_1,
+        '1.2': ssl.TLSVersion.TLSv1_2,
+        '1.3': ssl.TLSVersion.TLSv1_3,
+    }
 
 
 def _redact_url(url):
@@ -59,6 +66,12 @@ def _build_ssl_context(insecure, tls_min, tls_max):
     if insecure:
         ctx.check_hostname = False
         ctx.verify_mode = ssl.CERT_NONE
+    if tls_min is not None or tls_max is not None:
+        if not _TLS_VERSIONS:
+            raise RuntimeError(
+                'TLS version pinning (`tls_min` / `tls_max`) requires Python 3.7+ '
+                '(`ssl.TLSVersion`); this interpreter is too old.'
+            )
     if tls_min is not None:
         if tls_min not in _TLS_VERSIONS:
             raise ValueError(