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

Fixes to Rights

Browse Source 
- BaseRights expects the config and logger params
- user may be None, which leads to errors when trying to use it with
  regexes.
This commit is contained in:
Markus Unterwaditzer
2016-04-22 20:30:40 +02:00
parent 2f97d7d1e1
commit 0de3ad36be
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
radicale/rights.py
View File

@@ -97,11 +97,12 @@ class BaseRights:
class Rights(BaseRights): class Rights(BaseRights):
def __init__(self, configuration, logger): def __init__(self, configuration, logger):
super().__init__() super().__init__(configuration, logger)
self.filename = os.path.expanduser(configuration.get("rights", "file")) self.filename = os.path.expanduser(configuration.get("rights", "file"))
self.rights_type = configuration.get("rights", "type").lower() self.rights_type = configuration.get("rights", "type").lower()
def authorized(self, user, collection, permission): def authorized(self, user, collection, permission):
user = user or ''
collection_url = collection.path.rstrip("/") or "/" collection_url = collection.path.rstrip("/") or "/"
if collection_url in (".well-known/carddav", ".well-known/caldav"): if collection_url in (".well-known/carddav", ".well-known/caldav"):
return permission == "r" return permission == "r"