diff options
| author | Michael Klishin <klishinm@vmware.com> | 2021-11-18 15:13:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-18 15:13:30 +0300 |
| commit | bd67a5af7be5bea6054f405c08a0bc9ac13a5077 (patch) | |
| tree | 4c6d1c79eda43136c6209f935e27cf81b1af57ef | |
| parent | 5d579d14475bac6f83361ae1ea4ca54b9428c167 (diff) | |
| parent | acf474e0566eb6baf8328e9a9e2abb3ec3fc0890 (diff) | |
| download | rabbitmq-server-git-bd67a5af7be5bea6054f405c08a0bc9ac13a5077.tar.gz | |
Merge pull request #3759 from rabbitmq/oauth2-config-fix
Fix rabbitmq.conf translation rule for OAuth2 signing keys
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">>} } } ] |