Skip to content

Commit 7ea48d7

Browse files
MarcialRosalesMarcialRosales
committed
Resolve merge conflicts
1 parent f9704cc commit 7ea48d7

File tree

4 files changed

+20
-36
lines changed

4 files changed

+20
-36
lines changed

‎deps/oauth2_client/test/system_SUITE.erl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ all() ->
2727
[
2828
{group, https_down},
2929
{group, https},
30-
{group, with_all_oauth_provider_settings}
31-
% {group, without_all_oauth_providers_settings}
30+
{group, with_all_oauth_provider_settings},
31+
{group, without_all_oauth_providers_settings}
3232

3333
].
3434

‎deps/rabbitmq_auth_backend_oauth2/test/jwks_SUITE.erl‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
-import(rabbit_ct_broker_helpers, [
2828
rpc/5
2929
]).
30-
-import(rabbit_mgmt_test_util, [amqp_port/1]).
30+
-import(rabbit_mgmt_test_util, [
31+
amqp_port/1
32+
]).
3133

3234
all() ->
3335
[
@@ -170,30 +172,21 @@ end_per_suite(Config) ->
170172
] ++ rabbit_ct_broker_helpers:teardown_steps()).
171173

172174
init_per_group(no_peer_verification, Config) ->
173-
<<<<<<< HEAD
174175
KeyConfig = set_config(?config(key_config, Config), [
175-
{jwks_url, ?config(non_strict_jwks_url, Config)},
176+
{jwks_url, ?config(non_strict_jwks_uri, Config)},
176177
{peer_verification, verify_none}
177178
]),
178-
ok = rpc_set_env(Config,key_config, KeyConfig),
179+
ok = rpc_set_env(Config, key_config, KeyConfig),
179180
set_config(Config, {key_config, KeyConfig});
180-
=======
181-
KeyConfig = rabbit_ct_helpers:set_config(?config(key_config, Config), [{jwks_uri, ?config(non_strict_jwks_uri, Config)}, {peer_verification, verify_none}]),
182-
ok = rabbit_ct_broker_helpers:rpc(Config, 0, application, set_env, [rabbitmq_auth_backend_oauth2, key_config, KeyConfig]),
183-
rabbit_ct_helpers:set_config(Config, {key_config, KeyConfig});
184-
>>>>>>> 2586207266 (Deprecate jwks_url but it is still supported)
185-
186181
init_per_group(without_kid, Config) ->
187182
set_config(Config, [{include_kid, false}]);
188-
189183
init_per_group(with_resource_servers_rabbitmq1_with_oauth_provider_A, Config) ->
190184
ResourceServersConfig0 = rpc_get_env(Config, resource_servers, #{}),
191-
Resource0 = maps:get(<<"rabbitmq1">>,
192-
ResourceServersConfig0, [{id, <<"rabbitmq1">>}]),
185+
Resource0 = maps:get(<<"rabbitmq1">>, ResourceServersConfig0,
186+
[{id, <<"rabbitmq1">>}]),
193187
ResourceServersConfig1 = maps:put(<<"rabbitmq1">>,
194188
[{oauth_provider_id, <<"A">>} | Resource0], ResourceServersConfig0),
195189
ok = rpc_set_env(Config, resource_servers, ResourceServersConfig1);
196-
197190
init_per_group(with_oauth_providers_A_B_and_C, Config) ->
198191
OAuthProviders = #{
199192
<<"A">> => [
@@ -211,26 +204,22 @@ init_per_group(with_oauth_providers_A_B_and_C, Config) ->
211204
},
212205
ok = rpc_set_env(Config, oauth_providers, OAuthProviders),
213206
Config;
214-
215207
init_per_group(with_default_oauth_provider_B, Config) ->
216208
ok = rpc_set_env(Config, default_oauth_provider, <<"B">>);
217-
218209
init_per_group(with_oauth_providers_A_with_default_key, Config) ->
219210
{ok, OAuthProviders0} = rpc_get_env(Config, oauth_providers),
220211
OAuthProvider = maps:get(<<"A">>, OAuthProviders0, []),
221212
OAuthProviders1 = maps:put(<<"A">>, [
222213
{default_key, ?UTIL_MOD:token_key(?config(fixture_jwksA, Config))}
223214
| OAuthProvider], OAuthProviders0),
224-
225215
ok = rpc_set_env(Config, oauth_providers, OAuthProviders1),
226216
Config;
227-
228217
init_per_group(with_oauth_provider_A_with_jwks_with_one_signing_key, Config) ->
229218
{ok, OAuthProviders0} = rpc_get_env(Config, oauth_providers),
230219
OAuthProvider = maps:get(<<"A">>, OAuthProviders0, []),
231220
OAuthProviders1 = maps:put(<<"A">>, [
232-
{jwks_uri, strict_jwks_url(Config, "/jwksA")} | OAuthProvider],
233-
221+
{jwks_uri, strict_jwks_uri(Config, "/jwksA")} | OAuthProvider],
222+
OAuthProviders0),
234223
ok = rpc_set_env(Config, oauth_providers, OAuthProviders1),
235224
Config;
236225
init_per_group(with_resource_servers_rabbitmq2, Config) ->
@@ -239,15 +228,15 @@ init_per_group(with_resource_servers_rabbitmq2, Config) ->
239228
[{id, <<"rabbitmq2">>}]),
240229
ResourceServersConfig1 = maps:put(<<"rabbitmq2">>, Resource0,
241230
ResourceServersConfig0),
242-
ok = rpc_set_env(Config, resource_servers, ResourceServersConfig1);
231+
ok = rpc_set_env(Config, resource_servers, ResourceServersConfig1),
232+
Config;
243233
init_per_group(with_oauth_providers_B_with_default_key_static_key, Config) ->
244234
{ok, OAuthProviders0} = rpc_get_env(Config, oauth_providers),
245235
OAuthProvider = maps:get(<<"B">>, OAuthProviders0, []),
246236
OAuthProviders1 = maps:put(<<"B">>, [
247237
{default_key, ?UTIL_MOD:token_key(?config(fixture_staticB, Config))} |
248238
proplists:delete(default_key, OAuthProvider)],
249239
OAuthProviders0),
250-
251240
ok = rpc_set_env(Config,oauth_providers, OAuthProviders1),
252241
Config;
253242
init_per_group(with_oauth_provider_C_with_two_static_keys, Config) ->
@@ -264,7 +253,6 @@ init_per_group(with_oauth_provider_C_with_two_static_keys, Config) ->
264253

