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 Geiderb51f472ab2f7
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index 4b708464a..8c4a44cef 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -234,7 +234,7 @@ class TrainerLoginTestCase(WgerTestCase):
self.assertFalse(self.client.session.get('trainer.identity'))
-class GymBypassTestCase(WgerTestCase):
+class GymScopeGuardsTestCase(WgerTestCase):
"""
Test the gym-scope guards
"""
@@ -322,6 +322,62 @@ class GymBypassTestCase(WgerTestCase):
self.assertIn(response.status_code, (403, 404))
self.assertFalse(self.client.session.get('trainer.identity'))
+ def test_admin_notes_list_blocked_when_both_gyms_none(self):
+ """
+ A trainer with gym=None must not list admin notes attached to
+ another gym=None user.
+ """
+ self._set_gym(4, None) # trainer1
+ self._set_gym(14, None) # member1, owner of admin note pk=1
+ self.user_login('trainer1')
+
+ response = self.client.get(reverse('gym:admin_note:list', kwargs={'user_pk': 14}))
+ self.assertEqual(response.status_code, 403)
+
+ def test_admin_notes_update_blocked_when_both_gyms_none(self):
+ """
+ Editing an admin note that belongs to a gym=None member must be
+ blocked for a gym=None trainer.
+ """
+ self._set_gym(4, None)
+ self._set_gym(14, None)
+ self.user_login('trainer1')
+
+ response = self.client.get(reverse('gym:admin_note:edit', kwargs={'pk': 1}))
+ self.assertEqual(response.status_code, 403)
+
+ def test_documents_list_blocked_when_both_gyms_none(self):
+ self._set_gym(4, None)
+ self._set_gym(14, None)
+ self.user_login('trainer1')
+
+ response = self.client.get(reverse('gym:document:list', kwargs={'user_pk': 14}))
+ self.assertEqual(response.status_code, 403)
+
+ def test_documents_update_blocked_when_both_gyms_none(self):
+ self._set_gym(4, None)
+ self._set_gym(14, None)
+ self.user_login('trainer1')
+
+ response = self.client.get(reverse('gym:document:edit', kwargs={'pk': 1}))
+ self.assertEqual(response.status_code, 403)
+
+ def test_contracts_list_blocked_when_both_gyms_none(self):
+ self._set_gym(9, None) # manager1
+ self._set_gym(15, None) # member2, owner of contract pk=1
+ self.user_login('manager1')
+
+ response = self.client.get(reverse('gym:contract:list', kwargs={'user_pk': 15}))
+ self.assertEqual(response.status_code, 403)
+
+ def test_contracts_update_blocked_when_both_gyms_none(self):
+ self._set_gym(9, None)
+ self._set_gym(15, None)
+ self.user_login('manager1')
+
+ response = self.client.get(reverse('gym:contract:edit', kwargs={'pk': 1}))
+ self.assertEqual(response.status_code, 403)
+
class TrainerLogoutTestCase(WgerTestCase):
"""
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index 05a99ce66..9d9c2733b 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -37,6 +37,7 @@ from django.views.generic import (
)
# wger
+from wger.gym.helpers import is_same_gym
from wger.gym.models import AdminUserNote
from wger.utils.generic_views import (
WgerDeleteMixin,
@@ -72,7 +73,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
user = User.objects.get(pk=self.kwargs['user_pk'])
self.member = user
- if user.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(user, request.user):
return HttpResponseForbidden()
return super(ListView, self).dispatch(request, *args, **kwargs)
@@ -111,8 +112,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
user = User.objects.get(pk=self.kwargs['user_pk'])
self.member = user
- gym_id = user.userprofile.gym_id
- if gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(user, request.user):
return HttpResponseForbidden()
return super(AddView, self).dispatch(request, *args, **kwargs)
@@ -149,7 +149,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
return HttpResponseForbidden()
note = self.get_object()
- if note.member.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(note.member, request.user):
return HttpResponseForbidden()
return super(UpdateView, self).dispatch(request, *args, **kwargs)
@@ -184,7 +184,7 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
return HttpResponseForbidden()
note = self.get_object()
- if note.member.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(note.member, request.user):
return HttpResponseForbidden()
return super(DeleteView, self).dispatch(request, *args, **kwargs)
diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.py
index 8ed5c1348..be959c0d2 100644
--- a/wger/gym/views/contract.py
+++ b/wger/gym/views/contract.py
@@ -37,6 +37,7 @@ from django.views.generic import (
)
# wger
+from wger.gym.helpers import is_same_gym
from wger.gym.models import Contract
from wger.utils.generic_views import WgerFormMixin
@@ -106,7 +107,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
user = get_object_or_404(User, pk=self.kwargs['user_pk'])
self.member = user
- if user.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(user, request.user):
return HttpResponseForbidden()
return super(AddView, self).dispatch(request, *args, **kwargs)
@@ -136,7 +137,7 @@ class DetailView(LoginRequiredMixin, PermissionRequiredMixin, DetailView):
return HttpResponseForbidden()
contract = self.get_object()
- if contract.member.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(contract.member, request.user):
return HttpResponseForbidden()
return super(DetailView, self).dispatch(request, *args, **kwargs)
@@ -174,7 +175,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
return HttpResponseForbidden()
contract = self.get_object()
- if contract.member.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(contract.member, request.user):
return HttpResponseForbidden()
return super(UpdateView, self).dispatch(request, *args, **kwargs)
@@ -211,7 +212,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
return HttpResponseForbidden()
self.member = get_object_or_404(User, id=self.kwargs['user_pk'])
- if request.user.userprofile.gym_id != self.member.userprofile.gym_id:
+ if not is_same_gym(request.user, self.member):
return HttpResponseForbidden()
return super(ListView, self).dispatch(request, *args, **kwargs)
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index d13027c3f..f38e0cc05 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -37,6 +37,7 @@ from django.views.generic import (
)
# wger
+from wger.gym.helpers import is_same_gym
from wger.gym.models import UserDocument
from wger.utils.generic_views import (
WgerDeleteMixin,
@@ -72,7 +73,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
user = User.objects.get(pk=self.kwargs['user_pk'])
self.member = user
- if user.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(user, request.user):
return HttpResponseForbidden()
return super(ListView, self).dispatch(request, *args, **kwargs)
@@ -111,7 +112,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
user = User.objects.get(pk=self.kwargs['user_pk'])
self.member = user
- if user.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(user, request.user):
return HttpResponseForbidden()
return super(AddView, self).dispatch(request, *args, **kwargs)
@@ -159,7 +160,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
return HttpResponseForbidden()
note = self.get_object()
- if note.member.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(note.member, request.user):
return HttpResponseForbidden()
return super(UpdateView, self).dispatch(request, *args, **kwargs)
@@ -194,7 +195,7 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
return HttpResponseForbidden()
note = self.get_object()
- if note.member.userprofile.gym_id != request.user.userprofile.gym_id:
+ if not is_same_gym(note.member, request.user):
return HttpResponseForbidden()
return super(DeleteView, self).dispatch(request, *args, **kwargs)