diff options
| author | Marco Huenseler <marcoh.huenseler+git@gmail.com> | 2019-08-06 12:43:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 12:43:42 +0200 |
| commit | c399db0c2990ca79f1113f7a6834502e90201149 (patch) | |
| tree | 640f9582aee238b8add874dfc70a3b3fa5ff51b3 | |
| parent | Merge pull request #5 from naominitel/anon-bind-open (diff) | |
| parent | Add ldap_support_extended configuration (diff) | |
| download | radicale_auth_ldap-c399db0c2990ca79f1113f7a6834502e90201149.tar.gz radicale_auth_ldap-c399db0c2990ca79f1113f7a6834502e90201149.tar.bz2 radicale_auth_ldap-c399db0c2990ca79f1113f7a6834502e90201149.zip | |
Merge pull request #8 from indication/master
Add ldap_support_extended configuration
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | radicale_auth_ldap/__init__.py | 9 |
2 files changed, 11 insertions, 2 deletions
@@ -31,4 +31,8 @@ ldap_password = verysecurepassword # LDAP scope of the search ldap_scope = LEVEL + +# LDAP extended option +# If the server is samba, ldap_support_extended is should be no +ldap_support_extended = yes ``` diff --git a/radicale_auth_ldap/__init__.py b/radicale_auth_ldap/__init__.py index 49edd93..55ed3d5 100644 --- a/radicale_auth_ldap/__init__.py +++ b/radicale_auth_ldap/__init__.py @@ -44,6 +44,7 @@ class Auth(BaseAuth): BINDDN = self.configuration.get("auth", "ldap_binddn") PASSWORD = self.configuration.get("auth", "ldap_password") SCOPE = self.configuration.get("auth", "ldap_scope") + SUPPORT_EXTENDED = self.configuration.getboolean("auth", "ldap_support_extended", fallback=True) if BINDDN and PASSWORD: conn = ldap3.Connection(SERVER, BINDDN, PASSWORD) @@ -80,8 +81,12 @@ class Auth(BaseAuth): conn = ldap3.Connection(SERVER, user_dn, password) conn.bind() self.logger.debug(conn.result) - whoami = conn.extend.standard.who_am_i() - self.logger.debug("LDAP whoami: %s" % whoami) + if SUPPORT_EXTENDED: + whoami = conn.extend.standard.who_am_i() + self.logger.debug("LDAP whoami: %s" % whoami) + else: + self.logger.debug("LDAP skip extended: call whoami") + whoami = conn.result['result'] == 0 if whoami: self.logger.debug("LDAP bind OK") return True |