Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add object level permissions for creation operations
Roland Geider6e5aa48d3917
diff --git a/wger/core/management/commands/clear-cache.py b/wger/core/management/commands/clear-cache.pyindex 2aa0f2904..a4dbd96be 100644--- a/wger/core/management/commands/clear-cache.py+++ b/wger/core/management/commands/clear-cache.py@@ -76,4 +76,4 @@ class Command(BaseCommand):# Workout canonical formif options['clear_workout']:for w in Workout.objects.all():- reset_workout_canonical_form(w.pk)\ No newline at end of file+ reset_workout_canonical_form(w.pk)diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 4174a796a..6e174a66e 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -16,10 +16,10 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.from rest_framework import serializers-from rest_framework.decorators import link-from rest_framework.response import Responsefrom wger.manager.models import Workout+from wger.manager.models import Schedule+from wger.manager.models import WorkoutLogfrom wger.manager.models import WorkoutSession@@ -45,3 +45,21 @@ class WorkoutSessionSerializer(serializers.ModelSerializer):class Meta:model = WorkoutSessionexclude = ('user',)+++class WorkoutLogSerializer(serializers.ModelSerializer):+ '''+ Workout session serializer+ '''+ class Meta:+ model = WorkoutLog+ exclude = ('user',)+++class ScheduleSerializer(serializers.ModelSerializer):+ '''+ Schedule serializer+ '''+ class Meta:+ model = Schedule+ exclude = ('user',)diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex c346490bd..30dfd8314 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -14,22 +14,23 @@## 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/>.-from django.http.response import HttpResponse+import datetimefrom rest_framework import viewsets-from rest_framework.decorators import link-from rest_framework.response import Responsefrom wger.manager.api.serializers import WorkoutSerializer+from wger.manager.api.serializers import ScheduleSerializer+from wger.manager.api.serializers import WorkoutLogSerializerfrom wger.manager.api.serializers import WorkoutSessionSerializer-from wger.manager.models import Workout+from wger.manager.models import Setfrom wger.manager.models import ScheduleStepfrom wger.manager.models import Schedulefrom wger.manager.models import Dayfrom wger.manager.models import Settingfrom wger.manager.models import WorkoutLogfrom wger.manager.models import WorkoutSession+from wger.utils.viewsets import WgerOwnerObjectModelViewSetclass WorkoutViewSet(viewsets.ModelViewSet):@@ -52,7 +53,7 @@ class WorkoutViewSet(viewsets.ModelViewSet):obj.user = self.request.user-class WorkoutSessionViewSet(viewsets.ModelViewSet):+class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):'''API endpoint for workout sessions objects'''@@ -69,12 +70,22 @@ class WorkoutSessionViewSet(viewsets.ModelViewSet):'''Set the owner'''+ obj.date = datetime.date.today() # TODO: actually, this should be editableobj.user = self.request.user+ def get_owner_objects(self):+ '''+ Return objects to check for ownership permission+ '''+ return [Workout.objects.get(pk=self.request.DATA['workout'])]+-class ScheduleStepViewSet(viewsets.ModelViewSet):+class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):'''API endpoint for schedule step objects++ TODO: error while POSTing+ object of type 'int' has no len()'''model = ScheduleStep@@ -84,12 +95,26 @@ class ScheduleStepViewSet(viewsets.ModelViewSet):'''return ScheduleStep.objects.filter(schedule__user=self.request.user)+ def pre_save(self, obj):+ '''+ Set the order+ '''+ obj.order = 1++ def get_owner_objects(self):+ '''+ Return objects to check for ownership permission+ '''+ return [Workout.objects.get(pk=self.request.DATA['workout']),+ Schedule.objects.get(pk=self.request.DATA['schedule'])]+class ScheduleViewSet(viewsets.ModelViewSet):'''API endpoint for schedule objects'''model = Schedule+ serializer_class = ScheduleSerializerdef get_queryset(self):'''@@ -97,8 +122,14 @@ class ScheduleViewSet(viewsets.ModelViewSet):'''return Schedule.objects.filter(user=self.request.user)+ def pre_save(self, obj):+ '''+ Set the order+ '''+ obj.user = self.request.user+-class DayViewSet(viewsets.ModelViewSet):+class DayViewSet(WgerOwnerObjectModelViewSet):'''API endpoint for training day objects'''@@ -110,8 +141,33 @@ class DayViewSet(viewsets.ModelViewSet):'''return Day.objects.filter(training__user=self.request.user)+ def get_owner_objects(self):+ '''+ Return objects to check for ownership permission+ '''+ return [Workout.objects.get(pk=self.request.DATA['training'])]+-class SettingViewSet(viewsets.ModelViewSet):+class SetViewSet(WgerOwnerObjectModelViewSet):+ '''+ API endpoint for workout set objects+ '''+ model = Set++ def get_queryset(self):+ '''+ Only allow access to appropriate objects+ '''+ return Setting.objects.filter(exerciseday__training__user=self.request.user)++ def get_owner_objects(self):+ '''+ Return objects to check for ownership permission+ '''+ return [Day.objects.get(pk=self.request.DATA['exerciseday'])]+++class SettingViewSet(WgerOwnerObjectModelViewSet):'''API endpoint for repetition setting objects'''@@ -123,15 +179,40 @@ class SettingViewSet(viewsets.ModelViewSet):'''return Setting.objects.filter(set__exerciseday__training__user=self.request.user)+ def pre_save(self, obj):+ '''+ Set the order+ '''+ obj.order = 1-class WorkoutLogViewSet(viewsets.ModelViewSet):+ def get_owner_objects(self):+ '''+ Return objects to check for ownership permission+ '''+ return [Set.objects.get(pk=self.request.DATA['set'])]+++class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):'''API endpoint for workout log objects'''model = WorkoutLog+ serializer_class = WorkoutLogSerializerdef get_queryset(self):'''Only allow access to appropriate objects'''return WorkoutLog.objects.filter(user=self.request.user)++ def pre_save(self, obj):+ '''+ Set the order+ '''+ obj.user = self.request.user++ def get_owner_objects(self):+ '''+ Return objects to check for ownership permission+ '''+ return [Workout.objects.get(pk=self.request.DATA['workout'])]diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex d0a7226f4..b8b7d0504 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -18,10 +18,13 @@from rest_framework import viewsetsfrom wger.nutrition.api.serializers import NutritionPlanSerializer-from wger.nutrition.models import Ingredient, Meal, MealItem+from wger.nutrition.models import Ingredient+from wger.nutrition.models import Meal+from wger.nutrition.models import MealItemfrom wger.nutrition.models import WeightUnitfrom wger.nutrition.models import IngredientWeightUnitfrom wger.nutrition.models import NutritionPlan+from wger.utils.viewsets import WgerOwnerObjectModelViewSetclass IngredientViewSet(viewsets.ReadOnlyModelViewSet):@@ -65,7 +68,7 @@ class NutritionPlanViewSet(viewsets.ModelViewSet):obj.user = self.request.user-class MealViewSet(viewsets.ModelViewSet):+class MealViewSet(WgerOwnerObjectModelViewSet):'''API endpoint for meal objects'''@@ -77,8 +80,20 @@ class MealViewSet(viewsets.ModelViewSet):'''return NutritionPlan.objects.filter(plan__user=self.request.user)+ def pre_save(self, obj):+ '''+ Set the order+ '''+ obj.order = 1++ def get_owner_objects(self):+ '''+ Return objects to check for ownership permission+ '''+ return [NutritionPlan.objects.get(pk=self.request.DATA['plan'])]+-class MealItemViewSet(viewsets.ModelViewSet):+class MealItemViewSet(WgerOwnerObjectModelViewSet):'''API endpoint for meal item objects'''@@ -89,3 +104,15 @@ class MealItemViewSet(viewsets.ModelViewSet):Only allow access to appropriate objects'''return MealItem.objects.filter(meal__plan__user=self.request.user)++ def pre_save(self, obj):+ '''+ Set the order+ '''+ obj.order = 1++ def get_owner_objects(self):+ '''+ Return objects to check for ownership permission+ '''+ return [Meal.objects.get(pk=self.request.DATA['meal'])]diff --git a/wger/urls.py b/wger/urls.pyindex 401aa7f43..b5d7ade24 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -87,6 +87,7 @@ router.register(r'workoutsession', manager_api_views.WorkoutSessionViewSet)router.register(r'schedulestep', manager_api_views.ScheduleStepViewSet)router.register(r'schedule', manager_api_views.ScheduleViewSet)router.register(r'day', manager_api_views.DayViewSet)+router.register(r'set', manager_api_views.SetViewSet)router.register(r'setting', manager_api_views.SettingViewSet)router.register(r'workoutlog', manager_api_views.WorkoutLogViewSet)diff --git a/wger/utils/viewsets.py b/wger/utils/viewsets.pynew file mode 100644index 000000000..1806d80ee--- /dev/null+++ b/wger/utils/viewsets.py@@ -0,0 +1,34 @@+# -*- coding: utf-8 -*-++# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# 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/>.+from django.http.response import HttpResponse++from rest_framework import status, exceptions+from rest_framework import viewsets+++class WgerOwnerObjectModelViewSet(viewsets.ModelViewSet):+ '''+ Custom viewset that makes sure the user can only create objects for himself+ '''+ def create(self, request, *args, **kwargs):+ '''+ '''+ for obj in self.get_owner_objects():+ if obj.get_owner_object().user != request.user:+ raise exceptions.PermissionDenied('You are not allowed to do this')+ else:+ return super(WgerOwnerObjectModelViewSet, self).create(request, *args, **kwargs)