Merge pull request #385 from untitaker/rights-fixes

Fixes to Rights
This commit is contained in:
Guillaume Ayoub 2016-04-23 09:11:16 +09:00
commit 2cda64245e

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"