Merge pull request #1082 from rabbitmq/rabbitmq-event-exchange-10rabbitmq_v3_7_0_milestone10

Notify user who performed the action in all system events

5 files changed, 44 insertions, 37 deletions

diff --git a/test/dummy_runtime_parameters.erl b/test/dummy_runtime_parameters.erl
index d80ec785d0..0bf4b82d86 100644
--- a/test/dummy_runtime_parameters.erl
+++ b/test/dummy_runtime_parameters.erl
@@ -20,7 +20,7 @@
 
 -include("rabbit.hrl").
 
--export([validate/5, notify/4, notify_clear/3]).
+-export([validate/5, notify/5, notify_clear/4]).
 -export([register/0, unregister/0]).
 -export([validate_policy/1]).
 -export([register_policy_validator/0, unregister_policy_validator/0]).
@@ -43,8 +43,8 @@ validate(_, <<"test">>, <<"admin">>, _Term, User) ->
     end;
 validate(_, <<"test">>, _, _, _)                        -> {error, "meh", []}.
 
-notify(_, _, _, _) -> ok.
-notify_clear(_, _, _) -> ok.
+notify(_, _, _, _, _) -> ok.
+notify_clear(_, _, _, _) -> ok.
 
 %----------------------------------------------------------------------------
 
diff --git a/test/dynamic_ha_SUITE.erl b/test/dynamic_ha_SUITE.erl
index 502e3a7e86..1e32fae254 100644
--- a/test/dynamic_ha_SUITE.erl
+++ b/test/dynamic_ha_SUITE.erl
@@ -223,7 +223,7 @@ vhost_deletion(Config) ->
     rabbit_ct_broker_helpers:set_ha_policy_all(Config),
     ACh = rabbit_ct_client_helpers:open_channel(Config, A),
     amqp_channel:call(ACh, #'queue.declare'{queue = <<"vhost_deletion-q">>}),
-    ok = rpc:call(A, rabbit_vhost, delete, [<<"/">>]),
+    ok = rpc:call(A, rabbit_vhost, delete, [<<"/">>, <<"acting-user">>]),
     ok.
 
 promote_on_shutdown(Config) ->
diff --git a/test/queue_master_location_SUITE.erl b/test/queue_master_location_SUITE.erl
index e77f27f14b..8f9433beb4 100644
--- a/test/queue_master_location_SUITE.erl
+++ b/test/queue_master_location_SUITE.erl
@@ -245,7 +245,8 @@ unset_location_config(Config) ->
 declare(Config, QueueName, Durable, AutoDelete, Args, Owner) ->
     Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
     {new, Queue} = rpc:call(Node, rabbit_amqqueue, declare,
-                            [QueueName, Durable, AutoDelete, Args, Owner]),
+                            [QueueName, Durable, AutoDelete, Args, Owner,
+                             <<"acting-user">>]),
     Queue.
 
 verify_min_master(Config, Q) ->
diff --git a/test/topic_permission_SUITE.erl b/test/topic_permission_SUITE.erl
index b7d65e6d0c..57d48af4ab 100644
--- a/test/topic_permission_SUITE.erl
+++ b/test/topic_permission_SUITE.erl
@@ -70,13 +70,13 @@ topic_permission_database_access(Config) ->
 
 topic_permission_database_access1(_Config) ->
     0 = length(ets:tab2list(rabbit_topic_permission)),
-    rabbit_vhost:add(<<"/">>),
-    rabbit_vhost:add(<<"other-vhost">>),
-    rabbit_auth_backend_internal:add_user(<<"guest">>, <<"guest">>),
-    rabbit_auth_backend_internal:add_user(<<"dummy">>, <<"dummy">>),
+    rabbit_vhost:add(<<"/">>, <<"acting-user">>),
+    rabbit_vhost:add(<<"other-vhost">>, <<"acting-user">>),
+    rabbit_auth_backend_internal:add_user(<<"guest">>, <<"guest">>, <<"acting-user">>),
+    rabbit_auth_backend_internal:add_user(<<"dummy">>, <<"dummy">>, <<"acting-user">>),
 
     rabbit_auth_backend_internal:set_topic_permissions(
-        <<"guest">>, <<"/">>, <<"amq.topic">>, "^a"
+        <<"guest">>, <<"/">>, <<"amq.topic">>, "^a", <<"acting-user">>
     ),
     1 = length(ets:tab2list(rabbit_topic_permission)),
     1 = length(rabbit_auth_backend_internal:list_user_topic_permissions(<<"guest">>)),
