bn8/python-mylib
1
0
Fork 0
Code Issues Pull requests Actions Projects Releases 12 Wiki Activity

LdapClient.get_changes(): properly handle attributes with empty value

Browse source
This commit is contained in:
Benjamin Renard 2023-05-03 11:33:19 +02:00
parent ebd73812bc
commit 72877dd13e
Signed by: bn8
GPG key ID: 3E2E1CE1907115BC
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mylib/ldap.py
View file

@ -782,21 +782,23 @@ class LdapClient:
protected_attrs = [a.lower() for a in protected_attrs or []] protected_attrs = [a.lower() for a in protected_attrs or []]
protected_attrs.append("dn") protected_attrs.append("dn")
# New/updated attributes # New/updated attributes
for attr in attrs: for attr, values in attrs.items():
if protected_attrs and attr.lower() in protected_attrs: if protected_attrs and attr.lower() in protected_attrs:
continue continue
if attr in ldap_obj and ldap_obj[attr]: if attr in ldap_obj and ldap_obj[attr]:
if sorted(ldap_obj[attr]) == sorted(attrs[attr]): if sorted(ldap_obj[attr]) == sorted(values):
continue continue
old[attr] = self.encode(ldap_obj[attr]) old[attr] = self.encode(ldap_obj[attr])
new[attr] = self.encode(attrs[attr]) elif not values:
continue
new[attr] = self.encode(values)
# Deleted attributes # Deleted attributes
for attr in ldap_obj: for attr in ldap_obj:
if ( if (
(not protected_attrs or attr.lower() not in protected_attrs) (not protected_attrs or attr.lower() not in protected_attrs)
and ldap_obj[attr] and ldap_obj[attr]
and attr not in attrs and not attrs.get(attr)
): ):
old[attr] = self.encode(ldap_obj[attr]) old[attr] = self.encode(ldap_obj[attr])
if old == new: if old == new: