oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-15 20:36:55 +00:00
Code Wiki Activity

LDAP auth: decode UTF-8 byte sequences to strings only if necessary

Browse source
This commit is contained in:
Peter Marschall 2025-09-07 14:38:56 +02:00
parent cde4c5f2e8
commit 9eb9556536
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
radicale/auth/ldap.py
View file

@ -234,8 +234,9 @@ class Auth(auth.BaseAuth):
conn.simple_bind_s(user_dn, password) conn.simple_bind_s(user_dn, password)
if self._ldap_user_attr: if self._ldap_user_attr:
if user_entry[1][self._ldap_user_attr]: if user_entry[1][self._ldap_user_attr]:
tmplogin = user_entry[1][self._ldap_user_attr][0] login = user_entry[1][self._ldap_user_attr][0]
login = tmplogin.decode('utf-8') if isinstance(login, bytes):
login = login.decode('utf-8')
logger.debug(f"_login2 user set to: '{login}'") logger.debug(f"_login2 user set to: '{login}'")
"""Get RDNs of groups' DNs""" """Get RDNs of groups' DNs"""
@ -245,7 +246,9 @@ class Auth(auth.BaseAuth):
rdns = self.ldap.dn.explode_dn(g, notypes=True) rdns = self.ldap.dn.explode_dn(g, notypes=True)
tmp.append(rdns[0]) tmp.append(rdns[0])
except Exception: except Exception:
tmp.append(g.decode('utf8')) if isinstance(g, bytes):
g = g.decode('utf-8')
tmp.append(g)
self._ldap_groups = set(tmp) self._ldap_groups = set(tmp)
logger.debug("_login2 LDAP groups of user: %s", ",".join(self._ldap_groups)) logger.debug("_login2 LDAP groups of user: %s", ",".join(self._ldap_groups))