@@ -88,7 +88,7 @@ topic_permission_database_access1(_Config) ->
     1 = length(rabbit_auth_backend_internal:list_topic_permissions()),
 
     rabbit_auth_backend_internal:set_topic_permissions(
-        <<"guest">>, <<"other-vhost">>, <<"amq.topic">>, ".*"
+        <<"guest">>, <<"other-vhost">>, <<"amq.topic">>, ".*", <<"acting-user">>
     ),
     2 = length(ets:tab2list(rabbit_topic_permission)),
     2 = length(rabbit_auth_backend_internal:list_user_topic_permissions(<<"guest">>)),
@@ -100,10 +100,10 @@ topic_permission_database_access1(_Config) ->
     2 = length(rabbit_auth_backend_internal:list_topic_permissions()),
 
     rabbit_auth_backend_internal:set_topic_permissions(
-        <<"guest">>, <<"/">>, <<"topic1">>, "^a"
+        <<"guest">>, <<"/">>, <<"topic1">>, "^a", <<"acting-user">>
     ),
     rabbit_auth_backend_internal:set_topic_permissions(
-        <<"guest">>, <<"/">>, <<"topic2">>, "^a"
+        <<"guest">>, <<"/">>, <<"topic2">>, "^a", <<"acting-user">>
     ),
 
     4 = length(rabbit_auth_backend_internal:list_user_topic_permissions(<<"guest">>)),
@@ -111,25 +111,29 @@ topic_permission_database_access1(_Config) ->
     1 = length(rabbit_auth_backend_internal:list_user_vhost_topic_permissions(<<"guest">>,<<"other-vhost">>)),
     4 = length(rabbit_auth_backend_internal:list_topic_permissions()),
 
-    rabbit_auth_backend_internal:clear_topic_permissions(<<"guest">>, <<"other-vhost">>),
+    rabbit_auth_backend_internal:clear_topic_permissions(<<"guest">>, <<"other-vhost">>,
+                                                         <<"acting-user">>),
     0 = length(rabbit_auth_backend_internal:list_vhost_topic_permissions(<<"other-vhost">>)),
     3 = length(rabbit_auth_backend_internal:list_user_topic_permissions(<<"guest">>)),
-    rabbit_auth_backend_internal:clear_topic_permissions(<<"guest">>, <<"/">>, <<"topic1">>),
+    rabbit_auth_backend_internal:clear_topic_permissions(<<"guest">>, <<"/">>, <<"topic1">>,
+                                                         <<"acting-user">>),
     2 = length(rabbit_auth_backend_internal:list_user_topic_permissions(<<"guest">>)),
-    rabbit_auth_backend_internal:clear_topic_permissions(<<"guest">>, <<"/">>),
+    rabbit_auth_backend_internal:clear_topic_permissions(<<"guest">>, <<"/">>,
+                                                         <<"acting-user">>),
     0 = length(rabbit_auth_backend_internal:list_user_topic_permissions(<<"guest">>)),
 
 
     {error, {no_such_user, _}} = (catch rabbit_auth_backend_internal:set_topic_permissions(
-        <<"non-existing-user">>, <<"other-vhost">>, <<"amq.topic">>, ".*"
+        <<"non-existing-user">>, <<"other-vhost">>, <<"amq.topic">>, ".*", <<"acting-user">>
     )),
 
     {error, {no_such_vhost, _}} = (catch rabbit_auth_backend_internal:set_topic_permissions(
-        <<"guest">>, <<"non-existing-vhost">>, <<"amq.topic">>, ".*"
+        <<"guest">>, <<"non-existing-vhost">>, <<"amq.topic">>, ".*", <<"acting-user">>
     )),
 
     {error, {no_such_user, _}} = (catch rabbit_auth_backend_internal:set_topic_permissions(
-        <<"non-existing-user">>, <<"non-existing-vhost">>, <<"amq.topic">>, ".*"
+        <<"non-existing-user">>, <<"non-existing-vhost">>, <<"amq.topic">>, ".*",
+                                          <<"acting-user">>
     )),
 
     {error, {no_such_user, _}} = (catch rabbit_auth_backend_internal:list_user_topic_permissions(
@@ -141,7 +145,7 @@ topic_permission_database_access1(_Config) ->
     )),
 
     {error, {invalid_regexp, _, _}} = (catch rabbit_auth_backend_internal:set_topic_permissions(
-        <<"guest">>, <<"/">>, <<"amq.topic">>, "["
+        <<"guest">>, <<"/">>, <<"amq.topic">>, "[", <<"acting-user">>
     )),
     ok.
 
