Add support for multiple ways to bind to the LDAP server. #3541
parent
5fbb8b6204
commit
e3e0e3db19
|
@ -645,6 +645,15 @@ LDAP_ANONYMOUS_BIND = False
|
||||||
# OpenLDAP example: CN=Users,dc=example,dc=com
|
# OpenLDAP example: CN=Users,dc=example,dc=com
|
||||||
LDAP_BASE_DN = '<Base-DN>'
|
LDAP_BASE_DN = '<Base-DN>'
|
||||||
|
|
||||||
|
# Configure the bind format string
|
||||||
|
# Default: LDAP_BIND_FORMAT="
|
||||||
|
# {LDAP_USERNAME_ATTRIBUTE}={LDAP_USERNAME},{LDAP_BASE_DN}"
|
||||||
|
# The current available options are:
|
||||||
|
# LDAP_USERNAME_ATTRIBUTE, LDAP_USERNAME, LDAP_BASE_DN
|
||||||
|
# Example: LDAP_BIND_FORMAT="myldapuser@sales.example.com"
|
||||||
|
# LDAP_BIND_FORMAT="NET\\myldapuser"
|
||||||
|
LDAP_BIND_FORMAT = '{LDAP_USERNAME_ATTRIBUTE}={LDAP_USERNAME},{LDAP_BASE_DN}'
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
|
||||||
# Search ldap for further authentication (REQUIRED)
|
# Search ldap for further authentication (REQUIRED)
|
||||||
|
|
|
@ -65,9 +65,12 @@ class LDAPAuthentication(BaseAuthentication):
|
||||||
# username and password
|
# username and password
|
||||||
if not self.bind_user and not self.bind_pass and\
|
if not self.bind_user and not self.bind_pass and\
|
||||||
self.anonymous_bind is False:
|
self.anonymous_bind is False:
|
||||||
user_dn = "{0}={1},{2}".format(config.LDAP_USERNAME_ATTRIBUTE,
|
|
||||||
self.username,
|
user_dn = config.LDAP_BIND_FORMAT\
|
||||||
config.LDAP_BASE_DN
|
.format(
|
||||||
|
LDAP_USERNAME=self.username,
|
||||||
|
LDAP_BASE_DN=config.LDAP_BASE_DN,
|
||||||
|
LDAP_USERNAME_ATTRIBUTE=config.LDAP_USERNAME_ATTRIBUTE
|
||||||
)
|
)
|
||||||
|
|
||||||
self.bind_user = user_dn
|
self.bind_user = user_dn
|
||||||
|
|
Loading…
Reference in New Issue