tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the support of the LDAP scope configuration

Browse Source
This commit is contained in:
Gerhard Schmidt 2011-11-29 12:54:38 +01:00 committed by Guillaume Ayoub
parent a2128a4787
commit 5d55b2868f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
radicale/acl/LDAP.py
View File

@ -35,6 +35,12 @@ CONNEXION = ldap.initialize(config.get("acl", "ldap_url"))
BINDDN = config.get("acl", "ldap_binddn") BINDDN = config.get("acl", "ldap_binddn")
PASSWORD = config.get("acl", "ldap_password") PASSWORD = config.get("acl", "ldap_password")
SCOPE = ldap.SCOPE_ONELEVEL
if config.get("acl", "ldap_scope").lower() == 'subtree':
SCOPE = ldap.SCOPE_SUBTREE
elif config.get("acl", "ldap_scope").lower() == 'base':
SCOPE = ldap.SCOPE_BASE
def has_right(owner, user, password): def has_right(owner, user, password):
"""Check if ``user``/``password`` couple is valid.""" """Check if ``user``/``password`` couple is valid."""
@ -50,7 +56,7 @@ def has_right(owner, user, password):
log.LOGGER.debug( log.LOGGER.debug(
"LDAP bind for %s in base %s" % (distinguished_name, BASE)) "LDAP bind for %s in base %s" % (distinguished_name, BASE))
users = CONNEXION.search_s(BASE, ldap.SCOPE_ONELEVEL, distinguished_name) users = CONNEXION.search_s(BASE, SCOPE, distinguished_name)
if users: if users:
log.LOGGER.debug("User %s found" % user) log.LOGGER.debug("User %s found" % user)
try: try:

1
radicale/config.py
View File

@ -59,6 +59,7 @@ INITIAL_CONFIG = {
"ldap_attribute": "uid", "ldap_attribute": "uid",
"ldap_binddn": "", "ldap_binddn": "",
"ldap_password": "", "ldap_password": "",
"ldap_scope": "OneLevel",
"pam_group_membership": "", "pam_group_membership": "",
"courier_socket": ""}, "courier_socket": ""},
"storage": { "storage": {