-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* main: web: simplify `?inline` handler for Storybook (#12246) website/docs: Update Traefik middleware example to reflect latest version of Traefik (#12267) website/docs: add . in https://netbird.company* (#12166) core: bump goauthentik.io/api/v3 from 3.2024104.1 to 3.2024104.2 (#12263) core: bump pydantic from 2.10.2 to 2.10.3 (#12262) core: bump github.com/getsentry/sentry-go from 0.29.1 to 0.30.0 (#12264) core, web: update translations (#12268) website: bump @types/react from 18.3.12 to 18.3.13 in /website (#12269) website: bump prettier from 3.4.1 to 3.4.2 in /website (#12270) ci: bump actions/attest-build-provenance from 1 to 2 (#12271) core: bump golang.org/x/sync from 0.9.0 to 0.10.0 (#12272) core: bump django from 5.0.9 to 5.0.10 (#12273) core: bump webauthn from 2.3.0 to 2.4.0 (#12274) website/integrations: add The Lounge (#11971) core: bump python-kadmin-rs from 0.3.0 to 0.4.0 (#12257) root: fix health status code (#12255) ci: fix should_push always being false (#12252) web: bump API Client version (#12251) providers/oauth2: Add provider federation between OAuth2 Providers (#12083) website/integrations: mastodon: set correct uid field (#11945)
- Loading branch information
Showing
56 changed files
with
926 additions
and
350 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
...th2/migrations/0025_rename_jwks_sources_oauth2provider_jwt_federation_sources_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # Generated by Django 5.0.9 on 2024-11-22 14:25 | ||
|
|
||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ("authentik_providers_oauth2", "0024_remove_oauth2provider_redirect_uris_and_more"), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.RenameField( | ||
| model_name="oauth2provider", | ||
| old_name="jwks_sources", | ||
| new_name="jwt_federation_sources", | ||
| ), | ||
| migrations.AddField( | ||
| model_name="oauth2provider", | ||
| name="jwt_federation_providers", | ||
| field=models.ManyToManyField( | ||
| blank=True, default=None, to="authentik_providers_oauth2.oauth2provider" | ||
| ), | ||
| ), | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
228 changes: 228 additions & 0 deletions
228
authentik/providers/oauth2/tests/test_token_cc_jwt_provider.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,228 @@ | ||
| """Test token view""" | ||
|
|
||
| from datetime import datetime, timedelta | ||
| from json import loads | ||
|
|
||
| from django.test import RequestFactory | ||
| from django.urls import reverse | ||
| from django.utils.timezone import now | ||
| from jwt import decode | ||
|
|
||
| from authentik.blueprints.tests import apply_blueprint | ||
| from authentik.core.models import Application, Group | ||
| from authentik.core.tests.utils import create_test_cert, create_test_flow, create_test_user | ||
| from authentik.lib.generators import generate_id | ||
| from authentik.policies.models import PolicyBinding | ||
| from authentik.providers.oauth2.constants import ( | ||
| GRANT_TYPE_CLIENT_CREDENTIALS, | ||
| SCOPE_OPENID, | ||
| SCOPE_OPENID_EMAIL, | ||
| SCOPE_OPENID_PROFILE, | ||
| TOKEN_TYPE, | ||
| ) | ||
| from authentik.providers.oauth2.models import ( | ||
| AccessToken, | ||
| OAuth2Provider, | ||
| RedirectURI, | ||
| RedirectURIMatchingMode, | ||
| ScopeMapping, | ||
| ) | ||
| from authentik.providers.oauth2.tests.utils import OAuthTestCase | ||
|
|
||
|
|
||
| class TestTokenClientCredentialsJWTProvider(OAuthTestCase): | ||
| """Test token (client_credentials, with JWT) view""" | ||
|
|
||
| @apply_blueprint("system/providers-oauth2.yaml") | ||
| def setUp(self) -> None: | ||
| super().setUp() | ||
| self.factory = RequestFactory() | ||
| self.other_cert = create_test_cert() | ||
| self.cert = create_test_cert() | ||
|
|
||
| self.other_provider = OAuth2Provider.objects.create( | ||
| name=generate_id(), | ||
| authorization_flow=create_test_flow(), | ||
| signing_key=self.other_cert, | ||
| ) | ||
| self.other_provider.property_mappings.set(ScopeMapping.objects.all()) | ||
| self.app = Application.objects.create( | ||
| name=generate_id(), slug=generate_id(), provider=self.other_provider | ||
| ) | ||
|
|
||
| self.provider: OAuth2Provider = OAuth2Provider.objects.create( | ||
| name="test", | ||
| authorization_flow=create_test_flow(), | ||
| redirect_uris=[RedirectURI(RedirectURIMatchingMode.STRICT, "http://testserver")], | ||
| signing_key=self.cert, | ||
| ) | ||
| self.provider.jwt_federation_providers.add(self.other_provider) | ||
| self.provider.property_mappings.set(ScopeMapping.objects.all()) | ||
| self.app = Application.objects.create(name="test", slug="test", provider=self.provider) | ||
|
|
||
| def test_invalid_type(self): | ||
| """test invalid type""" | ||
| response = self.client.post( | ||
| reverse("authentik_providers_oauth2:token"), | ||
| { | ||
| "grant_type": GRANT_TYPE_CLIENT_CREDENTIALS, | ||
| "scope": f"{SCOPE_OPENID} {SCOPE_OPENID_EMAIL} {SCOPE_OPENID_PROFILE}", | ||
| "client_id": self.provider.client_id, | ||
| "client_assertion_type": "foo", | ||
| "client_assertion": "foo.bar", | ||
| }, | ||
| ) | ||
| self.assertEqual(response.status_code, 400) | ||
| body = loads(response.content.decode()) | ||
| self.assertEqual(body["error"], "invalid_grant") | ||
|
|
||
| def test_invalid_jwt(self): | ||
| """test invalid JWT""" | ||
| response = self.client.post( | ||
| reverse("authentik_providers_oauth2:token"), | ||
| { | ||
| "grant_type": GRANT_TYPE_CLIENT_CREDENTIALS, | ||
| "scope": f"{SCOPE_OPENID} {SCOPE_OPENID_EMAIL} {SCOPE_OPENID_PROFILE}", | ||
| "client_id": self.provider.client_id, | ||
| "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", | ||
| "client_assertion": "foo.bar", | ||
| }, | ||
| ) | ||
| self.assertEqual(response.status_code, 400) | ||
| body = loads(response.content.decode()) | ||
| self.assertEqual(body["error"], "invalid_grant") | ||
|
|
||
| def test_invalid_signature(self): | ||
| """test invalid JWT""" | ||
| token = self.provider.encode( | ||
| { | ||
| "sub": "foo", | ||
| "exp": datetime.now() + timedelta(hours=2), | ||
| } | ||
| ) | ||
| response = self.client.post( | ||
| reverse("authentik_providers_oauth2:token"), | ||
| { | ||
| "grant_type": GRANT_TYPE_CLIENT_CREDENTIALS, | ||
| "scope": f"{SCOPE_OPENID} {SCOPE_OPENID_EMAIL} {SCOPE_OPENID_PROFILE}", | ||
| "client_id": self.provider.client_id, | ||
| "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", | ||
| "client_assertion": token + "foo", | ||
| }, | ||
| ) | ||
| self.assertEqual(response.status_code, 400) | ||
| body = loads(response.content.decode()) | ||
| self.assertEqual(body["error"], "invalid_grant") | ||
|
|
||
| def test_invalid_expired(self): | ||
| """test invalid JWT""" | ||
| token = self.provider.encode( | ||
| { | ||
| "sub": "foo", | ||
| "exp": datetime.now() - timedelta(hours=2), | ||
| } | ||
| ) | ||
| response = self.client.post( | ||
| reverse("authentik_providers_oauth2:token"), | ||
| { | ||
| "grant_type": GRANT_TYPE_CLIENT_CREDENTIALS, | ||
| "scope": f"{SCOPE_OPENID} {SCOPE_OPENID_EMAIL} {SCOPE_OPENID_PROFILE}", | ||
| "client_id": self.provider.client_id, | ||
| "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", | ||
| "client_assertion": token, | ||
| }, | ||
| ) | ||
| self.assertEqual(response.status_code, 400) | ||
| body = loads(response.content.decode()) | ||
| self.assertEqual(body["error"], "invalid_grant") | ||
|
|
||
| def test_invalid_no_app(self): | ||
| """test invalid JWT""" | ||
| self.app.provider = None | ||
| self.app.save() | ||
| token = self.provider.encode( | ||
| { | ||
| "sub": "foo", | ||
| "exp": datetime.now() + timedelta(hours=2), | ||
| } | ||
| ) | ||
| response = self.client.post( | ||
| reverse("authentik_providers_oauth2:token"), | ||
| { | ||
| "grant_type": GRANT_TYPE_CLIENT_CREDENTIALS, | ||
| "scope": f"{SCOPE_OPENID} {SCOPE_OPENID_EMAIL} {SCOPE_OPENID_PROFILE}", | ||
| "client_id": self.provider.client_id, | ||
| "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", | ||
| "client_assertion": token, | ||
| }, | ||
| ) | ||
| self.assertEqual(response.status_code, 400) | ||
| body = loads(response.content.decode()) | ||
| self.assertEqual(body["error"], "invalid_grant") | ||
|
|
||
| def test_invalid_access_denied(self): | ||
| """test invalid JWT""" | ||
| group = Group.objects.create(name="foo") | ||
| PolicyBinding.objects.create( | ||
| group=group, | ||
| target=self.app, | ||
| order=0, | ||
| ) | ||
| token = self.provider.encode( | ||
| { | ||
| "sub": "foo", | ||
| "exp": datetime.now() + timedelta(hours=2), | ||
| } | ||
| ) | ||
| response = self.client.post( | ||
| reverse("authentik_providers_oauth2:token"), | ||
| { | ||
| "grant_type": GRANT_TYPE_CLIENT_CREDENTIALS, | ||
| "scope": f"{SCOPE_OPENID} {SCOPE_OPENID_EMAIL} {SCOPE_OPENID_PROFILE}", | ||
| "client_id": self.provider.client_id, | ||
| "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", | ||
| "client_assertion": token, | ||
| }, | ||
| ) | ||
| self.assertEqual(response.status_code, 400) | ||
| body = loads(response.content.decode()) | ||
| self.assertEqual(body["error"], "invalid_grant") | ||
|
|
||
| def test_successful(self): | ||
| """test successful""" | ||
| user = create_test_user() | ||
| token = self.other_provider.encode( | ||
| { | ||
| "sub": "foo", | ||
| "exp": datetime.now() + timedelta(hours=2), | ||
| } | ||
| ) | ||
| AccessToken.objects.create( | ||
| provider=self.other_provider, | ||
| token=token, | ||
| user=user, | ||
| auth_time=now(), | ||
| ) | ||
|
|
||
| response = self.client.post( | ||
| reverse("authentik_providers_oauth2:token"), | ||
| { | ||
| "grant_type": GRANT_TYPE_CLIENT_CREDENTIALS, | ||
| "scope": f"{SCOPE_OPENID} {SCOPE_OPENID_EMAIL} {SCOPE_OPENID_PROFILE}", | ||
| "client_id": self.provider.client_id, | ||
| "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", | ||
| "client_assertion": token, | ||
| }, | ||
| ) | ||
| self.assertEqual(response.status_code, 200) | ||
| body = loads(response.content.decode()) | ||
| self.assertEqual(body["token_type"], TOKEN_TYPE) | ||
| _, alg = self.provider.jwt_key | ||
| jwt = decode( | ||
| body["access_token"], | ||
| key=self.provider.signing_key.public_key, | ||
| algorithms=[alg], | ||
| audience=self.provider.client_id, | ||
| ) | ||
| self.assertEqual(jwt["given_name"], user.name) | ||
| self.assertEqual(jwt["preferred_username"], user.username) |
Oops, something went wrong.