oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-08-19 19:10:54 +00:00
Code Wiki Activity

Clean LDAP support

Browse source
This commit is contained in:
Guillaume Ayoub 2011-04-25 16:47:42 +02:00
parent 78e52d5cf4
commit 12a8e01492
6 changed files with 98 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

18
radicale/acl/htpasswd.py
View file

@ -33,6 +33,11 @@ import hashlib
from radicale import config
FILENAME = config.get("acl", "htpasswd_filename")
PERSONAL = config.getboolean("acl", "personal")
ENCRYPTION = config.get("acl", "htpasswd_encryption")
def _plain(hash_value, password):
"""Check if ``hash_value`` and ``password`` match using plain method."""
return hash_value == password
@ -48,7 +53,7 @@ def _crypt(hash_value, password):
def _sha1(hash_value, password):
"""Check if ``hash_value`` and ``password`` match using sha1 method."""
hash_value = hash_value.replace("{SHA}", "").encode("ascii")
password = password.encode(config.get("encoding", "stock"))
password = password.encode(config.get("htpasswd_encoding", "stock"))
sha1 = hashlib.sha1() # pylint: disable=E1101
sha1.update(password)
return sha1.digest() == base64.b64decode(hash_value)
@ -56,18 +61,9 @@ def _sha1(hash_value, password):
def has_right(owner, user, password):
"""Check if ``user``/``password`` couple is valid."""
if owner is None and PERSONAL:
# No owner and personal calendars, everybody is allowed
return True
for line in open(FILENAME).readlines():
if line.strip():
login, hash_value = line.strip().split(":")
if login == user and (not PERSONAL or user == owner):
return CHECK_PASSWORD(hash_value, password)
return locals()["_%s" % ENCRYPTION](hash_value, password)
return False
FILENAME = config.get("acl", "filename")
PERSONAL = config.getboolean("acl", "personal")
CHECK_PASSWORD = locals()["_%s" % config.get("acl", "encryption")]