Merge branch 'old-object-classes' into 'main'

fix: saving an object with the LDAP backend keeps the objectClass un-managed by Canaille

See merge request yaal/canaille!171

CHANGES.rst

@@ -1,3 +1,8 @@
+Fixed
+^^^^^
+
+- Saving an object with the LDAP backend keeps the objectClass un-managed by Canaille. :pr:`171`
+
 [0.0.45] - 2024-04-04
 ---------------------
 

canaille/backends/ldap/ldapobject.py

@@ -424,7 +424,11 @@ class LDAPObject(BackendModel, metaclass=LDAPObjectMetaclass):
     def save(self):
         conn = Backend.get().connection
 
-        self.set_ldap_attribute("objectClass", self.ldap_object_class)
+        current_object_classes = self.get_ldap_attribute("objectClass") or []
+        self.set_ldap_attribute(
+            "objectClass",
+            list(set(self.ldap_object_class) | set(current_object_classes)),
+        )
 
         # PostReadControl allows to read the updated object attributes on creation/edition
         attributes = ["objectClass"] + [

tests/backends/ldap/test_object_class.py

@@ -0,0 +1,97 @@
+from canaille.app import models
+from canaille.backends.ldap.backend import setup_ldap_models
+from canaille.backends.ldap.ldapobject import LDAPObject
+
+
+def test_guess_object_from_dn(backend, testclient, foo_group):
+    foo_group.members = [foo_group]
+    foo_group.save()
+    dn = foo_group.dn
+    g = LDAPObject.get(dn)
+    assert isinstance(g, models.Group)
+    assert g == foo_group
+    assert g.display_name == foo_group.display_name
+
+
+def test_object_class_update(backend, testclient):
+    testclient.app.config["CANAILLE_LDAP"]["USER_CLASS"] = ["inetOrgPerson"]
+    setup_ldap_models(testclient.app.config)
+
+    user1 = models.User(cn="foo1", sn="bar1", user_name="baz1")
+    user1.save()
+
+    assert set(user1.get_ldap_attribute("objectClass")) == {"inetOrgPerson"}
+    assert set(models.User.get(id=user1.id).get_ldap_attribute("objectClass")) == {
+        "inetOrgPerson"
+    }
+
+    testclient.app.config["CANAILLE_LDAP"]["USER_CLASS"] = [
+        "inetOrgPerson",
+        "extensibleObject",
+    ]
+    setup_ldap_models(testclient.app.config)
+
+    user2 = models.User(cn="foo2", sn="bar2", user_name="baz2")
+    user2.save()
+
+    assert set(user2.get_ldap_attribute("objectClass")) == {
+        "inetOrgPerson",
+        "extensibleObject",
+    }
+    assert set(models.User.get(id=user2.id).get_ldap_attribute("objectClass")) == {
+        "inetOrgPerson",
+        "extensibleObject",
+    }
+
+    user1 = models.User.get(id=user1.id)
+    assert user1.get_ldap_attribute("objectClass") == ["inetOrgPerson"]
+
+    user1.save()
+    assert set(user1.get_ldap_attribute("objectClass")) == {
+        "inetOrgPerson",
+        "extensibleObject",
+    }
+    assert set(models.User.get(id=user1.id).get_ldap_attribute("objectClass")) == {
+        "inetOrgPerson",
+        "extensibleObject",
+    }
+
+    user1.delete()
+    user2.delete()
+
+
+def test_keep_old_object_classes(backend, testclient, slapd_server):
+    """When using a populated LDAP database, some objects may have existing
+    objectClass not handled by Canaille.
+
+    In such a case Canaille should keep the unmanaged objectClass and
+    attributes.
+    """
+
+    user = models.User(cn="foo", sn="bar", user_name="baz")
+    user.save()
+
+    ldif = f"""dn: {user.dn}
+changetype: modify
+add: objectClass
+objectClass: posixAccount
+-
+add: uidNumber
+uidNumber: 1000
+-
+add: gidNumber
+gidNumber: 1000
+-
+add: homeDirectory
+homeDirectory: /home/foobar
+"""
+
+    process = slapd_server.ldapmodify(ldif)
+    assert process.returncode == 0
+
+    user.reload()
+
+    # saving an object should not raise a ldap.OBJECT_CLASS_VIOLATION exception
+    user.save()
+
+    user.delete()

tests/backends/ldap/test_utils.py

@@ -8,7 +8,6 @@ from canaille.app import models
 from canaille.app.configuration import ConfigurationException
 from canaille.app.configuration import settings_factory
 from canaille.app.configuration import validate
-from canaille.backends.ldap.backend import setup_ldap_models
 from canaille.backends.ldap.ldapobject import LDAPObject
 from canaille.backends.ldap.ldapobject import python_attrs_to_ldap
 from canaille.backends.ldap.utils import Syntax
@@ -181,63 +180,6 @@ def test_operational_attribute_conversion(backend):
     }
 
 
-def test_guess_object_from_dn(backend, testclient, foo_group):
-    foo_group.members = [foo_group]
-    foo_group.save()
-    dn = foo_group.dn
-    g = LDAPObject.get(dn)
-    assert isinstance(g, models.Group)
-    assert g == foo_group
-    assert g.display_name == foo_group.display_name
-
-
-def test_object_class_update(backend, testclient):
-    testclient.app.config["CANAILLE_LDAP"]["USER_CLASS"] = ["inetOrgPerson"]
-    setup_ldap_models(testclient.app.config)
-
-    user1 = models.User(cn="foo1", sn="bar1", user_name="baz1")
-    user1.save()
-
-    assert user1.get_ldap_attribute("objectClass") == ["inetOrgPerson"]
-    assert models.User.get(id=user1.id).get_ldap_attribute("objectClass") == [
-        "inetOrgPerson"
-    ]
-
-    testclient.app.config["CANAILLE_LDAP"]["USER_CLASS"] = [
-        "inetOrgPerson",
-        "extensibleObject",
-    ]
-    setup_ldap_models(testclient.app.config)
-
-    user2 = models.User(cn="foo2", sn="bar2", user_name="baz2")
-    user2.save()
-
-    assert user2.get_ldap_attribute("objectClass") == [
-        "inetOrgPerson",
-        "extensibleObject",
-    ]
-    assert models.User.get(id=user2.id).get_ldap_attribute("objectClass") == [
-        "inetOrgPerson",
-        "extensibleObject",
-    ]
-
-    user1 = models.User.get(id=user1.id)
-    assert user1.get_ldap_attribute("objectClass") == ["inetOrgPerson"]
-
-    user1.save()
-    assert user1.get_ldap_attribute("objectClass") == [
-        "inetOrgPerson",
-        "extensibleObject",
-    ]
-    assert models.User.get(id=user1.id).get_ldap_attribute("objectClass") == [
-        "inetOrgPerson",
-        "extensibleObject",
-    ]
-
-    user1.delete()
-    user2.delete()
-
-
 def test_ldap_connection_no_remote(testclient, configuration):
     config_obj = settings_factory(configuration)
     config_dict = config_obj.model_dump()