Merge pull request #12173 from rabbitmq/mergify/bp/v3.13.x/pr-12171

Support tokens without kid when using multiple oauth providers and/or resource servers (backport #11965) (backport #12171)
rabbitmq · Aug 29, 2024 · 504de57 · 504de57
2 parents d97fbe9 + 6d7236f
commit 504de57
Show file tree

Hide file tree

Showing 21 changed files with 2,667 additions and 1,218 deletions.
diff --git a/deps/oauth2_client/BUILD.bazel b/deps/oauth2_client/BUILD.bazel
@@ -108,6 +108,7 @@ rabbitmq_integration_suite(
     size = "small",
     additional_beam = [
         "test/oauth_http_mock.beam",
+        "test/oauth2_client_test_util.beam",
     ],
     runtime_deps = [
         "@cowboy//:erlang_app",

diff --git a/deps/oauth2_client/include/oauth2_client.hrl b/deps/oauth2_client/include/oauth2_client.hrl
@@ -48,7 +48,19 @@
 %% The closest we have to a type import in Erlang
 -type option(T) :: rabbit_types:option(T).
 
+-type oauth_provider_id() :: root | binary().
+
+-record(openid_configuration, {
+  issuer :: option(uri_string:uri_string()),
+  token_endpoint :: option(uri_string:uri_string()),
+  authorization_endpoint :: option(uri_string:uri_string()),
+  end_session_endpoint :: option(uri_string:uri_string()),
+  jwks_uri :: option(uri_string:uri_string())
+  }).
+-type openid_configuration() :: #openid_configuration{}.
+
 -record(oauth_provider, {
+  id :: oauth_provider_id(),
   issuer :: option(uri_string:uri_string()),
   token_endpoint :: option(uri_string:uri_string()),
   authorization_endpoint :: option(uri_string:uri_string()),
@@ -58,7 +70,6 @@
   }).
 
 -type oauth_provider() :: #oauth_provider{}.
--type oauth_provider_id() :: binary().
 
 -record(access_token_request, {
   client_id :: string() | binary(),

diff --git a/deps/oauth2_client/src/oauth2_client.erl b/deps/oauth2_client/src/oauth2_client.erl