nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

context_processor: Cache whether user is admin (Closes: #781)

Browse Source
This commit is contained in:
Soumya97 2017-04-09 23:52:49 +05:30 committed by Sunil Mohan Adapa
parent 0adfae26d8
commit 6a53dd015e
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plinth/context_processors.py
View File

@ -43,5 +43,5 @@ def common(request):
'submenu': cfg.main_menu.active_item(request), 'submenu': cfg.main_menu.active_item(request),
'active_menu_urls': active_menu_urls, 'active_menu_urls': active_menu_urls,
'box_name': _(cfg.box_name), 'box_name': _(cfg.box_name),
'user_is_admin': is_user_admin(request.user) 'user_is_admin': is_user_admin(request, True)
} }

2
plinth/middleware.py
View File

@ -102,5 +102,5 @@ class AdminRequiredMiddleware(object):
hasattr(view_func, 'IS_NON_ADMIN'): hasattr(view_func, 'IS_NON_ADMIN'):
return return
if not is_user_admin(request.user): if not is_user_admin(request):
raise PermissionDenied raise PermissionDenied

2
plinth/modules/users/forms.py
View File

@ -171,7 +171,7 @@ class UserUpdateForm(ValidNewUsernameCheckMixin, forms.ModelForm):
super(UserUpdateForm, self).__init__(*args, **kwargs) super(UserUpdateForm, self).__init__(*args, **kwargs)
if not is_user_admin(request.user): if not is_user_admin(request):
self.fields['is_active'].widget = forms.HiddenInput() self.fields['is_active'].widget = forms.HiddenInput()
self.fields['groups'].disabled = True self.fields['groups'].disabled = True

4
plinth/modules/users/views.py
View File

@ -85,7 +85,7 @@ class UserUpdate(ContextMixin, SuccessMessageMixin, UpdateView):
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
"""Handle a request and return a HTTP response.""" """Handle a request and return a HTTP response."""
if self.request.user.get_username() != self.kwargs['slug'] \ if self.request.user.get_username() != self.kwargs['slug'] \
and not is_user_admin(self.request.user): and not is_user_admin(self.request):
raise PermissionDenied raise PermissionDenied
return super().dispatch(request, *args, **kwargs) return super().dispatch(request, *args, **kwargs)
@ -156,7 +156,7 @@ class UserChangePassword(ContextMixin, SuccessMessageMixin, FormView):
def dispatch(self, request, *args, **kwargs): def dispatch(self, request, *args, **kwargs):
"""Handle a request and return a HTTP response.""" """Handle a request and return a HTTP response."""
if self.request.user.get_username() != self.kwargs['slug'] \ if self.request.user.get_username() != self.kwargs['slug'] \
and not is_user_admin(self.request.user): and not is_user_admin(self.request):
raise PermissionDenied raise PermissionDenied
return super().dispatch(request, *args, **kwargs) return super().dispatch(request, *args, **kwargs)

12
plinth/utils.py
View File

@ -52,6 +52,14 @@ def non_admin_view(func):
return func return func
def is_user_admin(user): def is_user_admin(request, cached=False):
"""Return whether user is an administrator.""" """Return whether user is an administrator."""
return user.groups.filter(name='admin').exists() if not request.user.is_authenticated():
return False
if 'cache_user_is_admin' in request.session and cached:
return request.session['cache_user_is_admin']
user_is_admin = request.user.groups.filter(name='admin').exists()
request.session['cache_user_is_admin'] = user_is_admin
return user_is_admin