oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-08-04 18:22:26 +00:00
Code Wiki Activity

Add missed for loop to set gdns

Browse source
This commit is contained in:
Dipl. Ing. Péter Varkoly 2025-07-23 11:36:21 +02:00
parent e4ce9bad4e
commit aced3522dc
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radicale/auth/ldap.py
View file

@ -180,6 +180,7 @@ class Auth(auth.BaseAuth):
user_dn = user_entry[0] user_dn = user_entry[0]
logger.debug(f"_login2 found LDAP user DN {user_dn}") logger.debug(f"_login2 found LDAP user DN {user_dn}")
if self._ldap_group_members_attr: if self._ldap_group_members_attr:
"""Collect groups from the member or uniqueMember attributes"""
res = conn.search_s( res = conn.search_s(
self._ldap_group_base, self._ldap_group_base,
self.ldap.SCOPE_SUBTREE, self.ldap.SCOPE_SUBTREE,
@ -189,6 +190,8 @@ class Auth(auth.BaseAuth):
self.ldap.filter.escape_filter_chars(user_dn)), self.ldap.filter.escape_filter_chars(user_dn)),
attrlist=self._ldap_attributes attrlist=self._ldap_attributes
) )
for group in res:
gdns.append(group[0])
"""Close LDAP connection""" """Close LDAP connection"""
conn.unbind() conn.unbind()
except Exception as e: except Exception as e:
@ -277,6 +280,7 @@ class Auth(auth.BaseAuth):
user_entry = conn.response[0] user_entry = conn.response[0]
user_dn = user_entry['dn'] user_dn = user_entry['dn']
if self._ldap_group_members_attr: if self._ldap_group_members_attr:
"""Collect groups from the member or uniqueMember attributes"""
conn.search( conn.search(
search_base=self._ldap_group_base, search_base=self._ldap_group_base,
search_filter="(&{0}({1}={2}))".format( search_filter="(&{0}({1}={2}))".format(
@ -302,10 +306,10 @@ class Auth(auth.BaseAuth):
if not conn.bind(): if not conn.bind():
logger.debug(f"_login3 user '{login}' cannot be found") logger.debug(f"_login3 user '{login}' cannot be found")
return "" return ""
tmp: list[str] = []
"""Let's collect the groups of the user.""" """Let's collect the groups of the user."""
if self._ldap_groups_attr: if self._ldap_groups_attr:
gdns = user_entry['attributes'][self._ldap_groups_attr] gdns = user_entry['attributes'][self._ldap_groups_attr]
tmp: list[str] = []
for g in gdns: for g in gdns:
"""Get group g's RDN's attribute value""" """Get group g's RDN's attribute value"""
try: try: