Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Properly (hopefully) check for all gym permission checks with helper function

Roland Geider635d1dc4006c
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index ff4056ba7..9dbc717f1 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -128,7 +128,7 @@ def delete(request, user_pk=None):
# gym or is an admin as well. General admins can delete all users.
if not request.user.has_perm('gym.manage_gyms') and (
not request.user.has_perm('gym.manage_gym')
- or request.user.userprofile.gym_id != user.userprofile.gym_id
+ or not is_same_gym(request.user, user)
or user.has_perm('gym.manage_gym')
or user.has_perm('gym.gym_trainer')
or user.has_perm('gym.manage_gyms')
@@ -152,6 +152,8 @@ def delete(request, user_pk=None):
return HttpResponseRedirect(reverse('software:features'))
else:
gym_pk = request.user.userprofile.gym_id
+ if gym_pk is None:
+ return HttpResponseRedirect(reverse('core:dashboard'))
return HttpResponseRedirect(reverse('gym:gym:user-list', kwargs={'pk': gym_pk}))
form.helper.form_action = request.path
context = {'form': form, 'user_delete': user}
@@ -402,7 +404,7 @@ class UserDeactivateView(
if (
request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')
- ) and edit_user.userprofile.gym_id != request.user.userprofile.gym_id:
+ ) and not is_same_gym(request.user, edit_user):
return HttpResponseForbidden()
return super(UserDeactivateView, self).dispatch(request, *args, **kwargs)
@@ -439,7 +441,7 @@ class UserActivateView(
if (
request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')
- ) and edit_user.userprofile.gym_id != request.user.userprofile.gym_id:
+ ) and not is_same_gym(request.user, edit_user):
return HttpResponseForbidden()
return super(UserActivateView, self).dispatch(request, *args, **kwargs)
@@ -584,8 +586,9 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
page_user = self.object # type: User
request_user = self.request.user # type: User
- same_gym_id = request_user.userprofile.gym_id == page_user.userprofile.gym_id
- context['enable_login_button'] = request_user.has_perm('gym.gym_trainer') and same_gym_id
+ context['enable_login_button'] = request_user.has_perm(
+ 'gym.gym_trainer'
+ ) and is_same_gym(request_user, page_user)
context['gym_name'] = None # request_user.userprofile.gym.name
return context
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index bc9d0c88b..35b22b3bb 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -417,6 +417,58 @@ class GymScopeGuardsTestCase(WgerTestCase):
response = self.client.get(reverse('gym:contract:edit', kwargs={'pk': 1}))
self.assertEqual(response.status_code, 403)
+ def test_delete_blocked_when_both_gyms_none(self):
+ """
+ A manager with gym=None must not be able to load (or POST to) the
+ delete-account form for another gym=None user.
+ """
+ self._both_gyms_none(attacker_pk=9) # manager1
+ self.user_login('manager1')
+
+ response = self.client.get(
+ reverse('core:user:delete', kwargs={'user_pk': self.VICTIM_USER_PK})
+ )
+ self.assertEqual(response.status_code, 403)
+
+ def test_delete_post_does_not_remove_victim_when_both_gyms_none(self):
+ """
+ Even on POST with correct password confirmation the destructive
+ ``user.delete()`` must not run when the attacker is not in the
+ victim's gym.
+ """
+ self._both_gyms_none(attacker_pk=9)
+ self.user_login('manager1')
+
+ response = self.client.post(
+ reverse('core:user:delete', kwargs={'user_pk': self.VICTIM_USER_PK}),
+ {'password': 'manager1manager1'},
+ )
+ self.assertEqual(response.status_code, 403)
+ self.assertTrue(User.objects.filter(pk=self.VICTIM_USER_PK).exists())
+
+ def test_deactivate_blocked_when_both_gyms_none(self):
+ self._both_gyms_none(attacker_pk=9)
+ self.user_login('manager1')
+
+ response = self.client.get(
+ reverse('core:user:deactivate', kwargs={'pk': self.VICTIM_USER_PK})
+ )
+ self.assertEqual(response.status_code, 403)
+ self.assertTrue(User.objects.get(pk=self.VICTIM_USER_PK).is_active)
+
+ def test_activate_blocked_when_both_gyms_none(self):
+ self._both_gyms_none(attacker_pk=9)
+ victim = User.objects.get(pk=self.VICTIM_USER_PK)
+ victim.is_active = False
+ victim.save()
+ self.user_login('manager1')
+
+ response = self.client.get(
+ reverse('core:user:activate', kwargs={'pk': self.VICTIM_USER_PK})
+ )
+ self.assertEqual(response.status_code, 403)
+ self.assertFalse(User.objects.get(pk=self.VICTIM_USER_PK).is_active)
+
class TrainerLogoutTestCase(WgerTestCase):
"""