Archives/jdupouy_radicale3-auth-ldap
1
0
Fork 0
mirror of https://github.com/jdupouy/radicale3-auth-ldap.git synced 2024-10-27 19:14:00 +00:00
Code Issues Projects Releases Wiki Activity

corrected multi ldap server handling

Browse Source
This commit is contained in:
holczer 2020-06-16 16:53:20 +02:00
parent b71adb30ec
commit a3b2e41864
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
radicale_auth_ldap/__init__.py
View File

@ -37,7 +37,14 @@ import radicale_auth_ldap.ldap3imports
class Auth(BaseAuth): class Auth(BaseAuth):
def is_authenticated(self, user, password): def is_authenticated(self, user, password):
"""Check if ``user``/``password`` couple is valid.""" """Check if ``user``/``password`` couple is valid."""
SERVER = ldap3.Server(self.configuration.get("auth", "ldap_url")) server_list = self.configuration.get("auth", "ldap_url")
if ' ' in server_list: # Handle for multiple LDAP server defined in ldap_url with space separation
servers = server_list.split(' ')
SERVER = ldap3.ServerPool(None)
for s in servers:
SERVER.add(ldap3.Server(s))
else: # only one server is defined
SERVER = ldap3.Server(server_list)
BASE = self.configuration.get("auth", "ldap_base") BASE = self.configuration.get("auth", "ldap_base")
ATTRIBUTE = self.configuration.get("auth", "ldap_attribute") ATTRIBUTE = self.configuration.get("auth", "ldap_attribute")
FILTER = self.configuration.get("auth", "ldap_filter") FILTER = self.configuration.get("auth", "ldap_filter")
@ -46,9 +53,6 @@ class Auth(BaseAuth):
SCOPE = self.configuration.get("auth", "ldap_scope") SCOPE = self.configuration.get("auth", "ldap_scope")
SUPPORT_EXTENDED = self.configuration.getboolean("auth", "ldap_support_extended", fallback=True) SUPPORT_EXTENDED = self.configuration.getboolean("auth", "ldap_support_extended", fallback=True)
if ' ' in SERVER: # Handle if multiple LDAP server is defined in ldap_url with space separation
SERVER = SERVER.split(' ') # ldap3.connection can handle multiple servers in a list as an implicit server pool
if BINDDN and PASSWORD: if BINDDN and PASSWORD:
conn = ldap3.Connection(SERVER, BINDDN, PASSWORD) conn = ldap3.Connection(SERVER, BINDDN, PASSWORD)
else: else: