Deleted a lot of stuff to do with permissions

2 files changed, 1 insertions, 117 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 9f95df1e..12040725 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -88,10 +88,6 @@ Available commands:
   list_user_vhosts <UserName>
   list_vhost_users <VHostPath>
 
-  add_realm    <VHostPath> <RealmName>
-  delete_realm <VHostPath> <RealmName>
-  list_realms  <VHostPath>
-
   set_permissions  <UserName> <VHostPath> <RealmName> [<Permission> ...]
       Permissions management. The available permissions are 'passive',
       'active', 'write' and 'read', corresponding to the permissions
@@ -182,68 +178,7 @@ action(list_user_vhosts, Node, Args = [_Username]) ->
 
 action(list_vhost_users, Node, Args = [_VHostPath]) ->
     io:format("Listing users for vhosts ~p...", Args),
-    display_list(call(Node, {rabbit_access_control, list_vhost_users, Args}));
-
-action(add_realm, Node, [VHostPath, RealmName]) ->
-    io:format("Adding realm ~p to vhost ~p ...", [RealmName, VHostPath]),
-    rpc_call(Node, rabbit_realm, add_realm,
-             [realm_rsrc(VHostPath, RealmName)]);
-
-action(delete_realm, Node, [VHostPath, RealmName]) ->
-    io:format("Deleting realm ~p from vhost ~p ...", [RealmName, VHostPath]),
-    rpc_call(Node, rabbit_realm, delete_realm,
-             [realm_rsrc(VHostPath, RealmName)]);
-
-action(list_realms, Node, Args = [_VHostPath]) ->
-    io:format("Listing realms for vhost ~p ...", Args),
-    display_list(call(Node, {rabbit_realm, list_vhost_realms, Args}));
-
-% action(set_permissions, Node,
-%        [Username, VHostPath, RealmName | Permissions]) ->
-%     io:format("Setting permissions for user ~p, vhost ~p, realm ~p ...",
-%               [Username, VHostPath, RealmName]),
-%     CheckedPermissions = check_permissions(Permissions),
-%     Ticket = #ticket{
-%       realm_name   = realm_rsrc(VHostPath, RealmName),
-%       passive_flag = lists:member(passive, CheckedPermissions),
-%       active_flag  = lists:member(active,  CheckedPermissions),
-%       write_flag   = lists:member(write,   CheckedPermissions),
-%       read_flag    = lists:member(read,    CheckedPermissions)},
-%     rpc_call(Node, rabbit_access_control, map_user_realm,
-%              [list_to_binary(Username), Ticket]);
-
-action(list_permissions, Node, Args = [_Username, _VHostPath]) ->
-    io:format("Listing permissions for user ~p in vhost ~p ...", Args),
-    Perms = call(Node, {rabbit_access_control, list_user_realms, Args}),
-    if is_list(Perms) ->
-            lists:foreach(
-              fun ({RealmName, Pattern}) ->
-                      io:format("~n~s: ~p",
-                                [binary_to_list(RealmName),
-                                 rabbit_misc:permission_list(Pattern)])
-              end,
-              lists:sort(Perms)),
-            io:nl(),
-            ok;
-       true -> Perms
-    end.
-
-check_permissions([]) -> [];
-check_permissions(["all" | R]) ->
-    [passive, active, write, read | check_permissions(R)];
-check_permissions([P | R]) when (P == "passive") or
-                                (P == "active")  or
-                                (P == "write")   or
-                                (P == "read") ->
-    [list_to_atom(P) | check_permissions(R)];
-check_permissions([P | _R]) ->
-    io:format("~nError: invalid permission flag ~p~n", [P]),
-    usage().
-
-realm_rsrc(VHostPath, RealmName) ->
-    rabbit_misc:r(list_to_binary(VHostPath),
-                  realm,
-                  list_to_binary(RealmName)).
+    display_list(call(Node, {rabbit_access_control, list_vhost_users, Args})).
 
 display_list(L) when is_list(L) ->
     lists:foreach(fun (I) ->
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index beeb3508..6f43b08a 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -284,31 +284,12 @@ test_user_management() ->
         control_action(unmap_user_vhost, ["foo", "/"]),
     {error, {no_such_user, _}} =
         control_action(list_user_vhosts, ["foo"]),
-    {error, {no_such_user, _}} =
-        control_action(set_permissions, ["foo", "/", "/data"]),
-    {error, {no_such_user, _}} =
-        control_action(list_permissions, ["foo", "/"]),
     {error, {no_such_vhost, _}} =
         control_action(map_user_vhost, ["guest", "/testhost"]),
     {error, {no_such_vhost, _}} =
         control_action(unmap_user_vhost, ["guest", "/testhost"]),
     {error, {no_such_vhost, _}} =
         control_action(list_vhost_users, ["/testhost"]),
-    {error, {no_such_vhost, _}} =
-        control_action(set_permissions, ["guest", "/testhost", "/data"]),
-    {error, {no_such_vhost, _}} =
-        control_action(list_permissions, ["guest", "/testhost"]),
-    {error, {no_such_vhost, _}} =
-        control_action(add_realm, ["/testhost", "/data/test"]),
-    {error, {no_such_vhost, _}} =
-        control_action(delete_realm, ["/testhost", "/data/test"]),
-    {error, {no_such_vhost, _}} =
-        control_action(list_realms, ["/testhost"]),
-    {error, {no_such_realm, _}} =
-        control_action(set_permissions, ["guest", "/", "/data/test"]),
-    {error, {no_such_realm, _}} =
-        control_action(delete_realm, ["/", "/data/test"]),
-
     %% user creation
     ok = control_action(add_user, ["foo", "bar"]),
     {error, {user_already_exists, _}} =
@@ -327,32 +308,6 @@ test_user_management() ->
     ok = control_action(map_user_vhost, ["foo", "/testhost"]),
     ok = control_action(list_user_vhosts, ["foo"]),
 
-    %% realm creation
-    ok = control_action(add_realm, ["/testhost", "/data/test"]),
-    {error, {realm_already_exists, _}} =
-        control_action(add_realm, ["/testhost", "/data/test"]),
-    ok = control_action(list_realms, ["/testhost"]),
-
-    %% user permissions
-    ok = control_action(set_permissions,
-                        ["foo", "/testhost", "/data/test",
-                         "passive", "active", "write", "read"]),
-    ok = control_action(list_permissions, ["foo", "/testhost"]),
-    ok = control_action(set_permissions,
-                        ["foo", "/testhost", "/data/test", "all"]),
-    ok = control_action(set_permissions,
-                        ["foo", "/testhost", "/data/test"]),
-    {error, not_mapped_to_vhost} =
-        control_action(set_permissions,
-                       ["guest", "/testhost", "/data/test"]),
-    {error, not_mapped_to_vhost} =
-        control_action(list_permissions, ["guest", "/testhost"]),
-
-    %% realm deletion
-    ok = control_action(delete_realm, ["/testhost", "/data/test"]),
-    {error, {no_such_realm, _}} =
-        control_action(delete_realm, ["/testhost", "/data/test"]),
-
     %% user/vhost unmapping
     ok = control_action(unmap_user_vhost, ["foo", "/testhost"]),
     ok = control_action(unmap_user_vhost, ["foo", "/testhost"]),
@@ -364,13 +319,7 @@ test_user_management() ->
 
     %% deleting a populated vhost
     ok = control_action(add_vhost, ["/testhost"]),
-    ok = control_action(add_realm, ["/testhost", "/data/test"]),
     ok = control_action(map_user_vhost, ["foo", "/testhost"]),
-    ok = control_action(set_permissions,
-                        ["foo", "/testhost", "/data/test", "all"]),
-    _ = rabbit_amqqueue:declare(
-          rabbit_misc:r(<<"/testhost">>, realm, <<"/data/test">>),
-          <<"bar">>, true, false, []),
     ok = control_action(delete_vhost, ["/testhost"]),
 
     %% user deletion