Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Build links in account emails from SITE_URL

Roland Geiderf0a8493f0b3e
diff --git a/wger/core/account_adapter.py b/wger/core/account_adapter.py
index 1ed67860f..28d07fb88 100644
--- a/wger/core/account_adapter.py
+++ b/wger/core/account_adapter.py
@@ -14,6 +14,10 @@
# Standard Library
from datetime import timedelta
+from urllib.parse import (
+ urlsplit,
+ urlunsplit,
+)
# Django
from django.conf import settings
@@ -27,11 +31,29 @@ from allauth.account.adapter import DefaultAccountAdapter
# wger
from wger.core.models import UserProfile
+from wger.utils.url import make_absolute_url
+
+
+def on_site_url(url: str) -> str:
+ """
+ Rebuild an absolute URL on SITE_URL instead of the host of the request
+
+ The Host header is set by the client, so links with a secret key must not
+ be built from it.
+ """
+ parts = urlsplit(url)
+ return make_absolute_url(urlunsplit(('', '', parts.path, parts.query, parts.fragment)))
class WgerAccountAdapter(DefaultAccountAdapter):
"""Wger Account Adapter for allauth"""
+ def get_reset_password_from_key_url(self, key):
+ return on_site_url(super().get_reset_password_from_key_url(key))
+
+ def get_email_confirmation_url(self, request, emailconfirmation):
+ return on_site_url(super().get_email_confirmation_url(request, emailconfirmation))
+
def is_open_for_signup(self, request):
return settings.WGER_SETTINGS['ALLOW_REGISTRATION']
diff --git a/wger/core/tests/test_account_email_links.py b/wger/core/tests/test_account_email_links.py
new file mode 100644
index 000000000..8e62be999
--- /dev/null
+++ b/wger/core/tests/test_account_email_links.py
@@ -0,0 +1,86 @@
+# 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
+
+# Standard Library
+import json
+
+# Django
+from django.core import mail
+from django.test import override_settings
+from django.urls import reverse
+
+# wger
+from wger.core.tests.base_testcase import WgerTestCase
+
+
+@override_settings(SITE_URL='https://wger.example', ALLOWED_HOSTS=['*'])
+class AccountEmailLinksTestCase(WgerTestCase):
+ """
+ Links with a secret key in account emails point to SITE_URL, not to the
+ host of the request
+ """
+
+ forged_host = 'evil.example'
+
+ def assert_link_on_site_url(self, link_path: str):
+ self.assertEqual(len(mail.outbox), 1)
+ body = mail.outbox[0].body
+
+ self.assertIn(f'https://wger.example{link_path}', body)
+ self.assertNotIn(self.forged_host, body)
+
+ def test_password_reset(self):
+ """
+ Password reset requested through the allauth form
+ """
+ response = self.client.post(
+ reverse('account_reset_password'),
+ {'email': '[email protected]'},
+ HTTP_HOST=self.forged_host,
+ )
+
+ self.assertEqual(response.status_code, 302)
+ self.assert_link_on_site_url('/account/password/reset/key/')
+
+ def test_password_reset_headless(self):
+ """
+ Password reset requested through the API used by the app
+ """
+ response = self.client.post(
+ reverse('headless:app:account:request_password_reset'),
+ data=json.dumps({'email': '[email protected]'}),
+ content_type='application/json',
+ HTTP_HOST=self.forged_host,
+ )
+
+ self.assertEqual(response.status_code, 200)
+ self.assert_link_on_site_url('/account/password/reset/key/')
+
+ def test_email_confirmation(self):
+ """
+ Confirmation email sent after signing up
+ """
+ response = self.client.post(
+ reverse('account_signup'),
+ {
+ 'username': 'newbie',
+ 'email': '[email protected]',
+ 'password1': 'Sup3r-Secret-pw!',
+ 'password2': 'Sup3r-Secret-pw!',
+ },
+ HTTP_HOST=self.forged_host,
+ )
+
+ self.assertEqual(response.status_code, 302)
+ self.assert_link_on_site_url('/account/confirm-email/')