File 0003-Strip-off-pids-and-format-consumer-details-for-2-end.patch of Package rabbitmq-server

From 97d6c8b0f0130dee8fbed392e755927b27e4ffd9 Mon Sep 17 00:00:00 2001
From: Michael Klishin <michael@clojurewerkz.org>
Date: Thu, 23 Mar 2017 17:18:06 +0300
Subject: [PATCH 3/4] Strip off pids and format consumer details for 2
 endpoints

References rabbitmq/rabbitmq-management-agent#39.
---
 src/rabbit_mgmt_wm_channel.erl |  4 +++-
 src/rabbit_mgmt_wm_queue.erl   | 12 +++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/rabbit_mgmt_wm_channel.erl b/src/rabbit_mgmt_wm_channel.erl
index 67e584f2..c7e988ec 100644
--- a/src/rabbit_mgmt_wm_channel.erl
+++ b/src/rabbit_mgmt_wm_channel.erl
@@ -37,8 +37,10 @@ resource_exists(ReqData, Context) ->
     end.
 
 to_json(ReqData, Context) ->
+    Payload = rabbit_mgmt_format:clean_consumer_details(
+                rabbit_mgmt_format:strip_pids(channel(ReqData))),
     rabbit_mgmt_util:reply(
-      {struct, rabbit_mgmt_format:strip_pids(channel(ReqData))},
+      {struct, Payload},
       ReqData, Context).
 
 is_authorized(ReqData, Context) ->
diff --git a/src/rabbit_mgmt_wm_queue.erl b/src/rabbit_mgmt_wm_queue.erl
index 4c5a5a8e..ce4cc2ec 100644
--- a/src/rabbit_mgmt_wm_queue.erl
+++ b/src/rabbit_mgmt_wm_queue.erl
@@ -44,9 +44,15 @@ resource_exists(ReqData, Context) ->
      end, ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    [Q] = rabbit_mgmt_db:augment_queues(
-            [queue(ReqData)], rabbit_mgmt_util:range_ceil(ReqData), full),
-    rabbit_mgmt_util:reply(rabbit_mgmt_format:strip_pids(Q), ReqData, Context).
+    try
+        [Q] = rabbit_mgmt_db:augment_queues(
+                        [queue(ReqData)], rabbit_mgmt_util:range_ceil(ReqData), full),
+        Payload = rabbit_mgmt_format:clean_consumer_details(rabbit_mgmt_format:strip_pids(Q)),
+        rabbit_mgmt_util:reply(Payload, ReqData, Context)
+    catch
+        {error, invalid_range_parameters, Reason} ->
+            rabbit_mgmt_util:bad_request(iolist_to_binary(Reason), ReqData, Context)
+    end.
 
 accept_content(ReqData, Context) ->
    rabbit_mgmt_util:http_to_amqp(
-- 
2.27.0