globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

fix: User group deletion without reading User.groups with LDAP backend

Browse source
This commit is contained in:
Éloi Rivard 2024-05-12 22:28:32 +02:00
parent 4791d27569
commit 5beee67a61
No known key found for this signature in database
GPG key ID: 7EDA204EA57DD184
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
canaille/backends/ldap/ldapobject.py
View file

@ -112,11 +112,11 @@ class LDAPObject(BackendModel, metaclass=LDAPObjectMetaclass):
name in self.changes or name in self.state name in self.changes or name in self.state
) )
def get_ldap_attribute(self, name): def get_ldap_attribute(self, name, lookup_changes=True, lookup_state=True):
if name in self.changes: if name in self.changes and lookup_changes:
return self.changes[name] return self.changes[name]
if not self.state.get(name): if not self.state.get(name) or not lookup_state:
return None return None
# Lazy conversion from ldap format to python format # Lazy conversion from ldap format to python format

7
canaille/backends/ldap/models.py
View file

@ -51,11 +51,8 @@ class User(canaille.core.models.User, LDAPObject):
# The LDAP attribute memberOf cannot directly be edited, # The LDAP attribute memberOf cannot directly be edited,
# so this is needed to update the Group.member attribute # so this is needed to update the Group.member attribute
# instead. # instead.
old_groups = self.state.get(group_attr) or [] old_groups = self.get_ldap_attribute(group_attr, lookup_changes=False) or []
new_groups = [ new_groups = self.get_ldap_attribute(group_attr, lookup_state=False) or []
value if isinstance(value, Group) else Group.get(value)
for value in self.changes[group_attr]
]
to_add = set(new_groups) - set(old_groups) to_add = set(new_groups) - set(old_groups)
to_del = set(old_groups) - set(new_groups) to_del = set(old_groups) - set(new_groups)
del self.changes[group_attr] del self.changes[group_attr]

9
tests/core/test_groups.py
View file

@ -3,6 +3,15 @@ from canaille.core.populate import fake_groups
from canaille.core.populate import fake_users from canaille.core.populate import fake_users
def test_delete_group(testclient, backend, user, admin, foo_group):
foo_group.members = [user, admin]
backend.save(foo_group)
user = backend.get(models.User, user.id)
user.groups = []
backend.save(user)
def test_no_group(app, backend): def test_no_group(app, backend):
assert backend.query(models.Group) == [] assert backend.query(models.Group) == []