Skip to content

Commit 513cc47

Browse files
MarcialRosalesMarcialRosales
committed
Clean up enabled_plugins file and
allow guest user to access via non-localhost url
1 parent fa36ece commit 513cc47

File tree

8 files changed

+68
-12
lines changed

8 files changed

+68
-12
lines changed

‎deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_config_SUITE.erl

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,14 @@ groups() -> [
130130
is_verify_aud_for_resource_one_returns_true,
131131
is_verify_aud_for_resource_two_returns_false
132132
]},
133+
get_scope_prefix_for_resource_one_returns_default_scope_prefix,
134+
{with_root_scope_prefix, [], [
135+
get_scope_prefix_for_resource_one_returns_root_scope_prefix,
136+
{with_empty_scope_prefix_for_resource_one, [], [
137+
get_scope_prefix_for_resource_one_returns_empty_scope_prefix,
138+
get_scope_prefix_for_resource_two_returns_root_scope_prefix
139+
]}
140+
]},
133141
{with_jwks_url, [], [
134142
get_oauth_provider_for_both_resources_should_return_root_oauth_provider,
135143
{with_oauth_providers_A_with_jwks_uri, [], [
@@ -160,6 +168,7 @@ groups() -> [
160168
get_default_preferred_username_claims,
161169
get_preferred_username_claims,
162170
get_scope_prefix,
171+
get_empty_scope_prefix,
163172
get_scope_prefix_when_not_defined,
164173
get_resource_server_type,
165174
get_resource_server_type_when_not_defined,
@@ -309,6 +318,16 @@ init_per_group(with_resource_server_id, Config) ->
309318
application:set_env(rabbitmq_auth_backend_oauth2, resource_server_id, ?RABBITMQ),
310319
Config;
311320

321+
init_per_group(with_root_scope_prefix, Config) ->
322+
application:set_env(rabbitmq_auth_backend_oauth2, scope_prefix, <<"some-prefix:">>),
323+
Config;
324+
init_per_group(with_empty_scope_prefix_for_resource_one, Config) ->
325+
ResourceServers = application:get_env(rabbitmq_auth_backend_oauth2, resource_servers, #{}),
326+
Proplist = maps:get(?RABBITMQ_RESOURCE_ONE, ResourceServers, []),
327+
application:set_env(rabbitmq_auth_backend_oauth2, resource_servers,
328+
maps:put(?RABBITMQ_RESOURCE_ONE, [{scope_prefix, <<"">>} | proplists:delete(scope_prefix, Proplist)], ResourceServers)),
329+
Config;
330+
312331
init_per_group(with_verify_aud_false, Config) ->
313332
application:set_env(rabbitmq_auth_backend_oauth2, verify_aud, false),
314333
Config;
@@ -405,7 +424,9 @@ end_per_group(with_root_static_signing_keys, Config) ->
405424
KeyConfig = call_get_env(Config, key_config, []),
406425
call_set_env(Config, key_config, KeyConfig),
407426
Config;
408-
427+
end_per_group(get_empty_scope_prefix, Config) ->
428+
application:unset_env(rabbitmq_auth_backend_oauth2, scope_prefix),
429+
Config;
409430
end_per_group(with_resource_server_id, Config) ->
410431
application:unset_env(rabbitmq_auth_backend_oauth2, resource_server_id),
411432
Config;
@@ -418,6 +439,13 @@ end_per_group(with_verify_aud_false_for_resource_two, Config) ->
418439
application:set_env(rabbitmq_auth_backend_oauth2, resource_servers,
419440
maps:put(?RABBITMQ_RESOURCE_TWO, proplists:delete(verify_aud, Proplist), ResourceServers)),
420441
Config;
442+
end_per_group(with_empty_scope_prefix_for_resource_one, Config) ->
443+
ResourceServers = application:get_env(rabbitmq_auth_backend_oauth2, resource_servers, #{}),
444+
Proplist = maps:get(?RABBITMQ_RESOURCE_ONE, ResourceServers, []),
445+
application:set_env(rabbitmq_auth_backend_oauth2, resource_servers,
446+
maps:put(?RABBITMQ_RESOURCE_ONE, proplists:delete(scope_prefix, Proplist), ResourceServers)),
447+
Config;
448+
421449
end_per_group(with_default_key, Config) ->
422450
KeyConfig = application:get_env(rabbitmq_auth_backend_oauth2, key_config, []),
423451
application:set_env(rabbitmq_auth_backend_oauth2, key_config,
@@ -507,6 +535,10 @@ end_per_group(inheritance_group, Config) ->
507535
application:unset_env(rabbitmq_auth_backend_oauth2, resource_servers),
508536
Config;
509537

538+
end_per_group(with_root_scope_prefix, Config) ->
539+
application:unset_env(rabbitmq_auth_backend_oauth2, scope_prefix),
540+
Config;
541+
510542
end_per_group(_any, Config) ->
511543
Config.
512544

@@ -520,6 +552,9 @@ init_per_testcase(get_additional_scopes_key_when_not_defined, Config) ->
520552
init_per_testcase(is_verify_aud_when_is_false, Config) ->
521553
application:set_env(rabbitmq_auth_backend_oauth2, verify_aud, false),
522554
Config;
555+
init_per_testcase(get_empty_scope_prefix, Config) ->
556+
application:set_env(rabbitmq_auth_backend_oauth2, scope_prefix, <<"">>),
557+
Config;
523558
init_per_testcase(get_scope_prefix_when_not_defined, Config) ->
524559
application:unset_env(rabbitmq_auth_backend_oauth2, scope_prefix),
525560
Config;
@@ -756,11 +791,35 @@ get_scope_prefix_when_not_defined(_Config) ->
756791
?assertEqual(<<"rabbitmq.">>, rabbit_oauth2_config:get_scope_prefix()),
757792
?assertEqual(<<"rabbitmq2.">>, rabbit_oauth2_config:get_scope_prefix(<<"rabbitmq2">>)).
758793

794+
get_empty_scope_prefix(_Config) ->
795+
?assertEqual(<<"">>, rabbit_oauth2_config:get_scope_prefix()),
796+
?assertEqual(<<"">>, rabbit_oauth2_config:get_scope_prefix(<<"rabbitmq2">>)).
797+
759798
get_scope_prefix(_Config) ->
760799
?assertEqual(<<"some-prefix-">>, rabbit_oauth2_config:get_scope_prefix()),
761800
?assertEqual(<<"my-prefix:">>, rabbit_oauth2_config:get_scope_prefix(<<"rabbitmq1">>)),
762801
?assertEqual(rabbit_oauth2_config:get_scope_prefix(), rabbit_oauth2_config:get_scope_prefix(<<"rabbitmq2">>)).
763802

803+
get_scope_prefix_for_resource_one_returns_default_scope_prefix(_Config) ->
804+
?assertEqual(undefined, application:get_env(rabbitmq_auth_backend_oauth2, scope_prefix)),
805+
?assertEqual(append_paths(?RABBITMQ_RESOURCE_ONE, <<".">>),
806+
rabbit_oauth2_config:get_scope_prefix(?RABBITMQ_RESOURCE_ONE)).
807+
get_scope_prefix_for_resource_one_returns_root_scope_prefix(_Config) ->
808+
{ok, Prefix} = application:get_env(rabbitmq_auth_backend_oauth2, scope_prefix),
809+
?assertEqual(rabbit_oauth2_config:get_scope_prefix(),
810+
rabbit_oauth2_config:get_scope_prefix(?RABBITMQ_RESOURCE_ONE)),
811+
?assertEqual(Prefix,
812+
rabbit_oauth2_config:get_scope_prefix(?RABBITMQ_RESOURCE_ONE)).
813+
get_scope_prefix_for_resource_one_returns_empty_scope_prefix(_Config) ->
814+
?assertEqual(<<"">>,
815+
rabbit_oauth2_config:get_scope_prefix(?RABBITMQ_RESOURCE_ONE)).
816+
get_scope_prefix_for_resource_two_returns_root_scope_prefix(_Config) ->
817+
{ok, Prefix} = application:get_env(rabbitmq_auth_backend_oauth2, scope_prefix),
818+
?assertEqual(rabbit_oauth2_config:get_scope_prefix(),
819+
rabbit_oauth2_config:get_scope_prefix(?RABBITMQ_RESOURCE_TWO)),
820+
?assertEqual(Prefix,
821+
rabbit_oauth2_config:get_scope_prefix(?RABBITMQ_RESOURCE_TWO)).
822+
764823
get_resource_server_type_when_not_defined(_Config) ->
765824
?assertEqual(<<>>, rabbit_oauth2_config:get_resource_server_type()),
766825
?assertEqual(<<>>, rabbit_oauth2_config:get_resource_server_type(<<"rabbitmq2">>)).

‎deps/rabbitmq_auth_backend_oauth2/test/unit_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ test_validate_payload_resource_server_id_mismatch(_) ->
12701270
rabbit_auth_backend_oauth2:validate_payload(?RESOURCE_SERVER_ID, EmptyAud, ?DEFAULT_SCOPE_PREFIX)).
12711271

12721272
test_validate_payload_with_scope_prefix(_) ->
1273-
Scenarios = [ { <<>>,
1273+
Scenarios = [ { <<"">>,
12741274
#{<<"aud">> => [?RESOURCE_SERVER_ID],
12751275
<<"scope">> => [<<"foo">>, <<"foo.bar">>, <<"foo.other.third">> ]},
12761276
[<<"foo">>, <<"foo.bar">>, <<"foo.other.third">> ]

‎selenium/test/authnz-msg-protocols/enabled_plugins

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
rabbitmq_shovel_management,rabbitmq_stomp,rabbitmq_stream,
1313
rabbitmq_stream_common,rabbitmq_stream_management,rabbitmq_top,
1414
rabbitmq_tracing,rabbitmq_trust_store,rabbitmq_web_dispatch,
15-
rabbitmq_web_mqtt,rabbitmq_web_mqtt_examples,rabbitmq_web_stomp,
16-
rabbitmq_web_stomp_examples].
15+
rabbitmq_web_mqtt,rabbitmq_web_stomp].

‎selenium/test/basic-auth/enabled_plugins

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
rabbitmq_shovel_management,rabbitmq_stomp,rabbitmq_stream,
1313
rabbitmq_stream_common,rabbitmq_stream_management,rabbitmq_top,
1414
rabbitmq_tracing,rabbitmq_trust_store,rabbitmq_web_dispatch,
15-
rabbitmq_web_mqtt,rabbitmq_web_mqtt_examples,rabbitmq_web_stomp,
16-
rabbitmq_web_stomp_examples].
15+
rabbitmq_web_mqtt,rabbitmq_web_stomp].

‎selenium/test/mgt-only/enabled_plugins

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
rabbitmq_shovel_management,rabbitmq_stomp,rabbitmq_stream,
1313
rabbitmq_stream_common,rabbitmq_stream_management,rabbitmq_top,
1414
rabbitmq_tracing,rabbitmq_trust_store,rabbitmq_web_dispatch,
15-
rabbitmq_web_mqtt,rabbitmq_web_mqtt_examples,rabbitmq_web_stomp,
16-
rabbitmq_web_stomp_examples].
15+
rabbitmq_web_mqtt,rabbitmq_web_stomp].

‎selenium/test/mgt-only/rabbitmq.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ auth_backends.1 = rabbit_auth_backend_internal
33
management.login_session_timeout = 150
44
management_agent.disable_metrics_collector = true
55
load_definitions = ${RABBITMQ_TEST_DIR}/imports/users.json
6+
7+
loopback_users = none

‎selenium/test/multi-oauth/enabled_plugins

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
rabbitmq_shovel_management,rabbitmq_stomp,rabbitmq_stream,
1313
rabbitmq_stream_common,rabbitmq_stream_management,rabbitmq_top,
1414
rabbitmq_tracing,rabbitmq_trust_store,rabbitmq_web_dispatch,
15-
rabbitmq_web_mqtt,rabbitmq_web_mqtt_examples,rabbitmq_web_stomp,
16-
rabbitmq_web_stomp_examples].
15+
rabbitmq_web_mqtt,rabbitmq_web_stomp].

‎selenium/test/oauth/enabled_plugins

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
rabbitmq_shovel_management,rabbitmq_shovel_prometheus,rabbitmq_stomp,
1414
rabbitmq_stream,rabbitmq_stream_common,rabbitmq_stream_management,
1515
rabbitmq_top,rabbitmq_tracing,rabbitmq_trust_store,rabbitmq_web_dispatch,
16-
rabbitmq_web_mqtt,rabbitmq_web_mqtt_examples,rabbitmq_web_stomp,
17-
rabbitmq_web_stomp_examples].
16+
rabbitmq_web_mqtt,rabbitmq_web_stomp].

0 commit comments

Comments
 (0)