Self hosted FLOSS fitness/workout, nutrition and weight tracker
Validate the host and protocol when redirecting
Roland Geider0ba371bbb50c
diff --git a/wger/core/tests/test_language.py b/wger/core/tests/test_language.pyindex c68058d70..c4b6004f2 100644--- a/wger/core/tests/test_language.py+++ b/wger/core/tests/test_language.py@@ -16,7 +16,10 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.# Django-from django.urls import reverse_lazy+from django.urls import (+ reverse,+ reverse_lazy,+)# wgerfrom wger.core.models import Language@@ -91,6 +94,42 @@ class DeleteLanguageTestCase(WgerDeleteTestCase):pk = 1+class UseBrowserLanguageRedirectTestCase(WgerTestCase):+ """+ The ``?next=`` parameter must only redirect to the same origin.+ """++ URL = reverse_lazy('core:language:browser_language')++ def test_open_redirect_protocol_relative_blocked(self):+ response = self.client.get(self.URL, {'next': '//evil.example/x'})+ self.assertEqual(response.status_code, 302)+ self.assertFalse(+ response['Location'].startswith('//evil.example'),+ msg=f'open redirect to {response["Location"]!r}',+ )++ def test_open_redirect_absolute_url_blocked(self):+ response = self.client.get(self.URL, {'next': 'https://evil.example/'})+ self.assertEqual(response.status_code, 302)+ self.assertNotIn('evil.example', response['Location'])++ def test_open_redirect_url_encoded_blocked(self):+ response = self.client.get(self.URL + '?next=%2F%2Fevil.example%2Fx')+ self.assertEqual(response.status_code, 302)+ self.assertNotIn('evil.example', response['Location'])++ def test_safe_relative_next_passes_through(self):+ response = self.client.get(self.URL, {'next': '/exercise/overview'})+ self.assertEqual(response.status_code, 302)+ self.assertEqual(response['Location'], '/exercise/overview')++ def test_language_prefix_is_still_stripped(self):+ response = self.client.get(self.URL, {'next': '/en/exercise/overview'})+ self.assertEqual(response.status_code, 302)+ self.assertEqual(response['Location'], '/exercise/overview')++class LanguageApiTestCase(api_base_test.ApiBaseResourceTestCase):"""Tests the language overview resourcediff --git a/wger/core/views/languages.py b/wger/core/views/languages.pyindex 63efff4bc..4f87b0ee7 100644--- a/wger/core/views/languages.py+++ b/wger/core/views/languages.py@@ -24,7 +24,11 @@ from django.contrib.auth.mixins import (PermissionRequiredMixin,)from django.http import HttpResponseRedirect-from django.urls import reverse_lazy+from django.urls import (+ reverse,+ reverse_lazy,+)+from django.utils.http import url_has_allowed_host_and_schemefrom django.utils.translation import (gettext as _,gettext_lazy,@@ -118,6 +122,12 @@ class LanguageEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixidef use_browser_language(request):# Remove language prefix from URL so middleware can re-detect languagenext_url = remove_language_code(request.GET.get('next', '/'))+ if not url_has_allowed_host_and_scheme(+ next_url,+ allowed_hosts={request.get_host()},+ require_https=request.is_secure(),+ ):+ next_url = reverse('core:index')response = HttpResponseRedirect(next_url)response.delete_cookie(settings.LANGUAGE_COOKIE_NAME,diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 975143061..ea5bb028d 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -54,6 +54,7 @@ from django.urls import (reverse_lazy,)from django.utils import translation+from django.utils.http import url_has_allowed_host_and_schemefrom django.utils.translation import (gettext as _,gettext_lazy,@@ -201,10 +202,14 @@ def trainer_login(request, user_pk):if not own:request.session['trainer.identity'] = orig_user_pk- if request.GET.get('next'):- return HttpResponseRedirect(request.GET['next'])- else:- return HttpResponseRedirect(reverse('core:index'))+ next_url = request.GET.get('next')+ if next_url and url_has_allowed_host_and_scheme(+ next_url,+ allowed_hosts={request.get_host()},+ require_https=request.is_secure(),+ ):+ return HttpResponseRedirect(next_url)+ return HttpResponseRedirect(reverse('core:index'))else:return HttpResponseRedirect(reverse('gym:gym:user-list', kwargs={'pk': user.userprofile.gym_id})diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.pyindex 8c4a44cef..5c10715b5 100644--- a/wger/gym/tests/test_user.py+++ b/wger/gym/tests/test_user.py@@ -219,6 +219,26 @@ class TrainerLoginTestCase(WgerTestCase):self.assertEqual(response.status_code, 403)self.assertFalse(self.client.session.get('trainer.identity'))+ def test_open_redirect_external_next_blocked(self):+ """+ The ?next= parameter must only redirect to the same origin.+ """+ self.user_login('admin')+ for evil in ('https://evil.example/', '//evil.example/x', '%2F%2Fevil.example'):+ response = self.client.get(+ reverse('core:user:trainer-login', kwargs={'user_pk': 2}) + f'?next={evil}'+ )+ self.assertEqual(response.status_code, 302)+ self.assertNotIn('evil.example', response['Location'])++ def test_safe_next_passes_through(self):+ self.user_login('admin')+ response = self.client.get(+ reverse('core:user:trainer-login', kwargs={'user_pk': 2}) + '?next=/exercise/overview'+ )+ self.assertEqual(response.status_code, 302)+ self.assertEqual(response['Location'], '/exercise/overview')+def test_gyms_manager(self):"""Test changing the identity to a user with gyms management rights