Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use POST for generating new API keys

Roland Geiderda22adbe5d33
diff --git a/wger/core/templates/user/api_key.html b/wger/core/templates/user/api_key.html
index cd03c3a46..0917705c3 100644
--- a/wger/core/templates/user/api_key.html
+++ b/wger/core/templates/user/api_key.html
@@ -41,13 +41,21 @@ curl -X GET https://wger.de/api/v2/routine/ \
<h4>{% translate "Options" %}</h4>
<p>
- {% if token %}
- <a href="{% url 'core:user:api-key' %}?new_key=true"
- class="btn btn-block btn-light">{% translate 'Delete current API key and generate new one' %}</a>
- {% else %}
- <a href="{% url 'core:user:api-key' %}?new_key=true"
- class="btn btn-block btn-light">{% translate 'Generate new API key' %}</a>
- {% endif %}
+ <button
+ type="button"
+ class="btn btn-block btn-light"
+ hx-post="{% url 'core:user:api-key' %}"
+ hx-vals='{"new_key": "true"}'
+ hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+ hx-target="body"
+ hx-push-url="true"
+ >
+ {% if token %}
+ {% translate 'Delete current API key and generate new one' %}
+ {% else %}
+ {% translate 'Generate new API key' %}
+ {% endif %}
+ </button>
</p>
<p>
diff --git a/wger/core/tests/test_apikey.py b/wger/core/tests/test_apikey.py
index a03baae58..9cf9b1b4b 100644
--- a/wger/core/tests/test_apikey.py
+++ b/wger/core/tests/test_apikey.py
@@ -64,7 +64,7 @@ class ApiKeyTestCase(WgerTestCase):
user = User.objects.get(username='test')
key_before = Token.objects.get(user=user)
- response = self.client.get(reverse('core:user:api-key'), {'new_key': True})
+ response = self.client.post(reverse('core:user:api-key'), {'new_key': True})
self.assertEqual(response.status_code, 302)
response = self.client.get(response['Location'])
self.assertEqual(response.status_code, 200)
@@ -75,3 +75,19 @@ class ApiKeyTestCase(WgerTestCase):
# New key is different from the one before
self.assertNotEqual(key_before.key, key_after.key)
+
+ def test_api_key_rotation_requires_post(self):
+ """
+ Token rotation is a state-changing action and must not be triggered
+ by a GET request — otherwise an attacker could embed a link or
+ image that silently rotates a victim's token.
+ """
+ self.user_login('test')
+ user = User.objects.get(username='test')
+ key_before = Token.objects.get(user=user)
+
+ response = self.client.get(reverse('core:user:api-key'), {'new_key': True})
+ self.assertEqual(response.status_code, 200)
+
+ key_after = Token.objects.get(user=user)
+ self.assertEqual(key_before.key, key_after.key)
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index ea5bb028d..f7b8b628f 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -501,10 +501,10 @@ def api_key(request):
except Token.DoesNotExist:
token = None
- if request.GET.get('new_key'):
- token = create_token(request.user, request.GET.get('new_key'))
+ if request.method == 'POST' and request.POST.get('new_key'):
+ token = create_token(request.user, request.POST.get('new_key'))
- # Redirect to get rid of the GET parameter
+ # Redirect so a refresh doesn't try to rotate again
return HttpResponseRedirect(reverse('core:user:api-key'))
context['token'] = token