Self hosted FLOSS fitness/workout, nutrition and weight tracker
Centralize owner checking logic
Roland Geider7f52a341b1b2
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 136e94a70..17ac077dd 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -276,7 +276,8 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):"""serializer.save(user=self.request.user)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""@@ -309,7 +310,8 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):"""serializer.save(user=self.request.user)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""@@ -343,7 +345,8 @@ class RoutineDayViewSet(WgerOwnerObjectModelViewSet):return Day.objects.filter(routine__user=self.request.user)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""@@ -374,7 +377,8 @@ class SlotViewSet(WgerOwnerObjectModelViewSet):return Slot.objects.filter(day__routine__user=self.request.user)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""@@ -411,7 +415,8 @@ class SlotEntryViewSet(WgerOwnerObjectModelViewSet):return SlotEntry.objects.filter(slot__day__routine__user=self.request.user)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""@@ -427,7 +432,8 @@ class AbstractConfigViewSet(WgerOwnerObjectModelViewSet):ordering_fields = '__all__'filterset_fields = BASE_CONFIG_FIELDS- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""diff --git a/wger/manager/powersync.py b/wger/manager/powersync.pyindex 94078ad6f..d1cb56d64 100644--- a/wger/manager/powersync.py+++ b/wger/manager/powersync.py@@ -15,34 +15,41 @@# Standard Libraryimport logging+from typing import Any# wgerfrom wger.manager.api.serializers import (WorkoutLogSerializer,WorkoutSessionSerializer,)+from wger.manager.api.views import (+ WorkoutLogViewSet,+ WorkoutSessionViewSet,+)from wger.manager.models import (WorkoutLog,WorkoutSession,)-from wger.weight.api.serializers import WeightEntrySerializer-from wger.weight.models import WeightEntry+from wger.utils.viewsets import check_fk_ownershiplogger = logging.getLogger(__name__)-def handle_update_log(payload: dict[str, any], user_id: int) -> None:+def handle_update_log(payload: dict[str, Any], user_id: int) -> None:"""Handle a push event from PowerSync"""logger.debug(f'Received PowerSync payload for update: {payload}')- entry = WorkoutLog.objects.get(pk=payload['id'], user_id=user_id)-- if not entry:+ try:+ entry = WorkoutLog.objects.get(pk=payload['id'], user_id=user_id)+ except WorkoutLog.DoesNotExist:logger.warning(f'WorkoutLog with UUID {payload["id"]} and user {user_id} not found for update.')return+ if not check_fk_ownership(payload, WorkoutLogViewSet.get_owner_objects(), user_id):+ return+serializer = WorkoutLogSerializer(entry, data=payload, partial=True)if serializer.is_valid():serializer.save()@@ -51,11 +58,13 @@ def handle_update_log(payload: dict[str, any], user_id: int) -> None:logger.warning(f'PowerSync update validation failed: {serializer.errors}')-def handle_create_log(payload: dict[str, any], user_id: int) -> None:+def handle_create_log(payload: dict[str, Any], user_id: int) -> None:"""Handle a create event from PowerSync"""- logger.debug(- f'Received PowerSync payload for create: {payload}',- )+ logger.debug(f'Received PowerSync payload for create: {payload}')++ if not check_fk_ownership(payload, WorkoutLogViewSet.get_owner_objects(), user_id):+ return+serializer = WorkoutLogSerializer(data=payload)if serializer.is_valid():serializer.save(user_id=user_id)@@ -63,29 +72,31 @@ def handle_create_log(payload: dict[str, any], user_id: int) -> None:logger.warning(f'PowerSync create validation failed: {serializer.errors}')-def handle_delete_log(payload: dict[str, any], user_id: int) -> None:+def handle_delete_log(payload: dict[str, Any], user_id: int) -> None:"""Handle a delete event from PowerSync"""logger.debug(f'Received PowerSync payload for delete: {payload}')- entry = WorkoutLog.objects.get(pk=payload['id'], user_id=user_id)- if not entry:+ try:+ entry = WorkoutLog.objects.get(pk=payload['id'], user_id=user_id)+ except WorkoutLog.DoesNotExist:logger.warning(f'WorkoutLog with UUID {payload["id"]} not found for delete.')returnentry.delete()-def handle_update_session(payload: dict[str, any], user_id: int) -> None:+def handle_update_session(payload: dict[str, Any], user_id: int) -> None:"""Handle a push event from PowerSync"""- logger.debug(- f'Received PowerSync payload for update: {payload}',- )- entry = WorkoutSession.objects.get(pk=payload['id'], user_id=user_id)-- if not entry:+ logger.debug(f'Received PowerSync payload for update: {payload}')+ try:+ entry = WorkoutSession.objects.get(pk=payload['id'], user_id=user_id)+ except WorkoutSession.DoesNotExist:logger.warning(f'WorkoutSession with UUID {payload["id"]} and user {user_id} not found for update.')return+ if not check_fk_ownership(payload, WorkoutSessionViewSet.get_owner_objects(), user_id):+ return+serializer = WorkoutSessionSerializer(entry, data=payload, partial=True)if serializer.is_valid():serializer.save()@@ -94,11 +105,13 @@ def handle_update_session(payload: dict[str, any], user_id: int) -> None:logger.warning(f'PowerSync update validation failed: {serializer.errors}')-def handle_create_session(payload: dict[str, any], user_id: int) -> None:+def handle_create_session(payload: dict[str, Any], user_id: int) -> None:"""Handle a create event from PowerSync"""- logger.debug(- f'Received PowerSync payload for create: {payload}',- )+ logger.debug(f'Received PowerSync payload for create: {payload}')++ if not check_fk_ownership(payload, WorkoutSessionViewSet.get_owner_objects(), user_id):+ return+serializer = WorkoutSessionSerializer(data=payload)if serializer.is_valid():serializer.save(user_id=user_id)@@ -106,11 +119,12 @@ def handle_create_session(payload: dict[str, any], user_id: int) -> None:logger.warning(f'PowerSync create validation failed: {serializer.errors}')-def handle_delete_session(payload: dict[str, any], user_id: int) -> None:+def handle_delete_session(payload: dict[str, Any], user_id: int) -> None:"""Handle a delete event from PowerSync"""logger.debug(f'Received PowerSync payload for delete: {payload}')- entry = WorkoutSession.objects.get(pk=payload['id'], user_id=user_id)- if not entry:+ try:+ entry = WorkoutSession.objects.get(pk=payload['id'], user_id=user_id)+ except WorkoutSession.DoesNotExist:logger.warning(f'WorkoutSession with UUID {payload["id"]} not found for delete.')returnentry.delete()diff --git a/wger/measurements/api/views.py b/wger/measurements/api/views.pyindex f6e5f6b28..54641dffe 100644--- a/wger/measurements/api/views.py+++ b/wger/measurements/api/views.py@@ -68,7 +68,8 @@ class CategoryViewSet(WgerOwnerObjectModelViewSet):"""serializer.save(user=self.request.user)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""@@ -86,7 +87,8 @@ class MeasurementViewSet(WgerOwnerObjectModelViewSet):ordering_fields = '__all__'filterset_class = MeasurementEntryFilterSet- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""diff --git a/wger/measurements/powersync.py b/wger/measurements/powersync.pyindex bcfdda0c8..3e10725ed 100644--- a/wger/measurements/powersync.py+++ b/wger/measurements/powersync.py@@ -18,12 +18,16 @@ import loggingfrom typing import Any# wger-from wger.measurements.api.serializers import MeasurementSerializer-from wger.measurements.api.views import CategorySerializer+from wger.measurements.api.serializers import (+ CategorySerializer,+ MeasurementSerializer,+)+from wger.measurements.api.views import MeasurementViewSetfrom wger.measurements.models import (Category,Measurement,)+from wger.utils.viewsets import check_fk_ownershiplogger = logging.getLogger(__name__)@@ -32,9 +36,9 @@ logger = logging.getLogger(__name__)def handle_update_category(payload: dict[str, Any], user_id: int) -> None:"""Handle a push event from PowerSync"""logger.debug(f'Received PowerSync payload for update: {payload}')- entry = Category.objects.get(pk=payload['id'], user_id=user_id)-- if not entry:+ try:+ entry = Category.objects.get(pk=payload['id'], user_id=user_id)+ except Category.DoesNotExist:logger.warning(f'Category with UUID {payload["id"]} and user {user_id} not found for update.')@@ -50,9 +54,7 @@ def handle_update_category(payload: dict[str, Any], user_id: int) -> None:def handle_create_category(payload: dict[str, Any], user_id: int) -> None:"""Handle a create event from PowerSync"""- logger.debug(- f'Received PowerSync payload for create: {payload}',- )+ logger.debug(f'Received PowerSync payload for create: {payload}')serializer = CategorySerializer(data=payload)if serializer.is_valid():serializer.save(user_id=user_id)@@ -63,8 +65,9 @@ def handle_create_category(payload: dict[str, Any], user_id: int) -> None:def handle_delete_category(payload: dict[str, Any], user_id: int) -> None:"""Handle a delete event from PowerSync"""logger.debug(f'Received PowerSync payload for delete: {payload}')- entry = Category.objects.get(pk=payload['id'], user_id=user_id)- if not entry:+ try:+ entry = Category.objects.get(pk=payload['id'], user_id=user_id)+ except Category.DoesNotExist:logger.warning(f'Category with UUID {payload["id"]} not found for delete.')returnentry.delete()@@ -73,14 +76,17 @@ def handle_delete_category(payload: dict[str, Any], user_id: int) -> None:def handle_update_measurement(payload: dict[str, Any], user_id: int) -> None:"""Handle a push event from PowerSync"""logger.debug(f'Received PowerSync payload for update: {payload}')- entry = Measurement.objects.get(pk=payload['id'], user_id=user_id)-- if not entry:+ try:+ entry = Measurement.objects.get(pk=payload['id'], category__user_id=user_id)+ except Measurement.DoesNotExist:logger.warning(f'Measurement with UUID {payload["id"]} and user {user_id} not found for update.')return+ if not check_fk_ownership(payload, MeasurementViewSet.get_owner_objects(), user_id):+ return+serializer = MeasurementSerializer(entry, data=payload, partial=True)if serializer.is_valid():serializer.save()@@ -92,9 +98,13 @@ def handle_update_measurement(payload: dict[str, Any], user_id: int) -> None:def handle_create_measurement(payload: dict[str, Any], user_id: int) -> None:"""Handle a create event from PowerSync"""logger.debug(f'Received PowerSync payload for create: {payload}')++ if not check_fk_ownership(payload, MeasurementViewSet.get_owner_objects(), user_id):+ return+serializer = MeasurementSerializer(data=payload)if serializer.is_valid():- serializer.save(user_id=user_id)+ serializer.save()else:logger.warning(f'PowerSync create validation failed: {serializer.errors}')@@ -102,8 +112,9 @@ def handle_create_measurement(payload: dict[str, Any], user_id: int) -> None:def handle_delete_measurement(payload: dict[str, Any], user_id: int) -> None:"""Handle a delete event from PowerSync"""logger.debug(f'Received PowerSync payload for delete: {payload}')- entry = Measurement.objects.get(pk=payload['id'], user_id=user_id)- if not entry:+ try:+ entry = Measurement.objects.get(pk=payload['id'], category__user_id=user_id)+ except Measurement.DoesNotExist:logger.warning(f'Measurement with UUID {payload["id"]} not found for delete.')returnentry.delete()diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex b3eae8395..b61d44624 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -269,7 +269,8 @@ class MealViewSet(WgerOwnerObjectModelViewSet):"""serializer.save(order=1)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""@@ -316,7 +317,8 @@ class MealItemViewSet(WgerOwnerObjectModelViewSet):"""serializer.save(order=1)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""@@ -350,7 +352,8 @@ class LogItemViewSet(WgerOwnerObjectModelViewSet):return LogItem.objects.select_related('plan').filter(plan__user=self.request.user)- def get_owner_objects(self):+ @staticmethod+ def get_owner_objects():"""Return objects to check for ownership permission"""diff --git a/wger/utils/viewsets.py b/wger/utils/viewsets.pyindex b31e17612..25bb9c965 100644--- a/wger/utils/viewsets.py+++ b/wger/utils/viewsets.py@@ -15,6 +15,9 @@# You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.+# Standard Library+import logging+# Third Partyfrom rest_framework import (exceptions,@@ -22,39 +25,54 @@ from rest_framework import ()+logger = logging.getLogger(__name__)+++def check_fk_ownership(payload: dict, owner_objects: list[tuple], user_id: int) -> bool:+ """+ Validate that FK references in payload belong to the given user.++ Uses the same get_owner_object() convention as WgerOwnerObjectModelViewSet:+ owner_objects is a list of (Model, field_name) tuples. For each field present+ in payload, the referenced object is loaded and its ownership is verified via+ get_owner_object().user.++ Returns True if all checks pass, False otherwise.+ """+ for model_class, field_name in owner_objects:+ pk = payload.get(field_name)+ if pk is None:+ continue++ try:+ obj = model_class.objects.get(pk=pk)+ except model_class.DoesNotExist:+ logger.warning(f'{model_class.__name__} with pk {pk} not found during ownership check')+ return False++ owner = obj.get_owner_object()+ if owner and hasattr(owner, 'user') and owner.user_id != user_id:+ logger.warning(f'{model_class.__name__} {pk} does not belong to user {user_id}')+ return False+ return True++class WgerOwnerObjectModelViewSet(viewsets.ModelViewSet):"""Custom viewset that makes sure the user can only create objects for himself"""+ def _check_owner_permission(self, request):+ if not isinstance(request.data, dict):+ raise exceptions.ValidationError('Request data is not a dictionary')++ if not check_fk_ownership(request.data, self.get_owner_objects(), request.user.pk):+ raise exceptions.PermissionDenied('You are not allowed to do this')+def create(self, request, *args, **kwargs):- """- Check for creation (PUT, POST)- """- for entry in self.get_owner_objects():- if not isinstance(request.data, dict):- raise exceptions.ValidationError('Request data is not a dictionary')-- if request.data.get(entry[1]):- pk = request.data.get(entry[1])- obj = entry[0].objects.get(pk=pk)- if obj.get_owner_object().user != request.user:- raise exceptions.PermissionDenied('You are not allowed to do this')- else:- return super().create(request, *args, **kwargs)+ self._check_owner_permission(request)+ return super().create(request, *args, **kwargs)def update(self, request, *args, **kwargs):- """- Check for updates (PUT, PATCH)- """- for entry in self.get_owner_objects():- if not isinstance(request.data, dict):- raise exceptions.ValidationError('Request data is not a dictionary')-- if request.data.get(entry[1]):- pk = request.data.get(entry[1])- obj = entry[0].objects.get(pk=pk)- if obj.get_owner_object().user != request.user:- raise exceptions.PermissionDenied('You are not allowed to do this')- else:- return super().update(request, *args, **kwargs)+ self._check_owner_permission(request)+ return super().update(request, *args, **kwargs)diff --git a/wger/weight/powersync.py b/wger/weight/powersync.pyindex 2cf2f56a1..f516f8832 100644--- a/wger/weight/powersync.py+++ b/wger/weight/powersync.py@@ -15,6 +15,7 @@# Standard Libraryimport logging+from typing import Any# Djangofrom django.http import HttpRequest@@ -27,21 +28,22 @@ from wger.weight.models import WeightEntrylogger = logging.getLogger(__name__)-def handle_update(payload: dict[str, any], user_id: int, request: HttpRequest) -> None:+def handle_update(payload: dict[str, Any], user_id: int, request: HttpRequest) -> None:"""Handle a push event from PowerSync"""- logger.debug(- f'Received PowerSync payload for update: {payload}',- )- entry = WeightEntry.objects.get(uuid=payload['id'], user_id=user_id)-- if not entry:+ logger.debug(f'Received PowerSync payload for update: {payload}')+ try:+ entry = WeightEntry.objects.get(uuid=payload['id'], user_id=user_id)+ except WeightEntry.DoesNotExist:logger.warning(f'WeightEntry with UUID {payload["id"]} and user {user_id} not found for update.')returnserializer = WeightEntrySerializer(- entry, data=payload, partial=True, context={'request': request}+ entry,+ data=payload,+ partial=True,+ context={'request': request},)if serializer.is_valid():serializer.save()@@ -50,11 +52,9 @@ def handle_update(payload: dict[str, any], user_id: int, request: HttpRequest) -logger.warning(f'PowerSync update validation failed: {serializer.errors}')-def handle_create(payload: dict[str, any], user_id: int, request: HttpRequest) -> None:+def handle_create(payload: dict[str, Any], user_id: int, request: HttpRequest) -> None:"""Handle a create event from PowerSync"""- logger.debug(- f'Received PowerSync payload for create: {payload}',- )+ logger.debug(f'Received PowerSync payload for create: {payload}')serializer = WeightEntrySerializer(data=payload, context={'request': request})if serializer.is_valid():serializer.save(user_id=user_id)@@ -62,13 +62,12 @@ def handle_create(payload: dict[str, any], user_id: int, request: HttpRequest) -logger.warning(f'PowerSync create validation failed: {serializer.errors}')-def handle_delete(payload: dict[str, any], user_id: int) -> None:+def handle_delete(payload: dict[str, Any], user_id: int) -> None:"""Handle a delete event from PowerSync"""- logger.debug(- f'Received PowerSync payload for delete: {payload}',- )- entry = WeightEntry.objects.get(uuid=payload['id'], user_id=user_id)- if not entry:- logger.warning(f'WeightEntry with UUID {payload["uuid"]} not found for delete.')+ logger.debug(f'Received PowerSync payload for delete: {payload}')+ try:+ entry = WeightEntry.objects.get(uuid=payload['id'], user_id=user_id)+ except WeightEntry.DoesNotExist:+ logger.warning(f'WeightEntry with UUID {payload["id"]} not found for delete.')returnentry.delete()