Self hosted FLOSS fitness/workout, nutrition and weight tracker
Check the target's role before gym admins act on an account
Roland Geider5c1817e9d56b
diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex fb3820bac..c1a3950ad 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -92,7 +92,10 @@ from wger.core.forms import (UserPersonalInformationForm,UserPreferencesForm,)-from wger.gym.helpers import is_same_gym+from wger.gym.helpers import (+ is_same_gym,+ outranks,+)from wger.gym.models import (AdminUserNote,Contract,@@ -498,6 +501,10 @@ class UserEditView():return HttpResponseForbidden()+ # A new email address hands over the account through the password reset+ if not outranks(user, self.get_object()):+ return HttpResponseForbidden()+return super(UserEditView, self).dispatch(request, *args, **kwargs)def get_success_url(self):diff --git a/wger/gym/helpers.py b/wger/gym/helpers.pyindex 2fa3f30ff..fa669f4be 100644--- a/wger/gym/helpers.py+++ b/wger/gym/helpers.py@@ -15,6 +15,8 @@# You should have received a copy of the GNU Affero General Public License# Django+from django.contrib.auth.models import Permission+from django.db.models import Qfrom django.utils import timezone@@ -88,6 +90,44 @@ def is_any_gym_admin(user):)+def holds_gym_permission(user, *codenames: str) -> bool:+ """+ Whether the user holds any of the given gym permissions, directly or+ through a group. Superusers hold all of them.++ Unlike has_perm this also works for deactivated accounts.+ """+ if user.is_superuser:+ return True++ return Permission.objects.filter(+ Q(user=user) | Q(group__user=user),+ content_type__app_label='gym',+ codename__in=codenames,+ ).exists()+++def outranks(actor, target) -> bool:+ """+ Whether the actor has more gym privileges than the target, needed for+ actions that hand over the target's account (password, email)++ - superusers outrank everybody+ - general managers outrank everybody except other general managers+ - managers only outrank accounts without any gym role+ """+ if actor.is_superuser:+ return True++ if holds_gym_permission(target, 'manage_gyms'):+ return False++ if actor.has_perm('gym.manage_gyms'):+ return True++ return not holds_gym_permission(target, 'manage_gym', 'gym_trainer')++def get_permission_list(user):"""Calculate available user permissionsdiff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.pyindex 4b2b04f33..e6d4a2039 100644--- a/wger/gym/tests/test_user.py+++ b/wger/gym/tests/test_user.py@@ -297,6 +297,125 @@ class TrainerLoginTestCase(WgerTestCase):self.assertFalse(self.client.session.get('trainer.identity'))+class ResetPasswordTargetRoleTestCase(WgerTestCase):+ """+ Only accounts with fewer privileges than the caller can have their password reset+ """++ def reset(self, username: str, target_pk: int) -> int:+ """+ Resets the target's password as the given user and returns the status code++ Also checks that the password only changed when the request succeeded.+ """+ old_hash = User.objects.get(pk=target_pk).password+ self.user_login(username)++ response = self.client.post(+ reverse('gym:gym:reset-user-password', kwargs={'user_pk': target_pk})+ )++ changed = User.objects.get(pk=target_pk).password != old_hash+ self.assertEqual(changed, response.status_code == 200)+ return response.status_code++ def test_manager_cannot_reset_admin(self):+ self.assertEqual(self.reset('manager1', 1), 403)++ def test_manager_cannot_reset_fellow_manager(self):+ self.assertEqual(self.reset('manager1', 10), 403)++ def test_manager_cannot_reset_trainer(self):+ self.assertEqual(self.reset('manager1', 4), 403)++ def test_manager_cannot_reset_deactivated_trainer(self):+ User.objects.filter(pk=4).update(is_active=False)+ self.assertEqual(self.reset('manager1', 4), 403)++ def test_manager_can_reset_member(self):+ self.assertEqual(self.reset('manager1', 14), 200)++ def test_general_manager_cannot_reset_admin(self):+ self.assertEqual(self.reset('general_manager1', 1), 403)++ def test_general_manager_cannot_reset_general_manager(self):+ self.assertEqual(self.reset('general_manager1', 13), 403)++ def test_general_manager_cannot_reset_superuser(self):+ User.objects.filter(pk=19).update(is_superuser=True)+ self.assertEqual(self.reset('general_manager1', 19), 403)++ def test_general_manager_can_reset_trainer(self):+ self.assertEqual(self.reset('general_manager1', 7), 200)++ def test_superuser_can_reset_general_manager(self):+ User.objects.filter(pk=1).update(is_superuser=True)+ self.assertEqual(self.reset('admin', 12), 200)+++class EditUserTargetRoleTestCase(WgerTestCase):+ """+ Changing the email of another account needs more privileges than that account+ """++ def edit(self, username: str, target_pk: int) -> int:+ """+ Sets the target's email as the given user and returns the status code+ """+ old_email = User.objects.get(pk=target_pk).email+ self.user_login(username)++ response = self.client.post(+ reverse('core:user:edit', kwargs={'pk': target_pk}),+ {'first_name': 'New', 'last_name': 'Name', 'email': '[email protected]'},+ )++ changed = User.objects.get(pk=target_pk).email != old_email+ self.assertEqual(changed, response.status_code == 302)+ return response.status_code++ def test_manager_cannot_edit_admin(self):+ self.assertEqual(self.edit('manager1', 1), 403)++ def test_manager_cannot_edit_trainer(self):+ self.assertEqual(self.edit('manager1', 4), 403)++ def test_manager_can_edit_member(self):+ self.assertEqual(self.edit('manager1', 14), 302)++ def test_general_manager_cannot_edit_general_manager(self):+ self.assertEqual(self.edit('general_manager1', 13), 403)++ def test_general_manager_can_edit_manager(self):+ self.assertEqual(self.edit('general_manager1', 11), 302)+++class EditUserPermissionTargetRoleTestCase(WgerTestCase):+ """+ The gym roles of an account can only be edited when the user could grant all of them+ """++ def edit_roles(self, username: str, target_pk: int, roles: list[str]) -> int:+ self.user_login(username)+ response = self.client.post(+ reverse('gym:gym:edit-user-permission', kwargs={'user_pk': target_pk}),+ {'role': roles},+ )+ return response.status_code++ def test_manager_cannot_demote_general_manager(self):+ status = self.edit_roles('manager1', 12, ['user'])++ self.assertEqual(status, 403)+ self.assertTrue(User.objects.get(pk=12).groups.filter(name='general_gym_manager').exists())++ def test_manager_can_remove_trainer_role(self):+ status = self.edit_roles('manager1', 4, ['user'])++ self.assertEqual(status, 302)+ self.assertFalse(User.objects.get(pk=4).groups.filter(name='gym_trainer').exists())++class GymScopeGuardsTestCase(WgerTestCase):"""Test the gym-scope guardsdiff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.pyindex b8e8f6645..a911fc751 100644--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@ -72,8 +72,10 @@ from wger.gym.forms import ()from wger.gym.helpers import (get_permission_list,+ holds_gym_permission,is_any_gym_admin,is_same_gym,+ outranks,sanitize_csv_cell,)from wger.gym.models import (@@ -266,6 +268,9 @@ def reset_user_password(request, user_pk):if request.user.has_perm('gym.manage_gym') and not is_same_gym(request.user, user):return HttpResponseForbidden()+ if not outranks(request.user, user):+ return HttpResponseForbidden()+if request.method != 'POST':form = forms.Form()form.helper = FormHelper()@@ -310,6 +315,10 @@ def gym_permissions_user_edit(request, user_pk):if user.has_perm('gym.manage_gym') and not is_same_gym(user, member):return HttpResponseForbidden()+ # Saving removes all gym roles, so the member must not hold one the user can't grant+ if not user.has_perm('gym.manage_gyms') and holds_gym_permission(member, 'manage_gyms'):+ return HttpResponseForbidden()+# Calculate available user permissionsform_group_permission = get_permission_list(user)