265254
ok = rpc_set_env(Config, oauth_providers, OAuthProviders1),
266255
Config;
267-
268256
init_per_group(with_root_oauth_provider_with_two_static_keys_and_one_jwks_key, Config) ->
269257
KeyConfig = rpc_get_env(Config, key_config, []),
270258
Jwks1 = ?config(fixture_static_1, Config),
@@ -291,7 +279,6 @@ init_per_group(with_root_oauth_provider_with_default_jwks_key, Config) ->
291279
| KeyConfig],
292280
ok = rpc_set_env(Config, key_config, KeyConfig1),
293281
Config;
294-
295282
init_per_group(with_oauth_provider_B_with_one_static_key_and_jwks_with_two_signing_keys, Config) ->
296283
{ok, OAuthProviders0} = rpc_get_env(Config, oauth_providers),
297284
OAuthProvider = maps:get(<<"B">>, OAuthProviders0, []),
@@ -306,27 +293,22 @@ init_per_group(with_oauth_provider_B_with_one_static_key_and_jwks_with_two_signi
306293

307294
ok = rpc_set_env(Config, oauth_providers, OAuthProviders1),
308295
Config;
309-
310296
init_per_group(with_resource_servers_rabbitmq3_with_oauth_provider_C, Config) ->
311297
ResourceServersConfig0 = rpc_get_env(Config, resource_servers, #{}),
312298
Resource0 = maps:get(<<"rabbitmq3">>, ResourceServersConfig0, [
313299
{id, <<"rabbitmq3">>},{oauth_provider_id, <<"C">>}]),
314300
ResourceServersConfig1 = maps:put(<<"rabbitmq3">>, Resource0,
315301
ResourceServersConfig0),
316-
317302
ok = rpc_set_env(Config, resource_servers, ResourceServersConfig1);
318-
319303
init_per_group(with_oauth_providers_C_with_default_key_static_key_1, Config) ->
320304
{ok, OAuthProviders0} = rpc_get_env(Config, oauth_providers),
321305
OAuthProvider = maps:get(<<"C">>, OAuthProviders0, []),
322306
Jwks = ?config(fixture_staticC_1, Config),
323307
OAuthProviders1 = maps:put(<<"C">>, [
324308
{default_key, ?UTIL_MOD:token_key(Jwks)} | OAuthProvider],
325309
OAuthProviders0),
326-
327310
ok = rpc_set_env(Config, oauth_providers, OAuthProviders1),
328311
Config;
329-
330312
init_per_group(_Group, Config) ->
331313
ok = rpc_set_env(Config, resource_server_id, ?RESOURCE_SERVER_ID),
332314
Config.
@@ -461,7 +443,7 @@ start_jwks_server(Config0) ->
461443
%% Assume we don't have more than 100 ports allocated for tests
462444
PortBase = rabbit_ct_broker_helpers:get_node_config(Config0, 0, tcp_ports_base),
463445
JwksServerPort = PortBase + 100,
464-
Config = rabbit_ct_helpers:set_config(Config0, [{jwksServerPort, JwksServerPort}]),
446+
Config = set_config(Config0, [{jwksServerPort, JwksServerPort}]),
465447

466448
%% Both URLs direct to the same JWKS server
467449
%% The NonStrictJwksUrl identity cannot be validated while StrictJwksUrl identity can be validated
@@ -479,7 +461,7 @@ start_jwks_server(Config0) ->
479461
{"/jwks1", [Jwk1, Jwk3]},
480462
{"/jwks2", [Jwk2]}
481463
]),
482-
KeyConfig = [{jwks_uri, StrictJwksUri},
464+
KeyConfig = [{jwks_url, StrictJwksUri},
483465
{peer_verification, verify_peer},
484466
{cacertfile, filename:join([CertsDir, "testca", "cacert.pem"])}],
485467
ok = rpc_set_env(Config, key_config, KeyConfig),

‎deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_provider_SUITE.erl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ init_per_group(oauth_provider_with_jwks_uri, Config) ->
110110
URL = case ?config(oauth_provider_id, Config) of
111111
root ->
112112
RootUrl = build_url_to_oauth_provider(<<"/keys">>),
113-
set_env(key_config, [{jwks_uri, RootUrl}]),
113+
set_env(jwks_uri, RootUrl),
114114
RootUrl;
115115
<<"A">> ->
116116
AUrl = build_url_to_oauth_provider(<<"/A/keys">>),

‎deps/rabbitmq_auth_backend_oauth2/test/unit_SUITE.erl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,8 +1105,8 @@ test_incorrect_kid(_) ->
11051105
AltKid = <<"other-token-key">>,
11061106
Username = <<"username">>,
11071107
Jwk = ?UTIL_MOD:fixture_jwk(),
1108-
set_env(resource_server_id,
1109-
<<"rabbitmq">>),
1108+
unset_env(key_config),
1109+
set_env(resource_server_id, <<"rabbitmq">>),
11101110
Token = ?UTIL_MOD:sign_token_hs(
11111111
?UTIL_MOD:token_with_sub(?UTIL_MOD:fixture_token(), Username), Jwk,
11121112
AltKid, true),
@@ -1298,6 +1298,8 @@ normalize_token_scope_without_scope_claim(_) ->
12981298

12991299
set_env(Par, Var) ->
13001300
application:set_env(rabbitmq_auth_backend_oauth2, Par, Var).
1301+
unset_env(Par) ->
1302+
application:unset_env(rabbitmq_auth_backend_oauth2, Par).
13011303

13021304
assert_vhost_access_granted(AuthUser, VHost) ->
13031305
assert_vhost_access_response(true, AuthUser, VHost).

0 commit comments

Comments
 (0)