From 9c8fec21cfcafacf83269658994f4f0270b2c72d Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Sat, 23 Dec 2023 01:20:48 +0100 Subject: [PATCH] providers/oauth2: remember session_id from initial token (cherry-pick #7976) (#7977) providers/oauth2: remember session_id from initial token (#7976) * providers/oauth2: remember session_id original token was created with for future access/refresh tokens * providers/proxy: use hashed session as `sid` --------- Signed-off-by: Jens Langhammer Co-authored-by: Jens L --- ...d_authorizationcode_session_id_and_more.py | 27 +++++++++++++++++++ authentik/providers/oauth2/models.py | 1 + authentik/providers/oauth2/views/authorize.py | 3 +++ authentik/providers/oauth2/views/token.py | 4 +++ authentik/providers/proxy/tasks.py | 5 +++- blueprints/system/providers-proxy.yaml | 2 +- internal/outpost/proxyv2/ws.go | 1 + 7 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 authentik/providers/oauth2/migrations/0017_accesstoken_session_id_authorizationcode_session_id_and_more.py diff --git a/authentik/providers/oauth2/migrations/0017_accesstoken_session_id_authorizationcode_session_id_and_more.py b/authentik/providers/oauth2/migrations/0017_accesstoken_session_id_authorizationcode_session_id_and_more.py new file mode 100644 index 000000000..9a8e8d210 --- /dev/null +++ b/authentik/providers/oauth2/migrations/0017_accesstoken_session_id_authorizationcode_session_id_and_more.py @@ -0,0 +1,27 @@ +# Generated by Django 5.0 on 2023-12-22 23:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("authentik_providers_oauth2", "0016_alter_refreshtoken_token"), + ] + + operations = [ + migrations.AddField( + model_name="accesstoken", + name="session_id", + field=models.CharField(blank=True, default=""), + ), + migrations.AddField( + model_name="authorizationcode", + name="session_id", + field=models.CharField(blank=True, default=""), + ), + migrations.AddField( + model_name="refreshtoken", + name="session_id", + field=models.CharField(blank=True, default=""), + ), + ] diff --git a/authentik/providers/oauth2/models.py b/authentik/providers/oauth2/models.py index e9a2f731a..2917f607f 100644 --- a/authentik/providers/oauth2/models.py +++ b/authentik/providers/oauth2/models.py @@ -296,6 +296,7 @@ class BaseGrantModel(models.Model): revoked = models.BooleanField(default=False) _scope = models.TextField(default="", verbose_name=_("Scopes")) auth_time = models.DateTimeField(verbose_name="Authentication time") + session_id = models.CharField(default="", blank=True) @property def scope(self) -> list[str]: diff --git a/authentik/providers/oauth2/views/authorize.py b/authentik/providers/oauth2/views/authorize.py index 8c31192bf..520f02d65 100644 --- a/authentik/providers/oauth2/views/authorize.py +++ b/authentik/providers/oauth2/views/authorize.py @@ -1,6 +1,7 @@ """authentik OAuth2 Authorization views""" from dataclasses import dataclass, field from datetime import timedelta +from hashlib import sha256 from json import dumps from re import error as RegexError from re import fullmatch @@ -282,6 +283,7 @@ class OAuthAuthorizationParams: expires=now + timedelta_from_string(self.provider.access_code_validity), scope=self.scope, nonce=self.nonce, + session_id=sha256(request.session.session_key.encode("ascii")).hexdigest(), ) if self.code_challenge and self.code_challenge_method: @@ -569,6 +571,7 @@ class OAuthFulfillmentStage(StageView): expires=access_token_expiry, provider=self.provider, auth_time=auth_event.created if auth_event else now, + session_id=sha256(self.request.session.session_key.encode("ascii")).hexdigest(), ) id_token = IDToken.new(self.provider, token, self.request) diff --git a/authentik/providers/oauth2/views/token.py b/authentik/providers/oauth2/views/token.py index 0c0d7f4a8..93578d6ce 100644 --- a/authentik/providers/oauth2/views/token.py +++ b/authentik/providers/oauth2/views/token.py @@ -487,6 +487,7 @@ class TokenView(View): # Keep same scopes as previous token scope=self.params.authorization_code.scope, auth_time=self.params.authorization_code.auth_time, + session_id=self.params.authorization_code.session_id, ) access_token.id_token = IDToken.new( self.provider, @@ -502,6 +503,7 @@ class TokenView(View): expires=refresh_token_expiry, provider=self.provider, auth_time=self.params.authorization_code.auth_time, + session_id=self.params.authorization_code.session_id, ) id_token = IDToken.new( self.provider, @@ -539,6 +541,7 @@ class TokenView(View): # Keep same scopes as previous token scope=self.params.refresh_token.scope, auth_time=self.params.refresh_token.auth_time, + session_id=self.params.refresh_token.session_id, ) access_token.id_token = IDToken.new( self.provider, @@ -554,6 +557,7 @@ class TokenView(View): expires=refresh_token_expiry, provider=self.provider, auth_time=self.params.refresh_token.auth_time, + session_id=self.params.refresh_token.session_id, ) id_token = IDToken.new( self.provider, diff --git a/authentik/providers/proxy/tasks.py b/authentik/providers/proxy/tasks.py index aec8e669a..1496ff6ec 100644 --- a/authentik/providers/proxy/tasks.py +++ b/authentik/providers/proxy/tasks.py @@ -1,4 +1,6 @@ """proxy provider tasks""" +from hashlib import sha256 + from asgiref.sync import async_to_sync from channels.layers import get_channel_layer from django.db import DatabaseError, InternalError, ProgrammingError @@ -23,6 +25,7 @@ def proxy_set_defaults(): def proxy_on_logout(session_id: str): """Update outpost instances connected to a single outpost""" layer = get_channel_layer() + hashed_session_id = sha256(session_id.encode("ascii")).hexdigest() for outpost in Outpost.objects.filter(type=OutpostType.PROXY): group = OUTPOST_GROUP % {"outpost_pk": str(outpost.pk)} async_to_sync(layer.group_send)( @@ -30,6 +33,6 @@ def proxy_on_logout(session_id: str): { "type": "event.provider.specific", "sub_type": "logout", - "session_id": session_id, + "session_id": hashed_session_id, }, ) diff --git a/blueprints/system/providers-proxy.yaml b/blueprints/system/providers-proxy.yaml index 0086645a8..152ed3f44 100644 --- a/blueprints/system/providers-proxy.yaml +++ b/blueprints/system/providers-proxy.yaml @@ -15,7 +15,7 @@ entries: # This mapping is used by the authentik proxy. It passes extra user attributes, # which are used for example for the HTTP-Basic Authentication mapping. return { - "sid": request.http_request.session.session_key, + "sid": token.session_id, "ak_proxy": { "user_attributes": request.user.group_attributes(request), "is_superuser": request.user.is_superuser, diff --git a/internal/outpost/proxyv2/ws.go b/internal/outpost/proxyv2/ws.go index b75ba50fd..4632a67cb 100644 --- a/internal/outpost/proxyv2/ws.go +++ b/internal/outpost/proxyv2/ws.go @@ -36,6 +36,7 @@ func (ps *ProxyServer) handleWSMessage(ctx context.Context, args map[string]inte switch msg.SubType { case WSProviderSubTypeLogout: for _, p := range ps.apps { + ps.log.WithField("provider", p.Host).Debug("Logging out") err := p.Logout(ctx, func(c application.Claims) bool { return c.Sid == msg.SessionID })