aboutsummaryrefslogtreecommitdiffstats
path: root/server/object.py
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2011-06-01 01:22:16 -0400
committerGuillaume Horel <guillaume.horel@gmail.com>2011-06-01 01:22:16 -0400
commitd4ecf728109619d34c1781a069793a37c8d9b8e7 (patch)
tree8abd81609001b3305d20d4be2c6b27cf2742394b /server/object.py
parentcdc4ec8d31b826222d970fb37e3e101cd4f86a77 (diff)
downloadalias-d4ecf728109619d34c1781a069793a37c8d9b8e7.tar.gz
Fixes to handle alias queries on the server side
should work with code fixed by zaran, just need to build an user directory with the right objects.
Diffstat (limited to 'server/object.py')
-rw-r--r--server/object.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/server/object.py b/server/object.py
index 4c1e0c1..31de622 100644
--- a/server/object.py
+++ b/server/object.py
@@ -58,9 +58,9 @@ class ObjectReader(Object):
return (int(perm), key)
return (None, None)
- def get_child_list(self, user):
+ def get_children_list(self, user):
perm = self.get_permission(user)
- if not perm & LIST:
+ if not perm or (not perm & LIST):
logger.error("User {} doesn't have the list permission for object {}"
.format(user, self.hash))
raise PermissionError
@@ -84,7 +84,7 @@ class ObjectReader(Object):
def get_content(self, user):
"""Return object content and the user key to decrypt it."""
perm, key = self.get_permission_key(user)
- if not perm & READ :
+ if not perm or (not perm & READ) :
logger.error("User {} doesn't have read access to object {}"
.format(user, self.hash))
raise PermissionError
@@ -113,7 +113,7 @@ class ObjectWriter(ObjectReader):
def write(self, user, content):
perm = self.get_permission(user)
- if not perm & MODIFY:
+ if not perm or (not perm & MODIFY):
logger.error("User {} doesn't have the modify permission for object {}"
.format(user, self.hash))
raise PermissionError
@@ -123,7 +123,7 @@ class ObjectWriter(ObjectReader):
def append(self, user, content, parent):
parent_object = ObjectReader(parent, self.owner)
perm = parent_object.get_permission(user)
- if not perm & APPEND:
+ if not perm or (not perm & APPEND):
logger.error("User {} doesn't have the modify permission for object {}"
.format(user, parent))
raise PermissionError