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

Merge pull request #1644 from coreos-inc/ldap-fix

Browse source 
Fix LDAP DN building for empty RDN list
This commit is contained in:
josephschorr 2016-07-22 14:45:04 -04:00 • committed by Jimmy Zelinskie
parent ca57928b77
commit 9fb9b14e6c
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
data/users/externalldap.py
View file

@ -60,8 +60,13 @@ class LDAPUsers(FederatedUsers):
# Note: user_rdn is a list of RDN pieces (for historical reasons), and secondary_user_rds
# is a list of RDN strings.
relative_user_dns = [','.join(user_rdn)] + (secondary_user_rdns or [])
self._user_dns = [','.join(relative_dn.split(',') + base_dn)
for relative_dn in relative_user_dns]
def get_full_rdn(relative_dn):
prefix = relative_dn.split(',') if relative_dn else []
return ','.join(prefix + base_dn)
# Create the set of full DN paths.
self._user_dns = [get_full_rdn(relative_dn) for relative_dn in relative_user_dns]
def _get_ldap_referral_dn(self, referral_exception):
logger.debug('Got referral: %s', referral_exception.args[0])