From dd774862c3162a428303e20b58de959d06d033c2 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 4 Jul 2018 11:10:57 +0200 Subject: [PATCH 2/7] backends/ldap: set proper default for iterable and strings (#23698) --- src/authentic2/backends/ldap_backend.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/authentic2/backends/ldap_backend.py b/src/authentic2/backends/ldap_backend.py index 534a39d6..5e70834c 100644 --- a/src/authentic2/backends/ldap_backend.py +++ b/src/authentic2/backends/ldap_backend.py @@ -213,20 +213,22 @@ class LDAPUser(get_user_model()): class LDAPBackend(object): _DEFAULTS = { - 'binddn': None, - 'bindpw': None, + 'basedn': '', + 'binddn': '', + 'bindpw': '', 'bindsasl': (), - 'user_dn_template': None, + 'url': (), + 'user_dn_template': '', 'user_filter': 'uid=%s', # will be '(|(mail=%s)(uid=%s))' if A2_ACCEPT_EMAIL_AUTHENTICATION is set (see update_default) - 'sync_ldap_users_filter': None, - 'user_basedn': None, - 'group_dn_template': None, - 'member_of_attribute': None, + 'sync_ldap_users_filter': '', + 'user_basedn': '', + 'group_dn_template': '', + 'member_of_attribute': '', 'group_filter': '(&(member={user_dn})(objectClass=groupOfNames))', 'group': None, - 'groupsu': None, - 'groupstaff': None, - 'groupactive': None, + 'groupsu': (), + 'groupstaff': (), + 'groupactive': (), 'group_mapping': (), 'group_to_role_mapping': (), 'replicas': True, -- 2.18.0