Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove possibility to download PDF with token
Roland Geider9bd85a314867
diff --git a/wger/nutrition/tests/test_pdf.py b/wger/nutrition/tests/test_pdf.pyindex 477561920..4634db324 100644--- a/wger/nutrition/tests/test_pdf.py+++ b/wger/nutrition/tests/test_pdf.py@@ -28,32 +28,6 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):Tests exporting a nutritional plan as a pdf"""- def export_pdf_token(self):- """- Helper function to test exporting a nutritional plan as a pdf using- a token as access (no fails)- """-- user = User.objects.get(pk=2)- uid, token = make_token(user)- response = self.client.get(- reverse('nutrition:plan:export-pdf', kwargs={- 'id': 4,- 'uidb64': uid,- 'token': token- })- )-- self.assertEqual(response.status_code, 200)- self.assertEqual(response['Content-Type'], 'application/pdf')- self.assertEqual(- response['Content-Disposition'], 'attachment; filename=nutritional-plan.pdf'- )-- # Approximate size- self.assertGreater(int(response['Content-Length']), 38000)- self.assertLess(int(response['Content-Length']), 42000)-def export_pdf(self, fail=False):"""Helper function to test exporting a nutritional plan as a pdf@@ -103,7 +77,6 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):"""self.export_pdf(fail=True)- self.export_pdf_token()def test_export_pdf_owner(self):"""@@ -112,7 +85,6 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):self.user_login('test')self.export_pdf(fail=False)- self.export_pdf_token()def test_export_pdf_other(self):"""@@ -121,4 +93,3 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):self.user_login('admin')self.export_pdf(fail=True)- self.export_pdf_token()diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.pyindex 165a27e80..9b4d2daa5 100644--- a/wger/nutrition/urls.py+++ b/wger/nutrition/urls.py@@ -48,17 +48,12 @@ patterns_plan = [name='view',),path(- '<int:pk>/copy/',+ '<int:pk>/copy',plan.copy,name='copy',),- re_path(- r'^(?P<id>\d+)/pdf/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})',- plan.export_pdf,- name='export-pdf',- ),path(- '<int:id>/pdf/',+ '<int:id>/pdf',plan.export_pdf,name='export-pdf',),diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.pyindex e5f613168..f2e20f261 100644--- a/wger/nutrition/views/plan.py+++ b/wger/nutrition/views/plan.py@@ -94,7 +94,7 @@ def copy(request, pk):return HttpResponseRedirect(reverse('nutrition:plan:view', kwargs={'id': plan.id}))-def export_pdf(request, id, uidb64=None, token=None):+def export_pdf(request, id: int):"""Generates a PDF with the contents of a nutrition plan@@ -102,17 +102,10 @@ def export_pdf(request, id, uidb64=None, token=None):* http://www.blog.pythonlibrary.org/2010/09/21/reportlab* http://www.reportlab.com/apis/reportlab/dev/platypus.html"""-# Load the plan- if uidb64 is not None and token is not None:- if check_token(uidb64, token):- plan = get_object_or_404(NutritionPlan, pk=id)- else:- return HttpResponseForbidden()- else:- if request.user.is_anonymous:- return HttpResponseForbidden()- plan = get_object_or_404(NutritionPlan, pk=id, user=request.user)+ if request.user.is_anonymous:+ return HttpResponseForbidden()+ plan = get_object_or_404(NutritionPlan, pk=id, user=request.user)plan_data = plan.get_nutritional_values()