From 1ddc533259846aad4b9b927e519045a919707cec Mon Sep 17 00:00:00 2001 From: nd <git@notandy.de> Date: Fri, 17 Jul 2020 19:30:18 +0200 Subject: [PATCH] fix some ldap crap --- uffd/user/models.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/uffd/user/models.py b/uffd/user/models.py index c666e14a..bc4e038f 100644 --- a/uffd/user/models.py +++ b/uffd/user/models.py @@ -19,7 +19,7 @@ class User(): # if you are in no groups, the "memberOf" attribute does not exist # if you are only in one group, ldap returns a string not an array with one element # we sanitize this to always be an array - sanitized_groups = ldapobject['memberOf'].value if 'memberOf' in ldapobject else [] + sanitized_groups = ldapobject['memberOf'].value if hasattr(ldapobject, 'memberOf') else [] if isinstance(sanitized_groups, str): sanitized_groups = [sanitized_groups] return User( @@ -121,10 +121,7 @@ class Group(): @classmethod def from_ldap(cls, ldapobject): - if 'description' in ldapobject: - description = ldapobject['description'].value - else: - description = '' + description = ldapobject['description'].value if hasattr(ldapobject, 'description') else '' # if a group has no members, "uniqueMember" attribute does not exist # if a group has exactly one member, ldap returns a string not an array with one element # we sanitize this to always be an array -- GitLab