Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable add/delete/shrink/grow QQ operations via HTTP api #9151

Merged
merged 1 commit into from
Aug 23, 2023
Merged

Disable add/delete/shrink/grow QQ operations via HTTP api #9151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions deps/rabbitmq_management/priv/schema/rabbitmq_management.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,3 +521,10 @@ end}.
{datatype, {enum, [true, false]}},
{include_default, false}
]}.

%% Disables add/remove/grow/shrink over API.

{mapping, "management.restrictions.quorum_queue_replica_operations.disabled", "rabbitmq_management.restrictions.quorum_queue_replica_operations.disabled", [
{datatype, {enum, [true, false]}},
{include_default, false}
]}.
4 changes: 4 additions & 0 deletions deps/rabbitmq_management/src/rabbit_mgmt_features.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@
-module(rabbit_mgmt_features).

-export([is_op_policy_updating_disabled/0,
is_qq_replica_operations_disabled/0,
are_stats_enabled/0]).

is_qq_replica_operations_disabled() ->
get_restriction([quorum_queue_replica_operations, disabled]).

is_op_policy_updating_disabled() ->
case get_restriction([operator_policy_changes, disabled]) of
true -> true;
Expand Down
7 changes: 6 additions & 1 deletion deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_add_member.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ accept_content(ReqData, Context) ->


is_authorized(ReqData, Context) ->
rabbit_mgmt_util:is_authorized_admin(ReqData, Context).
case rabbit_mgmt_features:is_qq_replica_operations_disabled() of
true ->
rabbit_mgmt_util:method_not_allowed(<<"Broker settings disallow quorum queue replica operations.">>, ReqData, Context);
false ->
rabbit_mgmt_util:is_authorized_admin(ReqData, Context)
end.
8 changes: 7 additions & 1 deletion deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_delete_member.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,11 @@ delete_completed(ReqData, Context) ->
%% return 202 Accepted since this is an inherently asynchronous operation
{false, ReqData, Context}.


is_authorized(ReqData, Context) ->
rabbit_mgmt_util:is_authorized_admin(ReqData, Context).
case rabbit_mgmt_features:is_qq_replica_operations_disabled() of
true ->
rabbit_mgmt_util:method_not_allowed(<<"Broker settings disallow quorum queue replica operations.">>, ReqData, Context);
false ->
rabbit_mgmt_util:is_authorized_admin(ReqData, Context)
end.
8 changes: 6 additions & 2 deletions deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_grow.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ accept_content(ReqData, Context) ->
end),
{true, ReqData, Context}.


is_authorized(ReqData, Context) ->
rabbit_mgmt_util:is_authorized_admin(ReqData, Context).
case rabbit_mgmt_features:is_qq_replica_operations_disabled() of
true ->
rabbit_mgmt_util:method_not_allowed(<<"Broker settings disallow quorum queue replica operations.">>, ReqData, Context);
false ->
rabbit_mgmt_util:is_authorized_admin(ReqData, Context)
end.
7 changes: 6 additions & 1 deletion deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_shrink.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,9 @@ delete_completed(ReqData, Context) ->
{false, ReqData, Context}.

is_authorized(ReqData, Context) ->
rabbit_mgmt_util:is_authorized_admin(ReqData, Context).
case rabbit_mgmt_features:is_qq_replica_operations_disabled() of
true ->
rabbit_mgmt_util:method_not_allowed(<<"Broker settings disallow quorum queue replica operations.">>, ReqData, Context);
false ->
rabbit_mgmt_util:is_authorized_admin(ReqData, Context)
end.
23 changes: 21 additions & 2 deletions deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
http_put/4, http_put/6,
http_post/4, http_post/6,
http_upload_raw/8,
http_delete/3, http_delete/5,
http_delete/3, http_delete/4, http_delete/5,
http_put_raw/4, http_post_accept_json/4,
req/4, auth_header/2,
assert_permanent_redirect/3,
Expand Down Expand Up @@ -151,7 +151,8 @@ all_tests() -> [
auth_attempts_test,
user_limits_list_test,
user_limit_set_test,
config_environment_test
config_environment_test,
disabled_qq_replica_opers_test
].

%% -------------------------------------------------------------------
Expand Down Expand Up @@ -216,6 +217,11 @@ init_per_testcase(Testcase = disabled_operator_policy_test, Config) ->
rabbit_ct_broker_helpers:rpc_all(Config,
application, set_env, [rabbitmq_management, restrictions, Restrictions]),
rabbit_ct_helpers:testcase_started(Config, Testcase);
init_per_testcase(Testcase = disabled_qq_replica_opers_test, Config) ->
Restrictions = [{quorum_queue_replica_operations, [{disabled, true}]}],
rabbit_ct_broker_helpers:rpc_all(Config,
application, set_env, [rabbitmq_management, restrictions, Restrictions]),
rabbit_ct_helpers:testcase_started(Config, Testcase);
init_per_testcase(Testcase, Config) ->
rabbit_ct_broker_helpers:close_all_connections(Config, 0, <<"rabbit_mgmt_SUITE:init_per_testcase">>),
rabbit_ct_helpers:testcase_started(Config, Testcase).
Expand Down Expand Up @@ -277,6 +283,10 @@ end_per_testcase0(disabled_operator_policy_test, Config) ->
rabbit_ct_broker_helpers:rpc(Config, 0, application, unset_env,
[rabbitmq_management, restrictions]),
Config;
end_per_testcase0(disabled_qq_replica_opers_test, Config) ->
rabbit_ct_broker_helpers:rpc(Config, 0, application, unset_env,
[rabbitmq_management, restrictions]),
Config;
end_per_testcase0(_, Config) -> Config.

%% -------------------------------------------------------------------
Expand Down Expand Up @@ -3553,6 +3563,15 @@ config_environment_test(Config) ->
?assertEqual(config_environment_test_value, V).


disabled_qq_replica_opers_test(Config) ->
Nodename = rabbit_data_coercion:to_list(rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename)),
Body = [{node, Nodename}],
http_post(Config, "/queues/quorum/%2F/qq.whatever/replicas/add", Body, ?METHOD_NOT_ALLOWED),
http_delete(Config, "/queues/quorum/%2F/qq.whatever/replicas/delete", ?METHOD_NOT_ALLOWED, Body),
http_post(Config, "/queues/quorum/replicas/on/" ++ Nodename ++ "/grow", Body, ?METHOD_NOT_ALLOWED),
http_delete(Config, "/queues/quorum/replicas/on/" ++ Nodename ++ "/shrink", ?METHOD_NOT_ALLOWED),
passed.

%% -------------------------------------------------------------------
%% Helpers.
%% -------------------------------------------------------------------
Expand Down