##// END OF EJS Templates
LDAP fail-over using multiple server addresses from host field seperated by comma.
Raoul Thill -
r2915:f89bb854 beta
parent child Browse files
Show More
@@ -57,17 +57,19 b' class AuthLdap(object):'
57 OPT_X_TLS_DEMAND = 2
57 OPT_X_TLS_DEMAND = 2
58 self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert,
58 self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert,
59 OPT_X_TLS_DEMAND)
59 OPT_X_TLS_DEMAND)
60 self.LDAP_SERVER_ADDRESS = server
60 # split server into list
61 self.LDAP_SERVER_ADDRESS = server.split(',')
61 self.LDAP_SERVER_PORT = port
62 self.LDAP_SERVER_PORT = port
62
63
63 # USE FOR READ ONLY BIND TO LDAP SERVER
64 # USE FOR READ ONLY BIND TO LDAP SERVER
64 self.LDAP_BIND_DN = safe_str(bind_dn)
65 self.LDAP_BIND_DN = safe_str(bind_dn)
65 self.LDAP_BIND_PASS = safe_str(bind_pass)
66 self.LDAP_BIND_PASS = safe_str(bind_pass)
66
67 _LDAP_SERVERS = []
67 self.LDAP_SERVER = "%s://%s:%s" % (ldap_server_type,
68 for host in self.LDAP_SERVER_ADDRESS:
68 self.LDAP_SERVER_ADDRESS,
69 _LDAP_SERVERS.append("%s://%s:%s" % (ldap_server_type,
69 self.LDAP_SERVER_PORT)
70 host.replace(' ', ''),
70
71 self.LDAP_SERVER_PORT))
72 self.LDAP_SERVER = str(', '.join(s for s in _LDAP_SERVERS))
71 self.BASE_DN = safe_str(base_dn)
73 self.BASE_DN = safe_str(base_dn)
72 self.LDAP_FILTER = safe_str(ldap_filter)
74 self.LDAP_FILTER = safe_str(ldap_filter)
73 self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope)
75 self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope)
General Comments 0
You need to be logged in to leave comments. Login now