Fix the auth checking algorithm
This commit is contained in:
parent
e33ee8ea7c
commit
4fa53d15b3
@ -198,8 +198,6 @@ class Application(object):
|
||||
# Get function corresponding to method
|
||||
function = getattr(self, environ["REQUEST_METHOD"].lower())
|
||||
|
||||
# Check rights
|
||||
if items and function != self.options:
|
||||
# Ask authentication backend to check rights
|
||||
authorization = environ.get("HTTP_AUTHORIZATION", None)
|
||||
|
||||
@ -210,7 +208,8 @@ class Application(object):
|
||||
else:
|
||||
user = password = None
|
||||
|
||||
if access.is_authenticated(user, password):
|
||||
if not items or function == self.options or \
|
||||
access.is_authenticated(user, password):
|
||||
last_collection_allowed = None
|
||||
allowed_items = []
|
||||
for item in items:
|
||||
@ -226,7 +225,7 @@ class Application(object):
|
||||
user, item.name or "/"))
|
||||
last_collection_allowed = False
|
||||
else:
|
||||
# item is not a colleciton, it's the child of the last
|
||||
# item is not a collection, it's the child of the last
|
||||
# collection we've met in the loop. Only add this item
|
||||
# if this last collection was allowed.
|
||||
if last_collection_allowed:
|
||||
|
Loading…
Reference in New Issue
Block a user