@@ -159,11 +163,11 @@ topic_permission_checks1(_Config) ->
             #vhost{virtual_host = <<"other-vhost">>},
             write)
                                            end),
-    rabbit_auth_backend_internal:add_user(<<"guest">>, <<"guest">>),
-    rabbit_auth_backend_internal:add_user(<<"dummy">>, <<"dummy">>),
+    rabbit_auth_backend_internal:add_user(<<"guest">>, <<"guest">>, <<"acting-user">>),
+    rabbit_auth_backend_internal:add_user(<<"dummy">>, <<"dummy">>, <<"acting-user">>),
 
     rabbit_auth_backend_internal:set_topic_permissions(
-        <<"guest">>, <<"/">>, <<"amq.topic">>, "^a"
+        <<"guest">>, <<"/">>, <<"amq.topic">>, "^a", <<"acting-user">>
     ),
     1 = length(ets:tab2list(rabbit_topic_permission)),
     1 = length(rabbit_auth_backend_internal:list_user_topic_permissions(<<"guest">>)),
@@ -172,7 +176,7 @@ topic_permission_checks1(_Config) ->
     0 = length(rabbit_auth_backend_internal:list_vhost_topic_permissions(<<"other-vhost">>)),
 
     rabbit_auth_backend_internal:set_topic_permissions(
-        <<"guest">>, <<"other-vhost">>, <<"amq.topic">>, ".*"
+        <<"guest">>, <<"other-vhost">>, <<"amq.topic">>, ".*", <<"acting-user">>
     ),
     2 = length(ets:tab2list(rabbit_topic_permission)),
     2 = length(rabbit_auth_backend_internal:list_user_topic_permissions(<<"guest">>)),
@@ -214,4 +218,4 @@ topic_permission_checks1(_Config) ->
         write,
         Context
     ),
-    ok.
\ No newline at end of file
+    ok.
diff --git a/test/unit_inbroker_SUITE.erl b/test/unit_inbroker_SUITE.erl
index 91a3eb32a6..b1ebd054cf 100644
--- a/test/unit_inbroker_SUITE.erl
+++ b/test/unit_inbroker_SUITE.erl
@@ -794,7 +794,7 @@ bq_variable_queue_delete_msg_store_files_callback1(Config) ->
       rabbit_amqqueue:declare(
         queue_name(Config,
           <<"bq_variable_queue_delete_msg_store_files_callback-q">>),
-        true, false, [], none),
+        true, false, [], none, <<"acting-user">>),
     Payload = <<0:8388608>>, %% 1MB
     Count = 30,
     publish_and_confirm(Q, Payload, Count),
@@ -811,7 +811,7 @@ bq_variable_queue_delete_msg_store_files_callback1(Config) ->
     %% give the queue a second to receive the close_fds callback msg
     timer:sleep(1000),
 
-    rabbit_amqqueue:delete(Q, false, false),
+    rabbit_amqqueue:delete(Q, false, false, <<"acting-user">>),
     passed.
 
 bq_queue_recover(Config) ->
