vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2598 from coreos-inc/ldap-lc-fix

Browse source 
Move LDAP controls init into the inner loop
This commit is contained in:
josephschorr 2017-05-01 16:12:34 -04:00 committed by GitHub
commit 9a6cf65836
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/users/externalldap.py
View file

@ -296,13 +296,13 @@ class LDAPUsers(FederatedUsers):
def _iterate_members(self, group_dn, page_size, disable_pagination): def _iterate_members(self, group_dn, page_size, disable_pagination):
has_pagination = not(self._force_no_pagination or disable_pagination) has_pagination = not(self._force_no_pagination or disable_pagination)
with self._ldap.get_connection() as conn: with self._ldap.get_connection() as conn:
lc = ldap.controls.libldap.SimplePagedResultsControl(criticality=True, size=page_size,
cookie='')
search_flt = filter_format('(memberOf=%s,%s)', (group_dn, self._base_dn)) search_flt = filter_format('(memberOf=%s,%s)', (group_dn, self._base_dn))
attributes = [self._uid_attr, self._email_attr] attributes = [self._uid_attr, self._email_attr]
for user_search_dn in self._user_dns: for user_search_dn in self._user_dns:
lc = ldap.controls.libldap.SimplePagedResultsControl(criticality=True, size=page_size,
cookie='')
# Conduct the initial search for users that are a member of the group. # Conduct the initial search for users that are a member of the group.
logger.debug('Conducting LDAP search of DN: %s and filter %s', user_search_dn, search_flt) logger.debug('Conducting LDAP search of DN: %s and filter %s', user_search_dn, search_flt)
try: try: