Merge pull request #613 from MultiDirectoryLab/fix_kerberos_entity

fix: ensure case-insensitive object class name checks in DAO

Author: rimu-stack

app/extra/setup_dev.py

@@ -28,7 +28,6 @@
 from ldap_protocol.utils.queries import get_domain_object_class
 from models import (
     Attribute,
-    AttributeType,
     Directory,
     DirectoryMembership,
     Group,
@@ -186,28 +185,6 @@ async def setup_enviroment(
     domain.rdname = ""
 
     async with session.begin_nested():
-        session.add(
-            AttributeType(
-                oid="1.2.3.4.5.6.7.8",
-                name="attr_with_bvalue",
-                syntax="1.3.6.1.4.1.1466.115.121.1.40",  # Octet String
-                single_value=True,
-                no_user_modification=False,
-                is_system=True,
-            )
-        )
-        session.add(
-            AttributeType(
-                oid="1.2.3.4.5.6.7.8.9",
-                name="testing_attr",
-                syntax="1.3.6.1.4.1.1466.115.121.1.15",
-                single_value=True,
-                no_user_modification=False,
-                is_system=True,
-            )
-        )
-        await session.flush()
-
         session.add(domain)
         session.add(
             NetworkPolicy(

app/ldap_protocol/ldap_schema/object_class_dao.py

@@ -161,7 +161,7 @@ async def _count_exists_object_class_by_names(
         count_query = (
             select(func.count())
             .select_from(ObjectClass)
-            .where(ObjectClass.name.in_(object_class_names))
+            .where(func.lower(ObjectClass.name).in_(object_class_names))
         )
         result = await self.__session.scalars(count_query)
         return result.one()
@@ -176,7 +176,9 @@ async def is_all_object_classes_exists(
         :raise ObjectClassNotFoundError: If Object Class not found.
         :return bool.
         """
-        object_class_names = set(object_class_names)
+        object_class_names = set(
+            object_class.lower() for object_class in object_class_names
+        )
 
         count_ = await self._count_exists_object_class_by_names(
             object_class_names

tests/conftest.py

@@ -60,7 +60,7 @@
 from ldap_protocol.server import PoolClientHandler
 from ldap_protocol.session_storage import RedisSessionStorage, SessionStorage
 from ldap_protocol.utils.queries import get_user
-from models import Directory
+from models import AttributeType, Directory
 
 
 class TestProvider(Provider):
@@ -431,6 +431,26 @@ async def setup_session(session: AsyncSession) -> None:
         groups=["cn=domain admins,cn=groups," + domain.path_dn],
         session=session,
     )
+    session.add(
+        AttributeType(
+            oid="1.2.3.4.5.6.7.8",
+            name="attr_with_bvalue",
+            syntax="1.3.6.1.4.1.1466.115.121.1.40",  # Octet String
+            single_value=True,
+            no_user_modification=False,
+            is_system=True,
+        )
+    )
+    session.add(
+        AttributeType(
+            oid="1.2.3.4.5.6.7.8.9",
+            name="testing_attr",
+            syntax="1.3.6.1.4.1.1466.115.121.1.15",
+            single_value=True,
+            no_user_modification=False,
+            is_system=True,
+        )
+    )
     await session.commit()