Show More
@@ -53,8 +53,10 b' class AuthLdap(object):' | |||
|
53 | 53 | if self.TLS_KIND == 'LDAPS': |
|
54 | 54 | port = port or 689 |
|
55 | 55 | ldap_server_type = ldap_server_type + 's' |
|
56 | ||
|
57 | self.TLS_REQCERT = ldap.__dict__['OPT_X_TLS_' + tls_reqcert] | |
|
56 | ||
|
57 | OPT_X_TLS_DEMAND = 2 | |
|
58 | self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert, | |
|
59 | OPT_X_TLS_DEMAND) | |
|
58 | 60 | self.LDAP_SERVER_ADDRESS = server |
|
59 | 61 | self.LDAP_SERVER_PORT = port |
|
60 | 62 | |
@@ -63,12 +65,12 b' class AuthLdap(object):' | |||
|
63 | 65 | self.LDAP_BIND_PASS = bind_pass |
|
64 | 66 | |
|
65 | 67 | self.LDAP_SERVER = "%s://%s:%s" % (ldap_server_type, |
|
66 |
|
|
|
67 |
|
|
|
68 | self.LDAP_SERVER_ADDRESS, | |
|
69 | self.LDAP_SERVER_PORT) | |
|
68 | 70 | |
|
69 | 71 | self.BASE_DN = base_dn |
|
70 | 72 | self.LDAP_FILTER = ldap_filter |
|
71 |
self.SEARCH_SCOPE = ldap |
|
|
73 | self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope) | |
|
72 | 74 | self.attr_login = attr_login |
|
73 | 75 | |
|
74 | 76 | def authenticate_ldap(self, username, password): |
@@ -88,7 +90,9 b' class AuthLdap(object):' | |||
|
88 | 90 | if "," in username: |
|
89 | 91 | raise LdapUsernameError("invalid character in username: ,") |
|
90 | 92 | try: |
|
91 |
|
|
|
93 | if hasattr(ldap,'OPT_X_TLS_CACERTDIR'): | |
|
94 | ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, | |
|
95 | '/etc/openldap/cacerts') | |
|
92 | 96 | ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF) |
|
93 | 97 | ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON) |
|
94 | 98 | ldap.set_option(ldap.OPT_TIMEOUT, 20) |
General Comments 0
You need to be logged in to leave comments.
Login now