Skip to content
Snippets Groups Projects
Commit 467bf2a3 authored by Julian's avatar Julian
Browse files

Ensured that LDAPSet never contains None and readded dummy obj in ldap_server_entries.json

parent f768e03b
No related branches found
No related tags found
1 merge request!18LDAP Object Mapper
Pipeline #5974 failed
...@@ -192,6 +192,7 @@ ...@@ -192,6 +192,7 @@
"cn=Subschema" "cn=Subschema"
], ],
"uniqueMember": [ "uniqueMember": [
"cn=dummy,ou=system,dc=example,dc=com",
"uid=testuser,ou=users,dc=example,dc=com", "uid=testuser,ou=users,dc=example,dc=com",
"uid=testadmin,ou=users,dc=example,dc=com" "uid=testadmin,ou=users,dc=example,dc=com"
] ]
...@@ -242,6 +243,7 @@ ...@@ -242,6 +243,7 @@
"cn=Subschema" "cn=Subschema"
], ],
"uniqueMember": [ "uniqueMember": [
"cn=dummy,ou=system,dc=example,dc=com",
"uid=testuser,ou=users,dc=example,dc=com", "uid=testuser,ou=users,dc=example,dc=com",
"uid=testadmin,ou=users,dc=example,dc=com" "uid=testadmin,ou=users,dc=example,dc=com"
] ]
...@@ -292,6 +294,7 @@ ...@@ -292,6 +294,7 @@
"cn=Subschema" "cn=Subschema"
], ],
"uniqueMember": [ "uniqueMember": [
"cn=dummy,ou=system,dc=example,dc=com",
"uid=testadmin,ou=users,dc=example,dc=com" "uid=testadmin,ou=users,dc=example,dc=com"
] ]
} }
......
...@@ -133,13 +133,13 @@ class LDAPSet(MutableSet): ...@@ -133,13 +133,13 @@ class LDAPSet(MutableSet):
return repr(set(self)) return repr(set(self))
def __contains__(self, value): def __contains__(self, value):
return self.__encode(value) in self.__getitems() return value is not None and self.__encode(value) in self.__getitems()
def __iter__(self): def __iter__(self):
return iter(map(self.__decode, self.__getitems())) return iter(filter(lambda obj: obj is not None, map(self.__decode, self.__getitems())))
def __len__(self): def __len__(self):
return len(self.__getitems()) return len(set(self))
def add(self, value): def add(self, value):
if value not in self: if value not in self:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment