root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Authorize users tagged with 'administrator' can perform vhost-scoped operations 

This way an administrator without any permissions can access every form
on pages such as user permission management. Some users and RabbitMQ team
members administrators should have unconditional access to all vhosts.

Closes #461 as well as a number of similar issues.
This commit is contained in:
Michael Klishin 2017-08-01 18:31:19 +03:00
parent 576efad87c
commit fdb1cbf5d5
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/rabbitmq_management/src/rabbit_mgmt_util.erl vendored
View File

@ -92,8 +92,8 @@ is_authorized_monitor(ReqData, Context) ->
is_authorized_vhost(ReqData, Context) ->
is_authorized(ReqData, Context,
<<"User not authorised to access virtual host">>,
fun(User) ->
user_matches_vhost(ReqData, User)
fun(#user{tags = Tags} = User) ->
is_admin(Tags) orelse user_matches_vhost(ReqData, User)
end).
is_authorized_vhost_visible(ReqData, Context) ->

17
deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl vendored
View File

@ -189,6 +189,12 @@ end_per_testcase0(vhost_limit_set_test, Config) ->
rabbit_ct_broker_helpers:delete_vhost(Config, <<"limit_test_vhost_1">>),
rabbit_ct_broker_helpers:delete_user(Config, <<"limit_test_vhost_1_user">>),
Config;
end_per_testcase0(permissions_vhost_test, Config) ->
rabbit_ct_broker_helpers:delete_vhost(Config, <<"myvhost1">>),
rabbit_ct_broker_helpers:delete_vhost(Config, <<"myvhost2">>),
rabbit_ct_broker_helpers:delete_user(Config, <<"myuser1">>),
rabbit_ct_broker_helpers:delete_user(Config, <<"myuser2">>),
Config;
end_per_testcase0(_, Config) -> Config.
%% -------------------------------------------------------------------
%% Testcases.
@ -1024,6 +1030,8 @@ permissions_administrator_test(Config) ->
permissions_vhost_test(Config) ->
QArgs = #{},
PermArgs = [{configure, <<".*">>}, {write, <<".*">>}, {read, <<".*">>}],
http_put(Config, "/users/myadmin", [{password, <<"myadmin">>},
{tags, <<"administrator">>}], {group, '2xx'}),
http_put(Config, "/users/myuser", [{password, <<"myuser">>},
{tags, <<"management">>}], {group, '2xx'}),
http_put(Config, "/vhosts/myvhost1", none, {group, '2xx'}),
@ -1055,14 +1063,22 @@ permissions_vhost_test(Config) ->
http_get(Config, Path1 ++ "/myvhost2/" ++ Path2, "myuser", "myuser",
?NOT_AUTHORISED)
end,
Test3 =
fun(Path1) ->
http_get(Config, Path1 ++ "/myvhost1/", "myadmin", "myadmin",
?OK)
end,
Test1("/exchanges"),
Test2("/exchanges", ""),
Test2("/exchanges", "amq.direct"),
Test3("/exchanges"),
Test1("/queues"),
Test2("/queues", ""),
Test3("/queues"),
Test2("/queues", "myqueue"),
Test1("/bindings"),
Test2("/bindings", ""),
Test3("/bindings"),
Test2("/queues", "myqueue/bindings"),
Test2("/exchanges", "amq.default/bindings/source"),
Test2("/exchanges", "amq.default/bindings/destination"),
@ -1071,6 +1087,7 @@ permissions_vhost_test(Config) ->
http_delete(Config, "/vhosts/myvhost1", {group, '2xx'}),
http_delete(Config, "/vhosts/myvhost2", {group, '2xx'}),
http_delete(Config, "/users/myuser", {group, '2xx'}),
http_delete(Config, "/users/myadmin", {group, '2xx'}),
passed.
permissions_amqp_test(Config) ->