kallithea Changeset - 9a35244c35b6

Changeset - 9a35244c35b6

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Søren Løvborg - 10 years ago 2016-04-07 17:53:51
sorenl@unity3d.com

auth: clean up PermsFunction

Now shows scope in HasUserGroupPermissionAny instead of '?'.

1 file changed with 20 insertions and 17 deletions:

kallithea/lib/auth.py

0 comments (0 inline, 0 general)

kallithea/lib/auth.py

➞

Show inline comments

@@ @@ -941,50 +941,44 @@ class PermsFunction(object): @@
         """ Defend against accidentally forgetting to call the object
             and instead evaluating it directly in a boolean context,
             which could have security implications.
         """
         raise AssertionError(self.__class__.__name__ + ' is not a bool and must be called!')
     def __call__(self, check_location='', user=None):
+    def __call__(self, check_location='unspecified location', user=None):
         if not user:
             #TODO: remove this someday,put as user as attribute here
             user = request.user
         # init auth user if not already given
         if not isinstance(user, AuthUser):
             user = AuthUser(user.user_id)
         cls_name = self.__class__.__name__
         check_scope = {
             'HasPermissionAny': '',
             'HasRepoPermissionAny': 'repo:%s' % self.repo_name,
             'HasRepoGroupPermissionAny': 'group:%s' % self.group_name,
         }.get(cls_name, '?')
         check_scope = self._scope()
         log.debug('checking cls:%s %s usr:%s %s @ %s', cls_name,
                   self.required_perms, user, check_scope,
-                  check_location or 'unspecified location')
                   check_location)
         if not user:
             log.debug('Empty request user')
             return False
         self.user_perms = user.permissions
         if self.check_permissions():
             log.debug('Permission to %s granted for user: %s @ %s',
                       check_scope, user,
                          check_location or 'unspecified location')
             return True
         else:
             log.debug('Permission to %s denied for user: %s @ %s',
                       check_scope, user,
                          check_location or 'unspecified location')
             return False
         result = self.check_permissions()
         result_text = 'granted' if result else 'denied'
         log.debug('Permission to %s %s for user: %s @ %s',
             check_scope, result_text, user, check_location)
         return result
     def check_permissions(self):
         """Dummy function for overriding"""
         raise Exception('You have to write this function in child class')
     def _scope(self):
         return '(unknown scope)'
 class HasPermissionAny(PermsFunction):
     def check_permissions(self):
         if self.required_perms.intersection(self.user_perms.get('global')):
             return True
         return False
@@ @@ -1006,12 +1000,15 @@ class HasRepoPermissionAny(PermsFunction @@
         except KeyError:
             return False
         if self.required_perms.intersection(self._user_perms):
             return True
         return False
     def _scope(self):
         return 'repo:%s' % self.repo_name
 class HasRepoGroupPermissionAny(PermsFunction):
     def __call__(self, group_name=None, check_location='', user=None):
         self.group_name = group_name
         return super(HasRepoGroupPermissionAny, self).__call__(check_location, user)
@@ @@ -1023,12 +1020,15 @@ class HasRepoGroupPermissionAny(PermsFun @@
         except KeyError:
             return False
         if self.required_perms.intersection(self._user_perms):
             return True
         return False
     def _scope(self):
         return 'repogroup:%s' % self.group_name
 class HasUserGroupPermissionAny(PermsFunction):
     def __call__(self, user_group_name=None, check_location='', user=None):
         self.user_group_name = user_group_name
         return super(HasUserGroupPermissionAny, self).__call__(check_location, user)
@@ @@ -1040,12 +1040,15 @@ class HasUserGroupPermissionAny(PermsFun @@
         except KeyError:
             return False
         if self.required_perms.intersection(self._user_perms):
             return True
         return False
     def _scope(self):
         return 'usergroup:%s' % self.user_group_name
 #==============================================================================
 # SPECIAL VERSION TO HANDLE MIDDLEWARE AUTH
 #==============================================================================
 class HasPermissionAnyMiddleware(object):
     def __init__(self, *perms):

0 comments (0 inline, 0 general)