diff options
| author | Michael Klishin <klishinm@vmware.com> | 2021-11-18 15:14:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-18 15:14:29 +0300 |
| commit | 79e50abc0df04904dbe00afdc68742d8864383a4 (patch) | |
| tree | 426cf1f25a561de50f98474603b0bc42d28ebd05 | |
| parent | 9f6e55724da07f7eb3084ceebf2d95652d69eafc (diff) | |
| parent | ce147ade423e7cdded61751c0b277de88fec2c87 (diff) | |
| download | rabbitmq-server-git-79e50abc0df04904dbe00afdc68742d8864383a4.tar.gz | |
Merge pull request #3760 from rabbitmq/mergify/bp/v3.9.x/pr-3759
Fix rabbitmq.conf translation rule for OAuth2 signing keys (backport #3759)
2 files changed, 4 insertions, 4 deletions
diff --git a/deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema b/deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema index 010604647d..0feb73d9aa 100644 --- a/deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema +++ b/deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema @@ -49,7 +49,7 @@ %% A map of signing keys %% -%% {signing_keys, #{<<"id1">> => <<"value1">>,<<"id2">> => <<"value2">>}} +%% {signing_keys, #{<<"id1">> => {pem, <<"value1">>}, <<"id2">> => {pem, <<"value2">>}}} %% validator doesn't work {mapping, @@ -73,7 +73,7 @@ end, SigningKeys = lists:map(fun({Id, Path}) -> - {list_to_binary(lists:last(Id)), TryReadingFileFun(Path)} + {list_to_binary(lists:last(Id)), {pem, TryReadingFileFun(Path)}} end, Settings), maps:from_list(SigningKeys) end}. diff --git a/deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets b/deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets index a6d3d24a0f..2b7018fdd8 100644 --- a/deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets +++ b/deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets @@ -13,8 +13,8 @@ {default_key, <<"id1">>}, {signing_keys, #{ - <<"id1">> => <<"I'm not a certificate">>, - <<"id2">> => <<"I'm not a certificate">> + <<"id1">> => {pem, <<"I'm not a certificate">>}, + <<"id2">> => {pem, <<"I'm not a certificate">>} } } ] |