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

Merge pull request #100 from chripo/fix-access

Browse Source 
Fix access
This commit is contained in:
Guillaume Ayoub 2014-02-05 12:47:43 +01:00
commit c953211175
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
radicale/__init__.py
View File

@ -264,9 +264,6 @@ class Application(object):
path = environ["PATH_INFO"] path = environ["PATH_INFO"]
# Find collection(s)
items = ical.Collection.from_path(path, environ.get("HTTP_DEPTH", "0"))
# Get function corresponding to method # Get function corresponding to method
function = getattr(self, environ["REQUEST_METHOD"].lower()) function = getattr(self, environ["REQUEST_METHOD"].lower())
@ -280,17 +277,21 @@ class Application(object):
else: else:
user = password = None user = password = None
read_allowed_items, write_allowed_items = \
self.collect_allowed_items(items, user)
is_authenticated = auth.is_authenticated(user, password) is_authenticated = auth.is_authenticated(user, password)
is_valid_user = is_authenticated or not user
if ((read_allowed_items or write_allowed_items) if is_valid_user:
and (not user or is_authenticated)) or \ items = ical.Collection.from_path(path,
(is_authenticated and function == self.propfind) or \ environ.get("HTTP_DEPTH", "0"))
function == self.options or not items: read_allowed_items, write_allowed_items = \
# Collections found, or authenticated PROPFIND request, self.collect_allowed_items(items, user)
# or OPTIONS request, or no items at all else:
read_allowed_items, write_allowed_items = None, None
if is_valid_user and (
(read_allowed_items or write_allowed_items) or
(is_authenticated and function == self.propfind) or
function == self.options):
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)