From b5d43b15f8a13586f92828d7a9226c7caa0b31ea Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 12 Feb 2022 16:56:47 +0100 Subject: [PATCH] providers/oauth2: add support for explicit response_mode closes #1953 Signed-off-by: Jens Langhammer --- authentik/providers/oauth2/models.py | 7 +++++++ authentik/providers/oauth2/views/authorize.py | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/authentik/providers/oauth2/models.py b/authentik/providers/oauth2/models.py index 18617d1eb..4282ae6b0 100644 --- a/authentik/providers/oauth2/models.py +++ b/authentik/providers/oauth2/models.py @@ -45,6 +45,13 @@ class GrantTypes(models.TextChoices): HYBRID = "hybrid" +class ResponseMode(models.TextChoices): + """https://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#OAuth.Post""" + + QUERY = "query" + FRAGMENT = "fragment" + + class SubModes(models.TextChoices): """Mode after which 'sub' attribute is generateed, for compatibility reasons""" diff --git a/authentik/providers/oauth2/views/authorize.py b/authentik/providers/oauth2/views/authorize.py index abaad8049..acd038697 100644 --- a/authentik/providers/oauth2/views/authorize.py +++ b/authentik/providers/oauth2/views/authorize.py @@ -44,6 +44,7 @@ from authentik.providers.oauth2.models import ( AuthorizationCode, GrantTypes, OAuth2Provider, + ResponseMode, ResponseTypes, ) from authentik.providers.oauth2.utils import HttpResponseRedirectScheme @@ -299,13 +300,23 @@ class OAuthFulfillmentStage(StageView): code = self.params.create_code(self.request) code.save(force_insert=True) - if self.params.grant_type == GrantTypes.AUTHORIZATION_CODE: + query_dict = self.request.POST if self.request.method == "POST" else self.request.GET + response_mode = ResponseMode.QUERY + # Get response mode from url param, otherwise decide based on grant type + if "response_mode" in query_dict: + response_mode = query_dict["response_mode"] + elif self.params.grant_type == GrantTypes.AUTHORIZATION_CODE: + response_mode = ResponseMode.QUERY + elif self.params.grant_type in [GrantTypes.IMPLICIT, GrantTypes.HYBRID]: + response_mode = ResponseMode.FRAGMENT + + if response_mode == ResponseMode.QUERY: query_params["code"] = code.code query_params["state"] = [str(self.params.state) if self.params.state else ""] uri = uri._replace(query=urlencode(query_params, doseq=True)) return urlunsplit(uri) - if self.params.grant_type in [GrantTypes.IMPLICIT, GrantTypes.HYBRID]: + if response_mode == ResponseMode.FRAGMENT: query_fragment = self.create_implicit_response(code) uri = uri._replace(