From 526bfecd7a0acf508922dc097f7f1679ab9da1ee Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 24 Sep 2025 16:28:51 -0400 Subject: [PATCH] Error message wording #14545 --- deps/rabbitmq_management/src/rabbit_mgmt_wm_user.erl | 4 ++-- deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_user.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_user.erl index e66f20513f..9c47bf4ced 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_user.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_user.erl @@ -49,7 +49,7 @@ accept_content(ReqData0, Context = #context{user = #user{username = ActingUser}} case rabbit_mgmt_util:is_protected_user(Username) of true -> 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); false -> 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 true -> 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); false -> rabbit_auth_backend_internal:delete_user(User, ActingUser), diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl index 6f12cac9d2..8d075c0753 100644 --- a/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl +++ b/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl @@ -663,11 +663,11 @@ users_protected_test(Config) -> rabbit_ct_broker_helpers:add_user(Config, ProtectedUser), 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">>}, {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), rabbit_ct_broker_helpers:delete_user(Config, ProtectedUser),