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

Set calendars always personal with authentication activated

Browse Source
This commit is contained in:
Guillaume Ayoub
2011-05-17 00:10:36 +02:00
parent 7c0e9686a8
commit ca9c148705
5 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
radicale/acl/LDAP.py
View File

@@ -32,15 +32,14 @@ from radicale import config, log
BASE = config.get("acl", "ldap_base")
ATTRIBUTE = config.get("acl", "ldap_attribute")
CONNEXION = ldap.initialize(config.get("acl", "ldap_url"))
PERSONAL = config.getboolean("acl", "personal")
BINDDN = config.get("acl", "ldap_binddn")
PASSWORD = config.get("acl", "ldap_password")
def has_right(owner, user, password):
"""Check if ``user``/``password`` couple is valid."""
if (user != owner and PERSONAL) or not user:
# User is not owner and personal calendars, or no user given, forbidden
if not user or (owner and user != owner):
# No user given, or owner is set and is not user, forbidden
return False
if BINDDN and PASSWORD:

3
radicale/acl/htpasswd.py
View File

@@ -34,7 +34,6 @@ from radicale import config
FILENAME = config.get("acl", "htpasswd_filename")
PERSONAL = config.getboolean("acl", "personal")
ENCRYPTION = config.get("acl", "htpasswd_encryption")
@@ -64,6 +63,6 @@ def has_right(owner, user, password):
for line in open(FILENAME).readlines():
if line.strip():
login, hash_value = line.strip().split(":")
if login == user and (not PERSONAL or user == owner):
if login == user and (not owner or owner == user):
return globals()["_%s" % ENCRYPTION](hash_value, password)
return False