Show More
@@ -54,7 +54,9 b' class AuthLdap(object):' | |||||
54 | port = port or 689 |
|
54 | port = port or 689 | |
55 | ldap_server_type = ldap_server_type + 's' |
|
55 | ldap_server_type = ldap_server_type + 's' | |
56 |
|
56 | |||
57 | self.TLS_REQCERT = ldap.__dict__['OPT_X_TLS_' + tls_reqcert] |
|
57 | OPT_X_TLS_DEMAND = 2 | |
|
58 | self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert, | |||
|
59 | OPT_X_TLS_DEMAND) | |||
58 | self.LDAP_SERVER_ADDRESS = server |
|
60 | self.LDAP_SERVER_ADDRESS = server | |
59 | self.LDAP_SERVER_PORT = port |
|
61 | self.LDAP_SERVER_PORT = port | |
60 |
|
62 | |||
@@ -68,7 +70,7 b' class AuthLdap(object):' | |||||
68 |
|
70 | |||
69 | self.BASE_DN = base_dn |
|
71 | self.BASE_DN = base_dn | |
70 | self.LDAP_FILTER = ldap_filter |
|
72 | self.LDAP_FILTER = ldap_filter | |
71 |
self.SEARCH_SCOPE = ldap |
|
73 | self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope) | |
72 | self.attr_login = attr_login |
|
74 | self.attr_login = attr_login | |
73 |
|
75 | |||
74 | def authenticate_ldap(self, username, password): |
|
76 | def authenticate_ldap(self, username, password): | |
@@ -88,7 +90,9 b' class AuthLdap(object):' | |||||
88 | if "," in username: |
|
90 | if "," in username: | |
89 | raise LdapUsernameError("invalid character in username: ,") |
|
91 | raise LdapUsernameError("invalid character in username: ,") | |
90 | try: |
|
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 | ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF) |
|
96 | ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF) | |
93 | ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON) |
|
97 | ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON) | |
94 | ldap.set_option(ldap.OPT_TIMEOUT, 20) |
|
98 | ldap.set_option(ldap.OPT_TIMEOUT, 20) |
General Comments 0
You need to be logged in to leave comments.
Login now