Merge pull request #49 from zestsoftware/zest-fix-searchlist-attributes

Skip found LDAP objects that miss required attributes
conestack · Sep 6, 2019 · fdc39be · fdc39be
2 parents 16e234c + dde8485
commit fdc39be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ History
 1.0b11 (unreleased)
 -------------------
 
-- No changes yet.
+- Skip objects that were found in LDAP while searching on several attributes but don't contain the required attribute.
+  [fredvd, maurits]
 
 
 1.0b10 (2019-06-30)

diff --git a/src/node/ext/ldap/ugm/_api.py b/src/node/ext/ldap/ugm/_api.py
@@ -649,7 +649,10 @@ def raw_search(self, criteria=None, attrlist=None,
         if attrlist is not None:
             _results = list()
             for _, att in results:
-                principal_id = att[self._key_attr][0]
+                try:
+                    principal_id = att[self._key_attr][0]
+                except (KeyError, IndexError):
+                    continue
                 aliased = self._alias_dict(att)
                 for key in list(aliased.keys()):
                     if key not in attrlist: