Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add access checks for nutrition diary
Roland Geiderd226c3e9b607
diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.pyindex bf2f3ef9c..c75125aaf 100644--- a/wger/nutrition/tests/test_nutrition_diary.py+++ b/wger/nutrition/tests/test_nutrition_diary.py@@ -17,12 +17,95 @@ import loggingimport datetimefrom decimal import Decimal+from django.core.urlresolvers import reverse+from wger.nutrition.models import NutritionPlan-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.manager.tests.testcase import (+ WorkoutManagerTestCase,+ WorkoutManagerAccessTestCase+)logger = logging.getLogger(__name__)+class DiaryOverviewAccessTest(WorkoutManagerAccessTestCase):+ '''+ Tests accessing a nutrition overview page+ '''+ url = reverse('nutrition:log:overview', kwargs={'pk': 1})+ user_success = 'test'+ user_fail = ('admin',+ 'member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager3',+ 'general_manager1',+ 'general_manager2')+++class DiaryOverview2AccessTest(WorkoutManagerAccessTestCase):+ '''+ Tests accessing a nutrition overview page (read access activated)+ '''+ url = reverse('nutrition:log:overview', kwargs={'pk': 2})+ user_fail = None+ anonymous_fail = False+ user_success = ('admin',+ 'test',+ 'member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager3',+ 'general_manager1',+ 'general_manager2')+++class DiaryDetailAccessTest(WorkoutManagerAccessTestCase):+ '''+ Tests accessing a nutrition overview page+ '''+ url = reverse('nutrition:log:detail', kwargs={'pk': 1,+ 'year': 2016,+ 'month': 5,+ 'day': 15})+ user_success = 'test'+ user_fail = ('admin',+ 'member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager3',+ 'general_manager1',+ 'general_manager2')+++class DiaryDetail2AccessTest(WorkoutManagerAccessTestCase):+ '''+ Tests accessing a nutrition overview page (read access activated)+ '''+ url = reverse('nutrition:log:detail', kwargs={'pk': 2,+ 'year': 2016,+ 'month': 5,+ 'day': 15})+ user_fail = None+ anonymous_fail = False+ user_success = ('admin',+ 'test',+ 'member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager3',+ 'general_manager1',+ 'general_manager2')++class NutritionDiaryTestCase(WorkoutManagerTestCase):'''Tests the different nutrition diary functionsdiff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.pyindex d3f0f317e..5402803d3 100644--- a/wger/nutrition/views/log.py+++ b/wger/nutrition/views/log.py@@ -17,23 +17,36 @@import datetimeimport logging-from django.core.urlresolvers import reverse-from django.http import HttpResponseRedirect-from django.shortcuts import render, get_object_or_404from django.contrib.auth.decorators import login_required+from django.core.urlresolvers import reverse+from django.http import (+ HttpResponseRedirect,+ HttpResponseForbidden+)+from django.shortcuts import (+ render,+ get_object_or_404+)from wger.nutrition.models import NutritionPlanlogger = logging.getLogger(__name__)-@login_requireddef overview(request, pk):'''Shows an overview of diary entries for the given plan'''- context = {}++ # Check read permissionplan = get_object_or_404(NutritionPlan, pk=pk)+ user = plan.user+ is_owner = request.user == user++ if not is_owner and not user.userprofile.ro_access:+ return HttpResponseForbidden()++ context = {}context['plan'] = plancontext['logs'] = plan.get_log_overview()context['nutritional_data'] = plan.get_nutritional_values()@@ -41,12 +54,19 @@ def overview(request, pk):return render(request, 'log/overview.html', context)-@login_requireddef detail(request, pk, year, month, day):'''Shows an overview of the log for the given date'''- context = {}++ # Check read permission+ plan = get_object_or_404(NutritionPlan, pk=pk)+ user = plan.user+ is_owner = request.user == user++ if not is_owner and not user.userprofile.ro_access:+ return HttpResponseForbidden()+try:date = datetime.date(year=int(year), month=int(month), day=int(day))except ValueError:@@ -57,7 +77,7 @@ def detail(request, pk, year, month, day):'month': date.month,'day': date.day}))- plan = get_object_or_404(NutritionPlan, pk=pk)+ context = {}context['plan'] = plancontext['date'] = datecontext['log_values'] = plan.get_logged_values(date)