Merge pull request #10908 from cloudamqp/fix/10901-unhandled-function-clause-on-nonexistent-virtual-host

Handle non-existent virtual host in several HTTP API endpoints

Author: michaelklishin

deps/rabbitmq_management/src/rabbit_mgmt_wm_exchange_publish.erl

@@ -7,7 +7,7 @@
 
 -module(rabbit_mgmt_wm_exchange_publish).
 
--export([init/2, resource_exists/2, is_authorized/2,
+-export([init/2, resource_exists/2, allow_missing_post/2, is_authorized/2,
          allowed_methods/2,  content_types_provided/2, accept_content/2,
          content_types_accepted/2]).
 -export([variances/2]).
@@ -31,10 +31,13 @@ content_types_provided(ReqData, Context) ->
 
 resource_exists(ReqData, Context) ->
     {case rabbit_mgmt_wm_exchange:exchange(ReqData) of
-         not_found -> false;
+         not_found -> raise_not_found(ReqData, Context);
          _         -> true
      end, ReqData, Context}.
 
+allow_missing_post(ReqData, Context) ->
+    {false, ReqData, Context}.
+
 content_types_accepted(ReqData, Context) ->
    {[{'*', accept_content}], ReqData, Context}.
 
@@ -101,6 +104,18 @@ bad({{coordinator_unavailable, _}, _}, ReqData, Context) ->
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).
 
+raise_not_found(ReqData, Context) ->
+    ErrorMessage = case rabbit_mgmt_util:vhost(ReqData) of
+        not_found -> 
+            "vhost_not_found";
+        _ ->
+            "exchange_not_found"
+    end,
+    rabbit_mgmt_util:not_found(
+        rabbit_data_coercion:to_binary(ErrorMessage),
+        ReqData,
+        Context).
+
 %%--------------------------------------------------------------------
 
 decode(Payload, <<"string">>) -> Payload;

deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_actions.erl

@@ -7,7 +7,7 @@
 
 -module(rabbit_mgmt_wm_queue_actions).
 
--export([init/2, resource_exists/2, is_authorized/2,
+-export([init/2, resource_exists/2, is_authorized/2, allow_missing_post/2,
          allowed_methods/2, content_types_accepted/2, accept_content/2]).
 -export([variances/2]).
 
@@ -28,10 +28,13 @@ allowed_methods(ReqData, Context) ->
 
 resource_exists(ReqData, Context) ->
     {case rabbit_mgmt_wm_queue:queue(ReqData) of
-         not_found -> false;
+         not_found -> raise_not_found(ReqData, Context);
          _         -> true
      end, ReqData, Context}.
 
+allow_missing_post(ReqData, Context) ->
+    {false, ReqData, Context}.
+
 content_types_accepted(ReqData, Context) ->
    {[{'*', accept_content}], ReqData, Context}.
 
@@ -52,6 +55,17 @@ do_it(ReqData0, Context) ->
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized_admin(ReqData, Context).
 
+raise_not_found(ReqData, Context) ->
+    ErrorMessage = case rabbit_mgmt_util:vhost(ReqData) of
+        not_found -> 
+            "vhost_not_found";
+        _ ->
+            "queue_not_found"
+    end,
+    rabbit_mgmt_util:not_found(
+        rabbit_data_coercion:to_binary(ErrorMessage),
+        ReqData,
+        Context).
 %%--------------------------------------------------------------------
 
 action(<<"sync">>, Q, ReqData, Context) when ?is_amqqueue(Q) ->

deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_get.erl

@@ -7,7 +7,7 @@
 
 -module(rabbit_mgmt_wm_queue_get).
 
--export([init/2, resource_exists/2, is_authorized/2,
+-export([init/2, resource_exists/2, is_authorized/2, allow_missing_post/2,
   allowed_methods/2, accept_content/2, content_types_provided/2,
   content_types_accepted/2]).
 -export([variances/2]).
@@ -31,10 +31,13 @@ content_types_provided(ReqData, Context) ->
 
 resource_exists(ReqData, Context) ->
     {case rabbit_mgmt_wm_queue:queue(ReqData) of
-         not_found -> false;
+         not_found -> raise_not_found(ReqData, Context);
          _         -> true
      end, ReqData, Context}.
 
+allow_missing_post(ReqData, Context) ->
+    {false, ReqData, Context}.
+
 content_types_accepted(ReqData, Context) ->
    {[{'*', accept_content}], ReqData, Context}.
 
@@ -149,6 +152,17 @@ basic_get(Ch, Q, AckMode, Enc, Trunc) ->
 is_authorized(ReqData, Context) ->
     rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).
 
+raise_not_found(ReqData, Context) ->
+    ErrorMessage = case rabbit_mgmt_util:vhost(ReqData) of
+        not_found -> 
+            "vhost_not_found";
+        _ ->
+            "queue_not_found"
+    end,
+    rabbit_mgmt_util:not_found(
+        rabbit_data_coercion:to_binary(ErrorMessage),
+        ReqData,
+        Context).
 %%--------------------------------------------------------------------
 
 maybe_truncate(Payload, none)                         -> Payload;