From 8218081f5882bd25814bb9d6ef85b2278b7adf1b Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 25 Feb 2025 06:19:51 +0100 Subject: [PATCH 1/4] fix loglevel --- radicale/auth/pam.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radicale/auth/pam.py b/radicale/auth/pam.py index 84cacb82..02727c85 100644 --- a/radicale/auth/pam.py +++ b/radicale/auth/pam.py @@ -49,7 +49,7 @@ class Auth(auth.BaseAuth): if (self._group_membership): logger.info("auth.pam_group_membership: %s" % self._group_membership) else: - logger.info("auth.pam_group_membership: (empty, nothing to check / INSECURE)") + logger.warning("auth.pam_group_membership: (empty, nothing to check / INSECURE)") def pam_authenticate(self, *args, **kwargs): return self.pam.authenticate(*args, **kwargs) From 50f5d2e5ef3fc1b40200eeec294b84d5ea22e6d2 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 25 Feb 2025 06:20:03 +0100 Subject: [PATCH 2/4] extend copyright --- radicale/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radicale/utils.py b/radicale/utils.py index a75e5089..2d7210ac 100644 --- a/radicale/utils.py +++ b/radicale/utils.py @@ -2,7 +2,7 @@ # Copyright © 2014 Jean-Marc Martins # Copyright © 2012-2017 Guillaume Ayoub # Copyright © 2017-2018 Unrud -# Copyright © 2024-2024 Peter Bieringer +# Copyright © 2024-2025 Peter Bieringer # # This library is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by From 9b671becebcb90fcb8eb2ffe4d5946526df9f669 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 25 Feb 2025 06:20:14 +0100 Subject: [PATCH 3/4] extend module list to display version on start --- radicale/utils.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/radicale/utils.py b/radicale/utils.py index 2d7210ac..87836a65 100644 --- a/radicale/utils.py +++ b/radicale/utils.py @@ -27,7 +27,13 @@ from radicale.log import logger _T_co = TypeVar("_T_co", covariant=True) -RADICALE_MODULES: Sequence[str] = ("radicale", "vobject", "passlib", "defusedxml") +RADICALE_MODULES: Sequence[str] = ("radicale", "vobject", "passlib", "defusedxml", + "dateutil", + "bcrypt", + "pika", + "ldap", + "ldap3", + "pam") def load_plugin(internal_types: Sequence[str], module_name: str, @@ -58,7 +64,13 @@ def packages_version(): versions = [] versions.append("python=%s.%s.%s" % (sys.version_info[0], sys.version_info[1], sys.version_info[2])) for pkg in RADICALE_MODULES: - versions.append("%s=%s" % (pkg, package_version(pkg))) + try: + versions.append("%s=%s" % (pkg, package_version(pkg))) + except Exception: + try: + versions.append("%s=%s" % (pkg, package_version("python-" + pkg))) + except Exception: + versions.append("%s=%s" % (pkg, "n/a")) return " ".join(versions) From 0b5dd82109e403783cad3ce35ca5d8d27adf6fab Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 25 Feb 2025 06:21:15 +0100 Subject: [PATCH 4/4] extend changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c201fe4..5b86d183 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Test: skip bcrypt related tests if module is missing * Improve: relax mtime check on storage filesystem, change test file location to "collection-root" directory * Add: option [auth] type pam by code migration from v1, add new option pam_serivce +* Cosmetics: extend list of used modules with their version on startup ## 3.4.1 * Add: option [auth] dovecot_connection_type / dovecot_host / dovecot_port