Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

LDAP auth: align values when logging config options

Browse Source 
In addition, log 'ldap_ssl_verify_mode' and 'ldap_ssl_ca_file' unconditionally.
This commit is contained in:
Peter Marschall
2025-09-28 10:24:20 +02:00
parent 44c64d70f5
commit b6ee3b6991
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
radicale/auth/ldap.py
View File

@@ -134,28 +134,28 @@ class Auth(auth.BaseAuth):
else: else:
logger.info("auth.ldap_user_attribute : (not provided)") logger.info("auth.ldap_user_attribute : (not provided)")
if self._ldap_groups_attr: if self._ldap_groups_attr:
logger.info("auth.ldap_groups_attribute: %r" % self._ldap_groups_attr) logger.info("auth.ldap_groups_attribute : %r" % self._ldap_groups_attr)
else: else:
logger.info("auth.ldap_groups_attribute: (not provided)") logger.info("auth.ldap_groups_attribute : (not provided)")
if self._ldap_group_base: if self._ldap_group_base:
logger.info("auth.ldap_group_base : %r" % self._ldap_group_base) logger.info("auth.ldap_group_base : %r" % self._ldap_group_base)
else: else:
logger.info("auth.ldap_group_base : (not provided, using ldap_base)") logger.info("auth.ldap_group_base : (not provided, using ldap_base)")
self._ldap_group_base = self._ldap_base self._ldap_group_base = self._ldap_base
if self._ldap_group_filter: if self._ldap_group_filter:
logger.info("auth.ldap_group_filter: %r" % self._ldap_group_filter) logger.info("auth.ldap_group_filter : %r" % self._ldap_group_filter)
else: else:
logger.info("auth.ldap_group_filter: (not provided)") logger.info("auth.ldap_group_filter : (not provided)")
if self._ldap_group_members_attr: if self._ldap_group_members_attr:
logger.info("auth.ldap_group_members_attr: %r" % self._ldap_group_members_attr) logger.info("auth.ldap_group_members_attr: %r" % self._ldap_group_members_attr)
else: else:
logger.info("auth.ldap_group_members_attr: (not provided)") logger.info("auth.ldap_group_members_attr: (not provided)")
if ldap_secret_file_path: if ldap_secret_file_path:
logger.info("auth.ldap_secret_file_path: %r" % ldap_secret_file_path) logger.info("auth.ldap_secret_file_path : %r" % ldap_secret_file_path)
if self._ldap_secret: if self._ldap_secret:
logger.info("auth.ldap_secret : (from file)") logger.info("auth.ldap_secret : (from file)")
else: else:
logger.info("auth.ldap_secret_file_path: (not provided)") logger.info("auth.ldap_secret_file_path : (not provided)")
if self._ldap_secret: if self._ldap_secret:
logger.info("auth.ldap_secret : (from config)") logger.info("auth.ldap_secret : (from config)")
if self._ldap_reader_dn and not self._ldap_secret: if self._ldap_reader_dn and not self._ldap_secret:
@@ -163,7 +163,6 @@ class Auth(auth.BaseAuth):
raise RuntimeError("LDAP authentication requires ldap_secret for ldap_reader_dn") raise RuntimeError("LDAP authentication requires ldap_secret for ldap_reader_dn")
logger.info("auth.ldap_use_ssl : %s" % ldap_use_ssl) logger.info("auth.ldap_use_ssl : %s" % ldap_use_ssl)
logger.info("auth.ldap_security : %s" % self._ldap_security) logger.info("auth.ldap_security : %s" % self._ldap_security)
if self._ldap_security in ("tls", "starttls"):
logger.info("auth.ldap_ssl_verify_mode : %s" % self._ldap_ssl_verify_mode) logger.info("auth.ldap_ssl_verify_mode : %s" % self._ldap_ssl_verify_mode)
if self._ldap_ssl_ca_file: if self._ldap_ssl_ca_file:
logger.info("auth.ldap_ssl_ca_file : %r" % self._ldap_ssl_ca_file) logger.info("auth.ldap_ssl_ca_file : %r" % self._ldap_ssl_ca_file)