mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-03 21:27:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Simplify Rights plugin interface

Browse source
This commit is contained in:
Unrud 2020-04-09 22:02:03 +02:00
parent 8ca01a4989
commit f6a3a19680
11 changed files with 51 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radicale/app/__init__.py
View file

@ -264,7 +264,7 @@ class Application(
# Create principal collection
if user:
principal_path = "/%s/" % user
if self._rights.authorized(user, principal_path, "W"):
if "W" in self._rights.authorization(user, principal_path):
with self._storage.acquire_lock("r", user):
principal = next(
self._storage.discover(principal_path, depth="1"),
@ -328,12 +328,14 @@ class Application(
else:
permissions = ""
parent_permissions = permission
if permissions and self._rights.authorized(user, path, permissions):
if permissions and rights.intersect(
self._rights.authorization(user, path), permissions):
return True
if parent_permissions:
parent_path = pathutils.unstrip_path(
posixpath.dirname(pathutils.strip_path(path)), True)
if self._rights.authorized(user, parent_path, parent_permissions):
if rights.intersect(self._rights.authorization(user, parent_path),
parent_permissions):
return True
return False