Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Implement better gym membership checks

Roland Geidere1d329ff4ef6
diff --git a/wger/core/tests/test_user_login.py b/wger/core/tests/test_user_login.py
index a9f00c85d..eb5760536 100644
--- a/wger/core/tests/test_user_login.py
+++ b/wger/core/tests/test_user_login.py
@@ -25,6 +25,7 @@ def _build_mock_request(user):
def _build_mock_user(gym_name, is_trainer=False):
user = mock.Mock()
user.userprofile.gym = gym_name
+ user.userprofile.gym_id = gym_name
def request_has_perm(perm):
if perm in ['gym.gym_trainer', 'gym.manage_gym', 'gym.manage_gyms']:
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 33f0a3f77..975143061 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -87,6 +87,7 @@ from wger.core.forms import (
UserPersonalInformationForm,
UserPreferencesForm,
)
+from wger.gym.helpers import is_same_gym
from wger.gym.models import (
AdminUserNote,
Contract,
@@ -178,7 +179,7 @@ def trainer_login(request, user_pk):
return HttpResponseForbidden()
# Changing is only allowed between the same gym
- if request.user.userprofile.gym != user.userprofile.gym:
+ if not is_same_gym(request.user, user):
return HttpResponseNotFound(
f'There are no users in gym "{request.user.userprofile.gym}" with user ID "{user_pk}".'
)
@@ -463,7 +464,7 @@ class UserEditView(
if (
user.has_perm('gym.manage_gym')
and not user.has_perm('gym.manage_gyms')
- and user.userprofile.gym != self.get_object().userprofile.gym
+ and not is_same_gym(user, self.get_object())
):
return HttpResponseForbidden()
@@ -531,7 +532,7 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
if (
(user.has_perm('gym.manage_gym') or user.has_perm('gym.gym_trainer'))
and not user.has_perm('gym.manage_gyms')
- and user.userprofile.gym != self.get_object().userprofile.gym
+ and not is_same_gym(user, self.get_object())
):
return HttpResponseForbidden()
diff --git a/wger/gym/helpers.py b/wger/gym/helpers.py
index 38709d2bf..cc98d785b 100644
--- a/wger/gym/helpers.py
+++ b/wger/gym/helpers.py
@@ -52,6 +52,17 @@ def get_user_last_activity(user):
return last_activity
+def is_same_gym(user_a, user_b):
+ """
+ Check whether two users belong to the same gym.
+
+ Returns ``True`` only when both users are members of the same, non-null gym
+ """
+ gym_a = user_a.userprofile.gym_id
+ gym_b = user_b.userprofile.gym_id
+ return gym_a is not None and gym_a == gym_b
+
+
def is_any_gym_admin(user):
"""
Small utility that checks that the user object has any administrator
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index 52dee4ac6..4b708464a 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -234,6 +234,95 @@ class TrainerLoginTestCase(WgerTestCase):
self.assertFalse(self.client.session.get('trainer.identity'))
+class GymBypassTestCase(WgerTestCase):
+ """
+ Test the gym-scope guards
+ """
+
+ VICTIM_USER_PK = 2 # 'test'
+
+ def _set_gym(self, user_pk, gym_id):
+ profile = UserProfile.objects.get(user_id=user_pk)
+ profile.gym_id = gym_id
+ profile.save()
+
+ def _both_gyms_none(self, attacker_pk):
+ self._set_gym(attacker_pk, None)
+ self._set_gym(self.VICTIM_USER_PK, None)
+
+ def test_reset_password_blocked_when_both_gyms_none(self):
+ """
+ A manager with gym=None must not reset another gym=None user's
+ password.
+ """
+ self._both_gyms_none(attacker_pk=9) # manager1
+ self.user_login('manager1')
+
+ response = self.client.get(
+ reverse('gym:gym:reset-user-password', kwargs={'user_pk': self.VICTIM_USER_PK})
+ )
+ self.assertEqual(response.status_code, 403)
+
+ def test_reset_password_blocked_attacker_none_victim_real_gym(self):
+ """
+ Sanity check: an attacker with gym=None must not be able to reset
+ the password of a user that is in a real gym either.
+ """
+ self._set_gym(9, None) # manager1; victim keeps fixture gym=1
+ self.user_login('manager1')
+
+ response = self.client.get(
+ reverse('gym:gym:reset-user-password', kwargs={'user_pk': self.VICTIM_USER_PK})
+ )
+ self.assertEqual(response.status_code, 403)
+
+ def test_reset_password_allowed_same_gym(self):
+ """
+ Sanity check: the legitimate same-gym flow must keep working.
+ """
+ self.user_login('manager1')
+
+ response = self.client.get(
+ reverse('gym:gym:reset-user-password', kwargs={'user_pk': self.VICTIM_USER_PK})
+ )
+ self.assertEqual(response.status_code, 200)
+
+ def test_permissions_edit_blocked_when_both_gyms_none(self):
+ self._both_gyms_none(attacker_pk=9)
+ self.user_login('manager1')
+
+ response = self.client.get(
+ reverse('gym:gym:edit-user-permission', kwargs={'user_pk': self.VICTIM_USER_PK})
+ )
+ self.assertEqual(response.status_code, 403)
+
+ def test_user_edit_blocked_when_both_gyms_none(self):
+ self._both_gyms_none(attacker_pk=9)
+ self.user_login('manager1')
+
+ response = self.client.get(reverse('core:user:edit', kwargs={'pk': self.VICTIM_USER_PK}))
+ self.assertEqual(response.status_code, 403)
+
+ def test_user_overview_blocked_when_both_gyms_none(self):
+ self._both_gyms_none(attacker_pk=9)
+ self.user_login('manager1')
+
+ response = self.client.get(
+ reverse('core:user:overview', kwargs={'pk': self.VICTIM_USER_PK})
+ )
+ self.assertEqual(response.status_code, 403)
+
+ def test_trainer_login_blocked_when_both_gyms_none(self):
+ self._both_gyms_none(attacker_pk=4) # trainer1
+ self.user_login('trainer1')
+
+ response = self.client.get(
+ reverse('core:user:trainer-login', kwargs={'user_pk': self.VICTIM_USER_PK})
+ )
+ self.assertIn(response.status_code, (403, 404))
+ self.assertFalse(self.client.session.get('trainer.identity'))
+
+
class TrainerLogoutTestCase(WgerTestCase):
"""
Tests the trainer logout view (switching back to trainer ID)
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 30297fc14..197d1e205 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -67,6 +67,7 @@ from wger.gym.forms import (
from wger.gym.helpers import (
get_permission_list,
is_any_gym_admin,
+ is_same_gym,
)
from wger.gym.models import (
Gym,
@@ -248,10 +249,7 @@ def reset_user_password(request, user_pk):
if not request.user.has_perm('gym.manage_gyms') and not request.user.has_perm('gym.manage_gym'):
return HttpResponseForbidden()
- if (
- request.user.has_perm('gym.manage_gym')
- and request.user.userprofile.gym != user.userprofile.gym
- ):
+ if request.user.has_perm('gym.manage_gym') and not is_same_gym(request.user, user):
return HttpResponseForbidden()
password = password_generator()
@@ -275,7 +273,7 @@ def gym_permissions_user_edit(request, user_pk):
if not user.has_perm('gym.manage_gyms') and not user.has_perm('gym.manage_gym'):
return HttpResponseForbidden()
- if user.has_perm('gym.manage_gym') and user.userprofile.gym != member.userprofile.gym:
+ if user.has_perm('gym.manage_gym') and not is_same_gym(user, member):
return HttpResponseForbidden()
# Calculate available user permissions