Skip to content

dep: remove pin on jwcrypto #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jason-famedly merged 2 commits into from
Apr 29, 2026
Merged

dep: remove pin on jwcrypto #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba3faf0
deps: remove pin on jwcrypto
jason-famedly Apr 28, 2026
6230a76
fix: Ensure tests use a token 64 bytes long as 512 bits are needed fo…
jason-famedly Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
"Programming Language :: Python :: Implementation :: PyPy",
]
dependencies = [
"jwcrypto<=1.5.6",
"jwcrypto",
"twisted",
]
version = "0.13.1"
Expand Down
11 changes: 7 additions & 4 deletions tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
admins = {}
logger = logging.getLogger(__name__)
ENC_JWK = jwk.JWK.generate(kty="RSA", size=2048)
# secrets for token generation need to be 64 chars long, as it needs to have 512 bits
# since HS512 is used by default. The word 'jwcrypto' is 8 letters long. Perfect.
_DEFAULT_TOKEN_SECRET = "jwcrypto" * 8


class ModuleApiTestCase(synapsetest.HomeserverTestCase):
Expand Down Expand Up @@ -110,7 +113,7 @@ def default_config(self) -> dict[str, Any]:
{
"module": "synapse_token_authenticator.TokenAuthenticator",
"config": {
"jwt": {"secret": "foxies"},
"jwt": {"secret": _DEFAULT_TOKEN_SECRET},
"oidc": {
"issuer": "https://idp.example.test",
"client_id": "1111@project",
Expand Down Expand Up @@ -146,7 +149,7 @@ def default_config(self) -> dict[str, Any]:
return conf


def get_jwk(secret="foxies", id="123456") -> jwk.JWK:
def get_jwk(secret=_DEFAULT_TOKEN_SECRET, id="123456") -> jwk.JWK:
return jwk.JWK(
k=base64.urlsafe_b64encode(secret.encode("utf-8")).decode("utf-8"),
kty="oct",
Expand All @@ -161,7 +164,7 @@ def get_enc_jwk() -> jwk.JWK:
def get_jwt_token(
username,
exp_in=None,
secret="foxies",
secret=_DEFAULT_TOKEN_SECRET,
algorithm="HS512",
admin=None,
claims=None,
Expand Down Expand Up @@ -192,7 +195,7 @@ def get_jwt_token(
def get_jwe_token(
username,
exp_in=None,
secret="foxies",
secret=_DEFAULT_TOKEN_SECRET,
algorithm="HS512",
admin=None,
claims=None,
Expand Down
6 changes: 3 additions & 3 deletions tests/test_epa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ async def test_invalid_token(self):
self.assertEqual(result, None)

async def test_token_wrong_secret(self):
token = get_jwe_token(
"alice", secret="wrong secret", claims=get_default_claims()
)
# The secret needs to be 64 bytes, so pad it and bulk copy it. 16 * 4 = 64
secret = "wrong secret1234" * 4
token = get_jwe_token("alice", secret=secret, claims=get_default_claims())
result = await self.hs.mockmod.check_epa(
"alice", "com.famedly.login.token.epa", {"token": token}
)
Expand Down
10 changes: 6 additions & 4 deletions tests/test_jwt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import tests.unittest as synapsetest

from . import ModuleApiTestCase, get_jwt_token
from . import _DEFAULT_TOKEN_SECRET, ModuleApiTestCase, get_jwt_token


class JWTTests(ModuleApiTestCase):
Expand All @@ -41,7 +41,9 @@ async def test_invalid_token(self):
self.assertEqual(result, None)

async def test_token_wrong_secret(self):
token = get_jwt_token("alice", secret="wrong secret")
# The secret needs to be 64 bytes, so pad it and bulk copy it. 16 * 4 = 64
secret = "wrong secret1234" * 4
token = get_jwt_token("alice", secret=secret)
result = await self.hs.mockmod.check_jwt_auth(
"alice", "com.famedly.login.token", {"token": token}
)
Expand Down Expand Up @@ -75,7 +77,7 @@ async def test_token_no_expiry(self):
"module": "synapse_token_authenticator.TokenAuthenticator",
"config": {
"jwt": {
"secret": "foxies",
"secret": _DEFAULT_TOKEN_SECRET,
"require_expiry": False,
}
},
Expand Down Expand Up @@ -134,7 +136,7 @@ async def test_chatbox_login_invalid_format(self, *args):
"module": "synapse_token_authenticator.TokenAuthenticator",
"config": {
"jwt": {
"secret": "foxies",
"secret": _DEFAULT_TOKEN_SECRET,
"allow_registration": True,
},
},
Expand Down
4 changes: 3 additions & 1 deletion tests/test_oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ async def test_invalid_token(self):
self.assertEqual(result, None)

async def test_token_wrong_secret(self):
token = get_jwt_token("aliceid", secret="wrong secret", claims=default_claims)
# The secret needs to be 64 bytes, so pad it and bulk copy it. 16 * 4 = 64
secret = "wrong secret1234" * 4
token = get_jwt_token("aliceid", secret=secret, claims=default_claims)
result = await self.hs.mockmod.check_oauth(
"alice", "com.famedly.login.token.oauth", {"token": token}
)
Expand Down
Loading