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

Add default and configurable LDAP timeouts

Browse source 
Fixes https://www.pivotaltracker.com/story/show/135885019
This commit is contained in:
Joseph Schorr 2016-12-19 11:53:06 -05:00
parent e58e04b0e9
commit e2efb6c458
3 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
data/users/__init__.py
View file

@ -45,11 +45,14 @@ def get_users_handler(config, _, override_config_dir):
uid_attr = config.get('LDAP_UID_ATTR', 'uid')
email_attr = config.get('LDAP_EMAIL_ATTR', 'mail')
secondary_user_rdns = config.get('LDAP_SECONDARY_USER_RDNS', [])
timeout = config.get('LDAP_TIMEOUT')
network_timeout = config.get('LDAP_NETWORK_TIMEOUT')
allow_tls_fallback = config.get('LDAP_ALLOW_INSECURE_FALLBACK', False)
return LDAPUsers(ldap_uri, base_dn, admin_dn, admin_passwd, user_rdn, uid_attr, email_attr,
allow_tls_fallback, secondary_user_rdns=secondary_user_rdns,
requires_email=features.MAILING)
requires_email=features.MAILING, timeout=timeout,
network_timeout=network_timeout)
if authentication_type == 'JWT':
verify_url = config.get('JWT_VERIFY_ENDPOINT')