py_tasks_melange: comparison app/soc/views/helper/access.py

equal deleted inserted replaced

-:b9d51be5104a
+:15a2f644725f
 raise out_of_band.Error("Sidebar Calling")
 return fun(self, django_args, *args, **kwargs)
 return wrapper
+def allowDeveloper(fun):
+"""Decorator that allows access if the current user is a Developer.
+"""
+from functools import wraps
+@wraps(fun)
+def wrapper(self, django_args, *args, **kwargs):
+try:
+# if the current user is a developer we allow access
+return self.checkIsDeveloper(django_args)
+except out_of_band.Error:
+return fun(self, django_args, *args, **kwargs)
+return wrapper
 class Checker(object):
 """
 The __setitem__() and __getitem__() methods are overloaded to DTRT
 when adding new access rights, and retrieving them, so use these
 rather then modifying rights directly if so desired.
 return deny(django_args)
 return
 @denySidebar
+@allowDeveloper
 def checkIsHost(self, django_args):
 """Raises an alternate HTTP response if Google Account has no Host entity.
 Args:
 request: a Django HTTP request
 * if User has not agreed to the site-wide ToS, or
 * if no User exists for the logged-in Google Account, or
 * if the user is not even logged in
 """
-try:
-# if the current user is a developer we allow access
-self.checkIsDeveloper(django_args)
-return
-except out_of_band.Error:
-pass
 self.checkIsUser(django_args)
 user = user_logic.getForCurrentAccount()
 if django_args.get('scope_path'):
 login_message_fmt = DEF_DEV_LOGOUT_LOGIN_MSG_FMT % {
 'role': 'a Program Administrator '}
 raise out_of_band.LoginRequest(message_fmt=login_message_fmt)
+@allowDeveloper
 def checkIsClubAdminForClub(self, django_args):
 """Returns an alternate HTTP response if Google Account has no Club Admin
 entity for the specified club.
 Args:
 None if Club Admin exists for the specified club, or a subclass of
 django.http.HttpResponse which contains the alternate response
 should be returned by the calling view.
 """
-try:
-# if the current user is invited to create a host profile we allow access
-checkIsDeveloper(django_args)
-return
-except out_of_band.Error:
-pass
 self.checkIsUser(django_args)
 user = user_logic.getForCurrentAccount()
 if django_args.get('scope_path'):
 login_message_fmt = DEF_DEV_LOGOUT_LOGIN_MSG_FMT % {
 'role': 'a Club Admin for this Club'}
 raise out_of_band.LoginRequest(message_fmt=login_message_fmt)
+@allowDeveloper
 def checkIsApplicationAccepted(self, django_args, app_logic):
 """Returns an alternate HTTP response if Google Account has no Club App
 entity for the specified Club.
 Args:
 None if Club App  exists for the specified program, or a subclass
 of django.http.HttpResponse which contains the alternate response
 should be returned by the calling view.
 """
-try:
-# if the current user is a developer we allow access
-checkIsDeveloper(django_args)
-return
-except out_of_band.Error:
-pass
 self.checkIsUser(django_args)
 user = user_logic.getForCurrentAccount()
 properties = {
 return
 # TODO(srabbelier) Make this give a proper error message
 deny(django_args)
+@allowDeveloper
 def checkIsMyNotification(self, django_args):
 """Returns an alternate HTTP response if this request is for
 a Notification belonging to the current user.
 Args:
 AccessViolationResponse: if the required authorization is not met
 Returns:
 None if the current User is allowed to access this Notification.
 """
-try:
-# if the current user is a developer we allow access
-checkIsDeveloper(django_args)
-return
-except out_of_band.Error:
-pass
 self.checkIsUser(django_args)
 properties = dicts.filter(django_args, ['link_id', 'scope_path'])
 return None
 # TODO(ljvderijk) Make this give a proper error message
 deny(django_args)
+@allowDeveloper
 def checkIsMyApplication(self, django_args, app_logic):
 """Returns an alternate HTTP response if this request is for
 a Application belonging to the current user.
 Args:
 AccessViolationResponse: if the required authorization is not met
 Returns:
 None if the current User is allowed to access this Application.
 """
-try:
-# if the current user is a developer we allow access
-self.checkIsDeveloper(django_args)
-return
-except out_of_band.Error:
-pass
 self.checkIsUser(django_args)
 properties = dicts.filter(django_args, ['link_id'])
 return None
 # TODO(srabbelier) Make this give a proper error message
 deny(django_args)
+@allowDeveloper
 def checkIsMyActiveRole(self, django_args, role_logic):
 """Returns an alternate HTTP response if there is no active role found for
 the current user using the given role_logic.
 Raises:
 Returns:
 None if the current User has no active role for the given role_logic.
 """
-try:
-# if the current user is a developer we allow access
-checkIsDeveloper(django_args)
-return
-except out_of_band.Error:
-pass
 user = user_logic.getForCurrentAccount()
 if not user or user.link_id != django_args['link_id']:
 # not my role
 deny(django_args)

changeset 1016	15a2f644725f
parent 1012	73f0b61f2d9d
child 1017	6ad4fdb48840