Self hosted FLOSS fitness/workout, nutrition and weight tracker
Refactor check_access
Roland Geider40eb2bd580bc
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex 971a4aa90..1f2f421bc 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -106,7 +106,7 @@ class CalendarAccessTestCase(WorkoutManagerTestCase):self.user_login('admin')response = self.client.get(url)- self.assertEqual(response.status_code, 403)+ self.assertEqual(response.status_code, 404)self.user_login('test')response = self.client.get(url)@@ -114,7 +114,7 @@ class CalendarAccessTestCase(WorkoutManagerTestCase):self.user_logout()response = self.client.get(url)- self.assertEqual(response.status_code, 403)+ self.assertEqual(response.status_code, 404)class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex 4f0b84f15..bb4b58e96 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -382,11 +382,7 @@ def calendar(request, username=None, year=None, month=None):'''Show a calendar with all the workout logs'''- try:- is_owner, user = check_access(request.user, username)- except TypeError as e:- # logger.debug("Type error while checking for access: {0}".format(e))- return HttpResponseForbidden()+ is_owner, user = check_access(request.user, username)uid, token = make_token(user)year = int(year) if year else datetime.date.today().yeardiff --git a/wger/utils/helpers.py b/wger/utils/helpers.pyindex 4a1b72466..b2141263a 100644--- a/wger/utils/helpers.py+++ b/wger/utils/helpers.py@@ -23,6 +23,8 @@ import jsonimport datetimefrom functools import wraps++from django.http import Http404from django.contrib.auth.models import Userfrom django.contrib.auth.tokens import default_token_generatorfrom django.shortcuts import get_object_or_404@@ -141,9 +143,11 @@ def check_access(request_user, username=None):Small helper function to check that the current (possibly unauthenticated)user can access a URL that the owner user shared the link.+ Raises Http404 in case of error (no read-only access allowed)+:param request_user: the user in the current request:param username: the username- :return: returns False if unauthorized or a tuple otherwise (is_owner, user)+ :return: a tuple: (is_owner, user)'''if username:@@ -151,12 +155,12 @@ def check_access(request_user, username=None):if request_user.username == username:user = request_userelif not user.userprofile.ro_access:- return False+ raise Http404('You are not allowed to access this page.')# If there is no user_pk, just show the user his own dataelse:if not request_user.is_authenticated():- return False+ raise Http404('You are not allowed to access this page.')user = request_useris_owner = request_user == userdiff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.pyindex f75db0a67..aad9c1eca 100644--- a/wger/weight/tests/test_entry.py+++ b/wger/weight/tests/test_entry.py@@ -56,7 +56,7 @@ class WeightEntryAccessTestCase(WorkoutManagerTestCase):self.user_login('admin')response = self.client.get(url)- self.assertEqual(response.status_code, 403)+ self.assertEqual(response.status_code, 404)self.user_login('test')response = self.client.get(url)@@ -64,7 +64,7 @@ class WeightEntryAccessTestCase(WorkoutManagerTestCase):self.user_logout()response = self.client.get(url)- self.assertEqual(response.status_code, 403)+ self.assertEqual(response.status_code, 404)class AddWeightEntryTestCase(WorkoutManagerAddTestCase):diff --git a/wger/weight/views.py b/wger/weight/views.pyindex 357568158..4b026b5cb 100644--- a/wger/weight/views.py+++ b/wger/weight/views.py@@ -121,11 +121,7 @@ def overview(request, username=None):* https://github.com/mbostock/d3* http://d3js.org/'''- try:- is_owner, user = check_access(request.user, username)- except TypeError as e:- # logger.debug("Type error while checking for access: {0}".format(e))- return HttpResponseForbidden()+ is_owner, user = check_access(request.user, username)template_data = {}@@ -155,11 +151,7 @@ def get_weight_data(request, username=None):Process the data to pass it to the JS libraries to generate an SVG image'''- try:- is_owner, user = check_access(request.user, username)- except TypeError as e:- # logger.info("Type error while checking for access: {0}".format(e))- return HttpResponseForbidden()+ is_owner, user = check_access(request.user, username)date_min = request.GET.get('date_min', False)date_max = request.GET.get('date_max', True)