From d4ecf728109619d34c1781a069793a37c8d9b8e7 Mon Sep 17 00:00:00 2001 From: Guillaume Horel Date: Wed, 1 Jun 2011 01:22:16 -0400 Subject: 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. --- server/object.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server/object.py') 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 -- cgit v1.2.3-70-g09d2