@@ -822,7 +822,7 @@ bq_queue_recover1(Config) ->
     Count = 2 * rabbit_queue_index:next_segment_boundary(0),
     {new, #amqqueue { pid = QPid, name = QName } = Q} =
         rabbit_amqqueue:declare(queue_name(Config, <<"bq_queue_recover-q">>),
-                                true, false, [], none),
+                                true, false, [], none, <<"acting-user">>),
     publish_and_confirm(Q, <<>>, Count),
 
     SupPid = rabbit_ct_broker_helpers:get_queue_sup_pid(QPid),
@@ -848,7 +848,7 @@ bq_queue_recover1(Config) ->
                   rabbit_variable_queue:fetch(true, VQ1),
               CountMinusOne = rabbit_variable_queue:len(VQ2),
               _VQ3 = rabbit_variable_queue:delete_and_terminate(shutdown, VQ2),
-              ok = rabbit_amqqueue:internal_delete(QName)
+              ok = rabbit_amqqueue:internal_delete(QName, <<"acting-user">>)
       end),
     passed.
 
@@ -2166,12 +2166,12 @@ change_password1(_Config) ->
     UserName = <<"test_user">>,
     Password = <<"test_password">>,
     case rabbit_auth_backend_internal:lookup_user(UserName) of
-        {ok, _} -> rabbit_auth_backend_internal:delete_user(UserName);
+        {ok, _} -> rabbit_auth_backend_internal:delete_user(UserName, <<"acting-user">>);
         _       -> ok
     end,
     ok = application:set_env(rabbit, password_hashing_module,
                              rabbit_password_hashing_md5),
-    ok = rabbit_auth_backend_internal:add_user(UserName, Password),
+    ok = rabbit_auth_backend_internal:add_user(UserName, Password, <<"acting-user">>),
     {ok, #auth_user{username = UserName}} =
         rabbit_auth_backend_internal:user_login_authentication(
             UserName, [{password, Password}]),
@@ -2182,7 +2182,8 @@ change_password1(_Config) ->
             UserName, [{password, Password}]),
 
     NewPassword = <<"test_password1">>,
-    ok = rabbit_auth_backend_internal:change_password(UserName, NewPassword),
+    ok = rabbit_auth_backend_internal:change_password(UserName, NewPassword,
+                                                      <<"acting-user">>),
     {ok, #auth_user{username = UserName}} =
         rabbit_auth_backend_internal:user_login_authentication(
             UserName, [{password, NewPassword}]),
@@ -3004,14 +3005,14 @@ declare_on_dead_queue1(_Config, SecondaryNode) ->
                 fun () ->
                         {new, #amqqueue{name = QueueName, pid = QPid}} =
                             rabbit_amqqueue:declare(QueueName, false, false, [],
-                                                    none),
+                                                    none, <<"acting-user">>),
                         exit(QPid, kill),
                         Self ! {self(), killed, QPid}
                 end),
     receive
         {Pid, killed, OldPid} ->
             Q = dead_queue_loop(QueueName, OldPid),
-            {ok, 0} = rabbit_amqqueue:delete(Q, false, false),
+            {ok, 0} = rabbit_amqqueue:delete(Q, false, false, <<"acting-user">>),
             passed
     after ?TIMEOUT -> throw(failed_to_create_and_kill_queue)
     end.
@@ -3038,9 +3039,9 @@ refresh_events1(Config, SecondaryNode) ->
 
     {new, #amqqueue{name = QName} = Q} =
         rabbit_amqqueue:declare(queue_name(Config, <<"refresh_events-q">>),
-                                false, false, [], none),
+                                false, false, [], none, <<"acting-user">>),
     expect_events(name, QName, queue_created),
-    rabbit_amqqueue:delete(Q, false, false),
+    rabbit_amqqueue:delete(Q, false, false, <<"acting-user">>),
 
     dummy_event_receiver:stop(),
     passed.
@@ -3074,7 +3075,8 @@ must_exit(Fun) ->
     end.
 
 dead_queue_loop(QueueName, OldPid) ->
-    {existing, Q} = rabbit_amqqueue:declare(QueueName, false, false, [], none),
+    {existing, Q} = rabbit_amqqueue:declare(QueueName, false, false, [], none,
+                                            <<"acting-user">>),
     case Q#amqqueue.pid of
         OldPid -> timer:sleep(25),
                   dead_queue_loop(QueueName, OldPid);