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

Fixed authentication for anonymous users

Browse Source
This commit is contained in:
Jean-Marc Martins 2013-09-12 17:39:20 +02:00
parent 43785e48a9
commit 58faf725b0
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
radicale/__init__.py
View File

@ -279,7 +279,7 @@ class Application(object):
user = password = None user = password = None
if not items or function == self.options or \ if not items or function == self.options or \
auth.is_authenticated(user, password): auth.is_authenticated(user, password) if user else True:
read_allowed_items, write_allowed_items = \ read_allowed_items, write_allowed_items = \
self.collect_allowed_items(items, user) self.collect_allowed_items(items, user)
@ -290,6 +290,14 @@ class Application(object):
status, headers, answer = function( status, headers, answer = function(
environ, read_allowed_items, write_allowed_items, content, environ, read_allowed_items, write_allowed_items, content,
user) user)
elif not user:
# Unknown or unauthorized user
log.LOGGER.info("%s refused" % (user or "Anonymous user"))
status = client.UNAUTHORIZED
headers = {
"WWW-Authenticate":
"Basic realm=\"%s\"" % config.get("server", "realm")}
answer = None
else: else:
# Good user but has no rights to any of the given collections # Good user but has no rights to any of the given collections
status, headers, answer = NOT_ALLOWED status, headers, answer = NOT_ALLOWED

6
radicale/rights.py
View File

@ -93,5 +93,7 @@ def _read_from_sections(user, collection, permission):
def authorized(user, collection, right): def authorized(user, collection, right):
"""Check if the user is allowed to read or write the collection.""" """Check if the user is allowed to read or write the collection."""
rights_type = config.get("rights", "type").lower() rights_type = config.get("rights", "type").lower()
return rights_type == "none" or (user and _read_from_sections( return rights_type == "none" or (
user, collection.url.rstrip("/") or "/", right)) (True if not user else user) and _read_from_sections(
user if user else "", collection.url.rstrip("/") or "/", right)
)