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

Merge pull request #2111 from coreos-inc/ldap-trace

Browse source 
Change LDAP errors into debug statements to reduce log clutter
This commit is contained in:
josephschorr 2016-11-10 17:11:19 -05:00 committed by GitHub
commit 38ee1d0d2a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/users/externalldap.py
View file

@ -107,11 +107,11 @@ class LDAPUsers(FederatedUsers):
subquery = u'(%s=%s)' % (self._uid_attr, username_or_email) subquery = u'(%s=%s)' % (self._uid_attr, username_or_email)
return (conn.search_s(referral_dn, ldap.SCOPE_BASE, subquery), None) return (conn.search_s(referral_dn, ldap.SCOPE_BASE, subquery), None)
except ldap.LDAPError: except ldap.LDAPError:
logger.exception('LDAP referral search exception') logger.debug('LDAP referral search exception')
return (None, 'Username not found') return (None, 'Username not found')
except ldap.LDAPError: except ldap.LDAPError:
logger.exception('LDAP search exception') logger.debug('LDAP search exception')
return (None, 'Username not found') return (None, 'Username not found')
def _ldap_user_search(self, username_or_email, limit=20): def _ldap_user_search(self, username_or_email, limit=20):
@ -234,11 +234,11 @@ class LDAPUsers(FederatedUsers):
self._allow_tls_fallback): self._allow_tls_fallback):
pass pass
except ldap.INVALID_CREDENTIALS: except ldap.INVALID_CREDENTIALS:
logger.exception('Invalid LDAP credentials') logger.debug('Invalid LDAP credentials')
return (None, 'Invalid password') return (None, 'Invalid password')
except ldap.INVALID_CREDENTIALS: except ldap.INVALID_CREDENTIALS:
logger.exception('Invalid LDAP credentials') logger.debug('Invalid LDAP credentials')
return (None, 'Invalid password') return (None, 'Invalid password')
return self._credential_for_user(found_response) return self._credential_for_user(found_response)