kallithea Changeset - 5d517bbf0a0d

Changeset - 5d517bbf0a0d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Marcin Kuzminski - 15 years ago 2010-07-06 23:57:57
marcin@python-works.com

some extra checks for auth lib

1 file changed with 18 insertions and 6 deletions:

pylons_app/lib/auth.py

0 comments (0 inline, 0 general)

pylons_app/lib/auth.py

➞

Show inline comments

@@ @@ -218,7 +218,7 @@ class HasPermissionAllDecorator(PermsDec @@
     """
     def check_permissions(self):
-        if self.required_perms.issubset(self.user_perms['global']):
+        if self.required_perms.issubset(self.user_perms.get('global')):
             return True
         return False
@@ @@ -230,7 +230,7 @@ class HasPermissionAnyDecorator(PermsDec @@
     """
     def check_permissions(self):
-        if self.required_perms.intersection(self.user_perms['global']):
+        if self.required_perms.intersection(self.user_perms.get('global')):
             return True
         return False
@@ @@ -242,7 +242,10 @@ class HasRepoPermissionAllDecorator(Perm @@
     def check_permissions(self):
         repo_name = get_repo_slug(request)
         try:
         user_perms = set([self.user_perms['repositories'][repo_name]])
         except KeyError:
             return False
         if self.required_perms.issubset(user_perms):
             return True
         return False
@@ @@ -257,7 +260,10 @@ class HasRepoPermissionAnyDecorator(Perm @@
     def check_permissions(self):
         repo_name = get_repo_slug(request)
         try:
         user_perms = set([self.user_perms['repositories'][repo_name]])
         except KeyError:
             return False
         if self.required_perms.intersection(user_perms):
             return True
         return False
@@ @@ -307,13 +313,13 @@ class PermsFunction(object): @@
 class HasPermissionAll(PermsFunction):
     def check_permissions(self):
-        if self.required_perms.issubset(self.user_perms['global']):
+        if self.required_perms.issubset(self.user_perms.get('global')):
             return True
         return False
 class HasPermissionAny(PermsFunction):
     def check_permissions(self):
-        if self.required_perms.intersection(self.user_perms['global']):
+        if self.required_perms.intersection(self.user_perms.get('global')):
             return True
         return False
@@ @@ -327,8 +333,11 @@ class HasRepoPermissionAll(PermsFunction @@
         if not self.repo_name:
             self.repo_name = get_repo_slug(request)
         try:
         self.user_perms = set([self.user_perms['repositories']\
                                .get(self.repo_name)])
                                    [self.repo_name]])
         except KeyError:
             return False
         self.granted_for = self.repo_name
         if self.required_perms.issubset(self.user_perms):
             return True
@@ @@ -345,8 +354,11 @@ class HasRepoPermissionAny(PermsFunction @@
         if not self.repo_name:
             self.repo_name = get_repo_slug(request)
         try:
         self.user_perms = set([self.user_perms['repositories']\
                                .get(self.repo_name)])
                                    [self.repo_name]])
         except KeyError:
             return False
         self.granted_for = self.repo_name
         if self.required_perms.intersection(self.user_perms):
             return True

0 comments (0 inline, 0 general)