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

Fixed partially anonymous authentication

Browse Source
This commit is contained in:
Jean-Marc Martins 2013-09-13 15:05:02 +02:00
parent 58faf725b0
commit e2512b12fb
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
radicale/__init__.py
View File

@ -278,30 +278,21 @@ class Application(object):
else: else:
user = password = None user = password = None
if not items or function == self.options or \ read_allowed_items, write_allowed_items = \
auth.is_authenticated(user, password) if user else True: self.collect_allowed_items(items, user)
read_allowed_items, write_allowed_items = \ if ((read_allowed_items or write_allowed_items)
self.collect_allowed_items(items, user) and auth.is_authenticated(user, password)) or \
function == self.options or not items:
if read_allowed_items or write_allowed_items or \ # Collections found, or OPTIONS request, or no items at all
function == self.options or not items: status, headers, answer = function(
# Collections found, or OPTIONS request, or no items at all environ, read_allowed_items, write_allowed_items, content,
status, headers, answer = function( user)
environ, read_allowed_items, write_allowed_items, content,
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:
# Good user but has no rights to any of the given collections
status, headers, answer = NOT_ALLOWED
else: else:
status, headers, answer = NOT_ALLOWED
if (status, headers, answer) == NOT_ALLOWED and \
not auth.is_authenticated(user, password):
# Unknown or unauthorized user # Unknown or unauthorized user
log.LOGGER.info("%s refused" % (user or "Anonymous user")) log.LOGGER.info("%s refused" % (user or "Anonymous user"))
status = client.UNAUTHORIZED status = client.UNAUTHORIZED

11
radicale/rights.py
View File

@ -91,9 +91,10 @@ 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.
If the user is empty it checks for anonymous rights
"""
rights_type = config.get("rights", "type").lower() rights_type = config.get("rights", "type").lower()
return rights_type == "none" or ( return rights_type == "none" or (_read_from_sections(
(True if not user else user) and _read_from_sections( user or "", collection.url.rstrip("/") or "/", right))
user if user else "", collection.url.rstrip("/") or "/", right)
)