Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Check gym roles of deactivated accounts

Roland Geidereaaf70d55c7d
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 433182d86..365fac272 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -87,6 +87,7 @@ from wger.core.forms import (
UserPreferencesForm,
)
from wger.gym.helpers import (
+ holds_gym_permission,
is_same_gym,
outranks,
)
@@ -156,9 +157,7 @@ def delete(request, user_pk=None):
if not request.user.has_perm('gym.manage_gyms') and (
not request.user.has_perm('gym.manage_gym')
or not is_same_gym(request.user, user)
- or user.has_perm('gym.manage_gym')
- or user.has_perm('gym.gym_trainer')
- or user.has_perm('gym.manage_gyms')
+ or holds_gym_permission(user, 'manage_gym', 'gym_trainer', 'manage_gyms')
):
return HttpResponseForbidden()
else:
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index e6d4a2039..85cd45725 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -390,6 +390,52 @@ class EditUserTargetRoleTestCase(WgerTestCase):
self.assertEqual(self.edit('general_manager1', 11), 302)
+class DeleteUserTargetRoleTestCase(WgerTestCase):
+ """
+ Managers can only delete accounts without a gym role, also deactivated ones
+ """
+
+ def delete(self, username: str, target_pk: int) -> int:
+ """
+ Deletes the target as the given user and returns the status code
+
+ Also checks that the account is only gone when the request succeeded.
+ """
+ self.user_login(username)
+ response = self.client.post(
+ reverse('core:user:delete', kwargs={'user_pk': target_pk}),
+ {'password': self.current_password},
+ )
+
+ deleted = not User.objects.filter(pk=target_pk).exists()
+ self.assertEqual(deleted, response.status_code == 302)
+ return response.status_code
+
+ def test_manager_cannot_delete_deactivated_manager(self):
+ User.objects.filter(pk=10).update(is_active=False)
+ self.assertEqual(self.delete('manager1', 10), 403)
+
+ def test_manager_cannot_delete_deactivated_trainer(self):
+ User.objects.filter(pk=4).update(is_active=False)
+ self.assertEqual(self.delete('manager1', 4), 403)
+
+ def test_manager_cannot_delete_deactivated_general_manager(self):
+ User.objects.filter(pk=12).update(is_active=False)
+ self.assertEqual(self.delete('manager1', 12), 403)
+
+ def test_manager_cannot_delete_deactivated_admin(self):
+ User.objects.filter(pk=1).update(is_active=False)
+ self.assertEqual(self.delete('manager1', 1), 403)
+
+ def test_manager_cannot_delete_deactivated_superuser(self):
+ User.objects.filter(pk=21).update(is_superuser=True, is_active=False)
+ self.assertEqual(self.delete('manager1', 21), 403)
+
+ def test_manager_can_delete_deactivated_member(self):
+ User.objects.filter(pk=14).update(is_active=False)
+ self.assertEqual(self.delete('manager1', 14), 302)
+
+
class EditUserPermissionTargetRoleTestCase(WgerTestCase):
"""
The gym roles of an account can only be edited when the user could grant all of them