Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Restrict trainer login access

Roland Geider19c97822492f
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index f7b8b628f..e46fc37df 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -166,12 +166,21 @@ def trainer_login(request, user_pk):
"""
user = get_object_or_404(User, pk=user_pk)
orig_user_pk = request.user.pk
+ trainer_identity_pk = request.session.get('trainer.identity')
- # No changing if identity is not set
- if not request.user.has_perm('gym.gym_trainer') and not request.session.get('trainer.identity'):
- return HttpResponseForbidden()
+ # If the request user is not a trainer themselves they may only act within
+ # an established trainer session and only ever to switch back to that
+ # original trainer.
+ if not request.user.has_perm('gym.gym_trainer'):
+ if not trainer_identity_pk:
+ return HttpResponseForbidden()
+ original_trainer = get_object_or_404(User, pk=trainer_identity_pk)
+ if not original_trainer.has_perm('gym.gym_trainer'):
+ return HttpResponseForbidden()
+ if user.pk != trainer_identity_pk:
+ return HttpResponseForbidden()
- # Changing between trainers or managers is not allowed
+ # Direct trainer-login: target must not itself be a privileged account.
if request.user.has_perm('gym.gym_trainer') and (
user.has_perm('gym.gym_trainer')
or user.has_perm('gym.manage_gym')
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index 5c10715b5..bc9d0c88b 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -219,17 +219,36 @@ class TrainerLoginTestCase(WgerTestCase):
self.assertEqual(response.status_code, 403)
self.assertFalse(self.client.session.get('trainer.identity'))
+ def test_chained_hop_into_manager_is_blocked(self):
+ """
+ After a trainer legitimately switches into a regular user, the
+ session flag ``trainer.identity`` is set. Calling trainer-login
+ again must not let the (now non-trainer) session climb into a
+ gym manager account just because that flag is present.
+ """
+
+ # Step 1: legitimate hop — trainer1 (user 4) into test (user 2)
+ self.user_login('trainer1')
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 2}))
+ self.assertEqual(response.status_code, 302)
+ self.assertTrue(self.client.session.get('trainer.identity'))
+
+ # Step 2: chained hop — now-as-test, target manager1 (user 9, has manage_gym)
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 9}))
+ self.assertEqual(response.status_code, 403)
+
def test_open_redirect_external_next_blocked(self):
"""
The ?next= parameter must only redirect to the same origin.
"""
- self.user_login('admin')
for evil in ('https://evil.example/', '//evil.example/x', '%2F%2Fevil.example'):
+ self.user_login('admin')
response = self.client.get(
reverse('core:user:trainer-login', kwargs={'user_pk': 2}) + f'?next={evil}'
)
self.assertEqual(response.status_code, 302)
self.assertNotIn('evil.example', response['Location'])
+ self.user_logout()
def test_safe_next_passes_through(self):
self.user_login('admin')