Self hosted FLOSS fitness/workout, nutrition and weight tracker
Refuse trainer-login and account handover
Roland Geidera7be85309d67
diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex cf76fa08a..987fd212e 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -88,6 +88,7 @@ from wger.core.forms import ()from wger.gym.helpers import (holds_gym_permission,+ holds_permissions_beyond,is_same_gym,outranks,)@@ -216,11 +217,13 @@ def trainer_login(request, user_pk):if user.pk != trainer_identity_pk:return HttpResponseForbidden()- # Direct trainer-login: target must not itself be a privileged account.+ # Direct trainer-login: target must not itself be a privileged account,+ # nor hold permissions the trainer lacks (e.g. exercise editors)if request.user.has_perm('gym.gym_trainer') and (user.has_perm('gym.gym_trainer')or user.has_perm('gym.manage_gym')or user.has_perm('gym.manage_gyms')+ or holds_permissions_beyond(user, request.user)):return HttpResponseForbidden()diff --git a/wger/gym/helpers.py b/wger/gym/helpers.pyindex fa669f4be..916e191ed 100644--- a/wger/gym/helpers.py+++ b/wger/gym/helpers.py@@ -107,6 +107,27 @@ def holds_gym_permission(user, *codenames: str) -> bool:).exists()+def holds_permissions_beyond(target, actor) -> bool:+ """+ Whether the target holds any permission the actor doesn't, directly or+ through a group (e.g. exercise editors). Superusers hold all of them.++ Unlike has_perm this also works for deactivated accounts.+ """+ if actor.is_superuser:+ return False++ if target.is_superuser:+ return True++ actor_permissions = Permission.objects.filter(Q(user=actor) | Q(group__user=actor))+ return (+ Permission.objects.filter(Q(user=target) | Q(group__user=target))+ .exclude(pk__in=actor_permissions)+ .exists()+ )++def outranks(actor, target) -> bool:"""Whether the actor has more gym privileges than the target, needed for@@ -114,7 +135,8 @@ def outranks(actor, target) -> bool:- superusers outrank everybody- general managers outrank everybody except other general managers- - managers only outrank accounts without any gym role+ - managers only outrank accounts without any gym role and without+ permissions they don't hold themselves"""if actor.is_superuser:return True@@ -125,7 +147,9 @@ def outranks(actor, target) -> bool:if actor.has_perm('gym.manage_gyms'):return True- return not holds_gym_permission(target, 'manage_gym', 'gym_trainer')+ return not holds_gym_permission(+ target, 'manage_gym', 'gym_trainer'+ ) and not holds_permissions_beyond(target, actor)def get_permission_list(user):diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.pyindex 85cd45725..3a7640938 100644--- a/wger/gym/tests/test_user.py+++ b/wger/gym/tests/test_user.py@@ -17,6 +17,7 @@ import datetime# Djangofrom django.contrib.auth.models import (+ Group,Permission,User,)@@ -287,6 +288,19 @@ class TrainerLoginTestCase(WgerTestCase):self.assertEqual(response.status_code, 403)self.assertFalse(self.client.session.get('trainer.identity'))+ def test_exercise_admin(self):+ """+ Test changing the identity to a user maintaining the exercise database+ """+ for group in ('exercises_admin', 'exercises_editor'):+ User.objects.get(pk=2).groups.set([Group.objects.get(name=group)])++ self.user_login('trainer1')+ response = self.client.post(reverse('core:user:trainer-login', kwargs={'user_pk': 2}))+ self.assertEqual(response.status_code, 403)+ self.assertFalse(self.client.session.get('trainer.identity'))+ self.user_logout()+def test_get_does_not_rebind_session(self):"""``trainer_login`` must reject unsafe HTTP methods@@ -335,6 +349,10 @@ class ResetPasswordTargetRoleTestCase(WgerTestCase):def test_manager_can_reset_member(self):self.assertEqual(self.reset('manager1', 14), 200)+ def test_manager_cannot_reset_exercise_admin(self):+ User.objects.get(pk=14).groups.add(Group.objects.get(name='exercises_admin'))+ self.assertEqual(self.reset('manager1', 14), 403)+def test_general_manager_cannot_reset_admin(self):self.assertEqual(self.reset('general_manager1', 1), 403)@@ -383,6 +401,10 @@ class EditUserTargetRoleTestCase(WgerTestCase):def test_manager_can_edit_member(self):self.assertEqual(self.edit('manager1', 14), 302)+ def test_manager_cannot_edit_exercise_admin(self):+ User.objects.get(pk=14).groups.add(Group.objects.get(name='exercises_admin'))+ self.assertEqual(self.edit('manager1', 14), 403)+def test_general_manager_cannot_edit_general_manager(self):self.assertEqual(self.edit('general_manager1', 13), 403)