Error message wording #14545
This commit is contained in:
parent
31e5a722c5
commit
526bfecd7a
|
@ -49,7 +49,7 @@ accept_content(ReqData0, Context = #context{user = #user{username = ActingUser}}
|
||||||
case rabbit_mgmt_util:is_protected_user(Username) of
|
case rabbit_mgmt_util:is_protected_user(Username) of
|
||||||
true ->
|
true ->
|
||||||
rabbit_mgmt_util:bad_request(
|
rabbit_mgmt_util:bad_request(
|
||||||
<<"User updates via API are disabled for this user">>,
|
<<"Users tagged with 'protected' cannot be updated via the HTTP API">>,
|
||||||
ReqData0, Context);
|
ReqData0, Context);
|
||||||
false ->
|
false ->
|
||||||
rabbit_mgmt_util:with_decode(
|
rabbit_mgmt_util:with_decode(
|
||||||
|
@ -65,7 +65,7 @@ delete_resource(ReqData, Context = #context{user = #user{username = ActingUser}}
|
||||||
case rabbit_mgmt_util:is_protected_user(User) of
|
case rabbit_mgmt_util:is_protected_user(User) of
|
||||||
true ->
|
true ->
|
||||||
rabbit_mgmt_util:bad_request(
|
rabbit_mgmt_util:bad_request(
|
||||||
<<"User deletion via API is disabled for this user">>,
|
<<"Users tagged with 'protected' cannot be deleted via the HTTP API">>,
|
||||||
ReqData, Context);
|
ReqData, Context);
|
||||||
false ->
|
false ->
|
||||||
rabbit_auth_backend_internal:delete_user(User, ActingUser),
|
rabbit_auth_backend_internal:delete_user(User, ActingUser),
|
||||||
|
|
|
@ -663,11 +663,11 @@ users_protected_test(Config) ->
|
||||||
rabbit_ct_broker_helpers:add_user(Config, ProtectedUser),
|
rabbit_ct_broker_helpers:add_user(Config, ProtectedUser),
|
||||||
rabbit_ct_broker_helpers:set_user_tags(Config, 0, ProtectedUser, [management, protected]),
|
rabbit_ct_broker_helpers:set_user_tags(Config, 0, ProtectedUser, [management, protected]),
|
||||||
|
|
||||||
%% Verify protected user cannot be updated via API
|
%% Verify that a protected user cannot be updated via the HTTP API
|
||||||
http_put(Config, "/users/protected_user", [{password, <<"new_password">>},
|
http_put(Config, "/users/protected_user", [{password, <<"new_password">>},
|
||||||
{tags, <<"management,protected">>}], ?BAD_REQUEST),
|
{tags, <<"management,protected">>}], ?BAD_REQUEST),
|
||||||
|
|
||||||
%% Verify protected user cannot be deleted via API
|
%% Verify that a protected user cannot be deleted via the HTTP API
|
||||||
http_delete(Config, "/users/protected_user", ?BAD_REQUEST),
|
http_delete(Config, "/users/protected_user", ?BAD_REQUEST),
|
||||||
|
|
||||||
rabbit_ct_broker_helpers:delete_user(Config, ProtectedUser),
|
rabbit_ct_broker_helpers:delete_user(Config, ProtectedUser),
|
||||||
|
|
Loading…
Reference in New Issue