MB-47613 [BP] Add buckets names and UUID to pools/default

backport of: http://review.couchbase.org/c/ns_server/+/156065

Change-Id: I3dfab227c1f054d3aad301a4a27b6800892a40e0
Reviewed-on: http://review.couchbase.org/c/ns_server/+/159447
Well-Formed: Restriction Checker
Reviewed-by: Artem Stemkovski <[email protected]>
Tested-by: Build Bot <[email protected]>
Tested-by: <[email protected]>

Author: hareen-kancharla

src/menelaus_auth.erl

@@ -20,9 +20,11 @@
 
 -include("ns_common.hrl").
 -include("rbac.hrl").
+-include("cut.hrl").
 
 -export([has_permission/2,
          is_internal/1,
+         filter_accessible_buckets/3,
          get_accessible_buckets/2,
          extract_auth/1,
          extract_identity_from_cert/1,
@@ -46,6 +48,11 @@
 
 %% External API
 
+filter_accessible_buckets(Fun, Buckets, Req) ->
+    Identity = get_identity(Req),
+    Roles = menelaus_roles:get_compiled_roles(Identity),
+    lists:filter(?cut(menelaus_roles:is_allowed(Fun(_), Roles)), Buckets).
+
 -spec get_accessible_buckets(fun ((bucket_name()) -> rbac_permission()), mochiweb_request()) ->
                                     [bucket_name()].
 get_accessible_buckets(Fun, Req) ->

src/menelaus_web_pools.erl

@@ -102,17 +102,29 @@ handle_pool_info(Id, Req) ->
     PassedETag = proplists:get_value("etag", Query),
     case WaitChangeS of
         undefined ->
-            reply_json(Req, build_pool_info(Id, Req, normal, unstable,
-                                            LocalAddr, undefined));
+            reply_json(Req, pool_info(Id, Req, normal, unstable,
+                                      LocalAddr, undefined));
         _ ->
             WaitChange = list_to_integer(WaitChangeS),
             menelaus_event:register_watcher(self()),
             erlang:send_after(WaitChange, self(), wait_expired),
             handle_pool_info_wait(Req, Id, LocalAddr, PassedETag, undefined)
     end.
 
+pool_info(Id, Req, InfoLevel, Stability, LocalAddr, UpdateID) ->
+    {struct,Info} = build_pool_info(Id, Req, InfoLevel, Stability,
+                                    LocalAddr, UpdateID),
+    Buckets = proplists:get_value(bucketNames, Info),
+    FilteredBuckets = menelaus_auth:filter_accessible_buckets(
+                        fun ({struct, [{bucketName, B}, _UUID]}) ->
+                                {[{bucket, binary_to_list(B)}, settings], read}
+                        end,
+                        Buckets, Req),
+    {struct, lists:keyreplace(bucketNames, 1, Info,
+                              {bucketNames, FilteredBuckets})}.
+
 handle_pool_info_wait(Req, Id, LocalAddr, PassedETag, UpdateID) ->
-    Info = build_pool_info(Id, Req, for_ui, stable, LocalAddr, UpdateID),
+    Info = pool_info(Id, Req, for_ui, stable, LocalAddr, UpdateID),
     ETag = integer_to_list(erlang:phash2(Info)),
     if
         ETag =:= PassedETag ->
@@ -140,7 +152,7 @@ handle_pool_info_wait_tail(Req, Id, LocalAddr, ETag, UpdateID) ->
     %% consume all notifications
     LastID = menelaus_event:flush_watcher_notifications(UpdateID),
     %% and reply
-    {struct, PList} = build_pool_info(Id, Req, for_ui, unstable, LocalAddr,
+    {struct, PList} = pool_info(Id, Req, for_ui, unstable, LocalAddr,
                                       LastID),
     Info = {struct, [{etag, list_to_binary(ETag)} | PList]},
     reply_ok(Req, "application/json", encode_json(Info),
@@ -274,18 +286,21 @@ build_unstable_params(unstable, Config) ->
                ns_storage_conf:cluster_storage_info(Config)]}}].
 
 build_buckets_info(Config, Id, UUID, Nodes) ->
+     Buckets = ns_bucket:uuids(Config),
      BucketsVer =
-        erlang:phash2(
-          ns_bucket:get_bucket_names(ns_bucket:get_buckets(Config)))
+        erlang:phash2(Buckets)
         bxor erlang:phash2(
                [{proplists:get_value(hostname, KV),
                  proplists:get_value(status, KV)} || {struct, KV} <- Nodes]),
-    {buckets, {struct,
-               [{uri, bin_concat_path(["pools", Id, "buckets"],
-                                      [{"v", BucketsVer},
-                                       {"uuid", UUID}])},
-                {terseBucketsBase, <<"/pools/default/b/">>},
-                {terseStreamingBucketsBase, <<"/pools/default/bs/">>}]}}.
+     [{buckets, {struct,
+                 [{uri, bin_concat_path(["pools", Id, "buckets"],
+                                        [{"v", BucketsVer},
+                                         {"uuid", UUID}])},
+                  {terseBucketsBase, <<"/pools/default/b/">>},
+                  {terseStreamingBucketsBase, <<"/pools/default/bs/">>}]}},
+      {bucketNames, [{struct, [{bucketName, list_to_binary(BucketName)},
+                               {uuid, BucketUUID}]}
+                     || {BucketName, BucketUUID} <- Buckets]}].
 
 build_controller(Name, UUID) ->
     build_controller(Name, atom_to_list(Name), UUID).
@@ -346,7 +361,7 @@ build_one_alert({_Key, Msg, Time}) ->
 handle_pool_info_streaming(Id, Req) ->
     LocalAddr = local_addr(Req),
     F = fun(Stability, UpdateID) ->
-                build_pool_info(Id, Req, normal, Stability, LocalAddr, UpdateID)
+                pool_info(Id, Req, normal, Stability, LocalAddr, UpdateID)
         end,
     handle_streaming(F, Req).
 

src/ns_bucket.erl

@@ -42,6 +42,7 @@
          get_bucket_names_of_type/2,
          get_buckets/0,
          get_buckets/1,
+         uuids/1,
          is_persistent/1,
          is_ephemeral_bucket/1,
          is_valid_bucket_name/1,
@@ -825,6 +826,11 @@ bucket_uuid(Name, BucketConfigs) ->
     {ok, BucketConfig} = get_bucket_from_configs(Name, BucketConfigs),
     bucket_uuid(BucketConfig).
 
+uuids(Config) ->
+    BucketConfigs = get_buckets(Config),
+    [{Name, bucket_uuid(Name, BucketConfigs)}
+     || Name <- get_bucket_names(BucketConfigs)].
+
 filter_out_unknown_buckets(BucketsWithUUIDs, BucketConfigs) ->
     lists:filter(fun ({Name, UUID}) ->
                          case get_bucket_from_configs(Name, BucketConfigs) of