Self hosted FLOSS fitness/workout, nutrition and weight tracker
Generate and work with keys with pyjwt, python_jose is not needed anymore
Roland Geider6a5ab0696bf1
diff --git a/pyproject.toml b/pyproject.tomlindex d2ab6e942..8d016c7e4 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -46,7 +46,7 @@ dependencies = ["django-simple-history~=3.11.0","django-sortedm2m~=4.0.0","django-storages~=1.14.6",- "djangorestframework-simplejwt[crypto,python_jose]~=5.5.1",+ "djangorestframework-simplejwt[crypto]~=5.5.1","djangorestframework~=3.17.1","django~=6.0.5","drf-spectacular[sidecar]~=0.29.0",diff --git a/settings/settings_global.py b/settings/settings_global.pyindex 3e4f25739..e605eab4d 100644--- a/settings/settings_global.py+++ b/settings/settings_global.py@@ -14,7 +14,6 @@# Standard Libraryimport datetime-import jsonimport osimport reimport sys@@ -23,7 +22,9 @@ from datetime import timedeltafrom pathlib import Path# Third Party-from jose import jwk as jose_jwk+from cryptography.hazmat.primitives import serialization+from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey+from jwt.algorithms import RSAAlgorithm# wgerfrom wger.utils.constants import DOWNLOAD_INGREDIENT_WGER@@ -295,9 +296,19 @@ def jwk_b64_to_pem(b64_jwk_str: str):if not b64_jwk_str:return ''- jwk_dict = json.loads(urlsafe_b64decode(b64_jwk_str))- pem = jose_jwk.construct(jwk_dict).to_pem()- return pem.decode() if isinstance(pem, bytes) else pem+ key = RSAAlgorithm.from_jwk(urlsafe_b64decode(b64_jwk_str).decode())+ if isinstance(key, RSAPrivateKey):+ pem = key.private_bytes(+ serialization.Encoding.PEM,+ serialization.PrivateFormat.PKCS8,+ serialization.NoEncryption(),+ )+ else:+ pem = key.public_bytes(+ serialization.Encoding.PEM,+ serialization.PublicFormat.SubjectPublicKeyInfo,+ )+ return pem.decode()## Logindiff --git a/uv.lock b/uv.lockindex 5acb303ad..25841f54a 100644--- a/uv.lock+++ b/uv.lock@@ -732,9 +732,6 @@ wheels = [crypto = [{ name = "cryptography" },]-python-jose = [- { name = "python-jose" },-][[package]]name = "drf-spectacular"@@ -783,18 +780,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/b0/90/be137d0592501ec08d4a00c8430121e95dfe6c8114a1d4436b5cdd6b9803/easy_thumbnails-2.10.1-py3-none-any.whl", hash = "sha256:24462d63dd31543ef1585538b2bfefe0db96d3409bb431c70b81548fb2cfc5be", size = 79695, upload-time = "2025-08-17T20:49:09.119Z" },]-[[package]]-name = "ecdsa"-version = "0.19.2"-source = { registry = "https://pypi.org/simple" }-dependencies = [- { name = "six" },-]-sdist = { url = "https://files.pythonhosted.org/packages/25/ca/8de7744cb3bc966c85430ca2d0fcaeea872507c6a4cf6e007f7fe269ed9d/ecdsa-0.19.2.tar.gz", hash = "sha256:62635b0ac1ca2e027f82122b5b81cb706edc38cd91c63dda28e4f3455a2bf930", size = 202432, upload-time = "2026-03-26T09:58:17.675Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/51/79/119091c98e2bf49e24ed9f3ae69f816d715d2904aefa6a2baa039a2ba0b0/ecdsa-0.19.2-py2.py3-none-any.whl", hash = "sha256:840f5dc5e375c68f36c1a7a5b9caad28f95daa65185c9253c0c08dd952bb7399", size = 150818, upload-time = "2026-03-26T09:58:15.808Z" },-]-[[package]]name = "faker"version = "40.18.0"@@ -1358,15 +1343,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/98/5a/291d89f44d3820fffb7a04ebc8f3ef5dda4f542f44a5daea0c55a84abf45/psycopg_binary-3.3.3-cp314-cp314-win_amd64.whl", hash = "sha256:165f22ab5a9513a3d7425ffb7fcc7955ed8ccaeef6d37e369d6cc1dff1582383", size = 3652796, upload-time = "2026-02-18T16:52:14.02Z" },]-[[package]]-name = "pyasn1"-version = "0.6.3"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/5c/5f/6583902b6f79b399c9c40674ac384fd9cd77805f9e6205075f828ef11fb2/pyasn1-0.6.3.tar.gz", hash = "sha256:697a8ecd6d98891189184ca1fa05d1bb00e2f84b5977c481452050549c8a72cf", size = 148685, upload-time = "2026-03-17T01:06:53.382Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/5d/a0/7d793dce3fa811fe047d6ae2431c672364b462850c6235ae306c0efd025f/pyasn1-0.6.3-py3-none-any.whl", hash = "sha256:a80184d120f0864a52a073acc6fc642847d0be408e7c7252f31390c0f4eadcde", size = 83997, upload-time = "2026-03-17T01:06:52.036Z" },-]-[[package]]name = "pycparser"version = "3.0"@@ -1496,20 +1472,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/08/bd/ccd7416fdb30f104ddf6cfd8ee9f699441c7d9880a26f9b3089438adee05/python_ipware-3.0.0-py3-none-any.whl", hash = "sha256:fc936e6e7ec9fcc107f9315df40658f468ac72f739482a707181742882e36b60", size = 10761, upload-time = "2024-04-19T20:00:57.171Z" },]-[[package]]-name = "python-jose"-version = "3.3.0"-source = { registry = "https://pypi.org/simple" }-dependencies = [- { name = "ecdsa" },- { name = "pyasn1" },- { name = "rsa" },-]-sdist = { url = "https://files.pythonhosted.org/packages/e4/19/b2c86504116dc5f0635d29f802da858404d77d930a25633d2e86a64a35b3/python-jose-3.3.0.tar.gz", hash = "sha256:55779b5e6ad599c6336191246e95eb2293a9ddebd555f796a65f838f07e5d78a", size = 129068, upload-time = "2021-06-05T03:30:40.895Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/bd/2d/e94b2f7bab6773c70efc70a61d66e312e1febccd9e0db6b9e0adf58cbad1/python_jose-3.3.0-py2.py3-none-any.whl", hash = "sha256:9b1376b023f8b298536eedd47ae1089bcdb848f1535ab30555cd92002d78923a", size = 33530, upload-time = "2021-06-05T03:30:38.099Z" },-]-[[package]]name = "pytz"version = "2026.1.post1"@@ -1709,18 +1671,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/d0/02/fa464cdfbe6b26e0600b62c528b72d8608f5cc49f96b8d6e38c95d60c676/rpds_py-0.30.0-cp314-cp314t-win_amd64.whl", hash = "sha256:27f4b0e92de5bfbc6f86e43959e6edd1425c33b5e69aab0984a72047f2bcf1e3", size = 226532, upload-time = "2025-11-30T20:24:14.634Z" },]-[[package]]-name = "rsa"-version = "4.9.1"-source = { registry = "https://pypi.org/simple" }-dependencies = [- { name = "pyasn1" },-]-sdist = { url = "https://files.pythonhosted.org/packages/da/8a/22b7beea3ee0d44b1916c0c1cb0ee3af23b700b6da9f04991899d0c555d4/rsa-4.9.1.tar.gz", hash = "sha256:e7bdbfdb5497da4c07dfd35530e1a902659db6ff241e39d9953cad06ebd0ae75", size = 29034, upload-time = "2025-04-16T09:51:18.218Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/64/8d/0133e4eb4beed9e425d9a98ed6e081a55d195481b7632472be1af08d2f6b/rsa-4.9.1-py3-none-any.whl", hash = "sha256:68635866661c6836b8d39430f97a996acbd61bfa49406748ea243539fe239762", size = 34696, upload-time = "2025-04-16T09:51:17.142Z" },-]-[[package]]name = "ruff"version = "0.15.11"@@ -1934,7 +1884,7 @@ dependencies = [{ name = "django-sortedm2m" },{ name = "django-storages" },{ name = "djangorestframework" },- { name = "djangorestframework-simplejwt", extra = ["crypto", "python-jose"] },+ { name = "djangorestframework-simplejwt", extra = ["crypto"] },{ name = "drf-spectacular", extra = ["sidecar"] },{ name = "easy-thumbnails" },{ name = "flower" },@@ -1994,7 +1944,7 @@ requires-dist = [{ name = "django-sortedm2m", specifier = "~=4.0.0" },{ name = "django-storages", specifier = "~=1.14.6" },{ name = "djangorestframework", specifier = "~=3.17.1" },- { name = "djangorestframework-simplejwt", extras = ["crypto", "python-jose"], specifier = "~=5.5.1" },+ { name = "djangorestframework-simplejwt", extras = ["crypto"], specifier = "~=5.5.1" },{ name = "drf-spectacular", extras = ["sidecar"], specifier = "~=0.29.0" },{ name = "easy-thumbnails", specifier = "~=2.10.1" },{ name = "flower", specifier = "~=2.0.1" },diff --git a/wger/core/api/powersync.py b/wger/core/api/powersync.pyindex 724a0eeec..5f226ba7c 100644--- a/wger/core/api/powersync.py+++ b/wger/core/api/powersync.py@@ -25,7 +25,8 @@ from functools import lru_cachefrom django.conf import settings# Third Party-from jose.jwt import encode+import jwt+from jwt.algorithms import RSAAlgorithm@lru_cache(maxsize=1)@@ -33,6 +34,11 @@ def _private_jwk():return json.loads(urlsafe_b64decode(settings.JWT_PRIVATE_KEY))+@lru_cache(maxsize=1)+def _private_key():+ return RSAAlgorithm.from_jwk(json.dumps(_private_jwk()))++@lru_cache(maxsize=1)def public_jwk():return json.loads(urlsafe_b64decode(settings.JWT_PUBLIC_KEY))@@ -40,14 +46,15 @@ def public_jwk():def create_token(user_id):jwk = _private_jwk()- return encode(+ now = int(time.time())+ return jwt.encode({'sub': str(user_id),- 'iat': time.time(),+ 'iat': now,'aud': 'powersync',- 'exp': int(time.time()) + 600,+ 'exp': now + 600,},- jwk,+ _private_key(),algorithm=jwk['alg'],- headers={'alg': jwk['alg'], 'kid': jwk['kid']},+ headers={'kid': jwk['kid']},)diff --git a/wger/core/management/commands/generate-jwt-keys.py b/wger/core/management/commands/generate-jwt-keys.pyindex b05dce777..f9f8a590b 100644--- a/wger/core/management/commands/generate-jwt-keys.py+++ b/wger/core/management/commands/generate-jwt-keys.py@@ -22,12 +22,7 @@ from django.core.management.base import BaseCommand# Third Partyfrom cryptography.hazmat.primitives.asymmetric import rsa-from cryptography.hazmat.primitives.serialization import (- Encoding,- NoEncryption,- PrivateFormat,-)-from jose import jwk+from jwt.algorithms import RSAAlgorithmclass Command(BaseCommand):@@ -61,20 +56,9 @@ class Command(BaseCommand):kid = options['kid']key_size = options['key_size']- # Generate RSA keypair via cryptography (python-jose's `jwk.construct`- # consumes a PEM string).+ # Generate an RSA keypair and export it as a JWK.rsa_key = rsa.generate_private_key(public_exponent=65537, key_size=key_size)- priv_pem = rsa_key.private_bytes(- encoding=Encoding.PEM,- format=PrivateFormat.PKCS8,- encryption_algorithm=NoEncryption(),- )-- # Convert to JWK; jose returns bytes for the encoded values, normalise to str.- jose_key = jwk.construct(priv_pem.decode(), algorithm='RS256')- priv_jwk = {- k: (v.decode() if isinstance(v, bytes) else v) for k, v in jose_key.to_dict().items()- }+ priv_jwk = json.loads(RSAAlgorithm.to_jwk(rsa_key))priv_jwk['alg'] = 'RS256'priv_jwk['kid'] = kiddiff --git a/wger/core/tests/test_headless.py b/wger/core/tests/test_headless.pyindex f806629d3..76b9b5bd6 100644--- a/wger/core/tests/test_headless.py+++ b/wger/core/tests/test_headless.py@@ -20,8 +20,13 @@ import json# Djangofrom django.contrib.auth.models import User+from django.urls import reverse++# Third Party+from rest_framework_simplejwt.tokens import RefreshToken# wger+from wger.core.api.powersync import create_tokenfrom wger.core.tests.base_testcase import WgerTestCase@@ -117,3 +122,25 @@ class HeadlessSmokeTestCase(WgerTestCase):HTTP_AUTHORIZATION='Bearer not-a-real-token',)self.assertIn(response.status_code, (401, 403))++ def test_powersync_token_is_rejected_by_the_rest_api(self):+ """+ PowerSync tokens and the REST API are signed with the same RS256+ keypair, so a valid signature alone must not grant API access: the+ PowerSync token (``aud='powersync'``, no access-token type claim) has+ to be rejected by the ``/api/v2/`` auth chain. A regular SimpleJWT+ access token is accepted on the same endpoint, proving it is the token+ type and not the endpoint that gates access.+ """+ user = User.objects.get(username='test')+ url = reverse('workoutsession-list')++ # Control: a genuine access token authenticates.+ access_token = str(RefreshToken.for_user(user).access_token)+ response = self.client.get(url, HTTP_AUTHORIZATION=f'Bearer {access_token}')+ self.assertEqual(response.status_code, 200, response.content)++ # The PowerSync token, though signed with the same key, must not.+ ps_token = create_token(user.id)+ response = self.client.get(url, HTTP_AUTHORIZATION=f'Bearer {ps_token}')+ self.assertIn(response.status_code, (401, 403))