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
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:
user = password = None
if not items or function == self.options or \
auth.is_authenticated(user, password) if user else True:
read_allowed_items, write_allowed_items = \
self.collect_allowed_items(items, user)
read_allowed_items, write_allowed_items = \
self.collect_allowed_items(items, user)
if read_allowed_items or write_allowed_items or \
function == self.options or not items:
# Collections found, or OPTIONS request, or no items at all
status, headers, answer = function(
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
if ((read_allowed_items or write_allowed_items)
and auth.is_authenticated(user, password)) or \
function == self.options or not items:
# Collections found, or OPTIONS request, or no items at all
status, headers, answer = function(
environ, read_allowed_items, write_allowed_items, content,
user)
else:
status, headers, answer = NOT_ALLOWED
if (status, headers, answer) == NOT_ALLOWED and \
not auth.is_authenticated(user, password):
# Unknown or unauthorized user
log.LOGGER.info("%s refused" % (user or "Anonymous user"))
status = client.UNAUTHORIZED