Trigger 404 referencing missing vhost

Issue #10901

Author: LoisSotoLopez

deps/rabbitmq_management/src/rabbit_mgmt_util.erl

@@ -10,7 +10,7 @@
 %% TODO sort all this out; maybe there's scope for rabbit_mgmt_request?
 
 -export([is_authorized/2, is_authorized_admin/2, is_authorized_admin/4,
-         is_authorized_admin/3, vhost/1, vhost_or_bad_request/2, vhost_from_headers/1]).
+         is_authorized_admin/3, vhost/1, vhost_from_headers/1]).
 -export([is_authorized_vhost/2, is_authorized_user/3,
          is_authorized_user/4, is_authorized_user/5,
          is_authorized_monitor/2, is_authorized_policies/2,
@@ -210,14 +210,6 @@ vhost_from_headers(ReqData) ->
 vhost(ReqData) ->
     rabbit_web_dispatch_access_control:vhost(ReqData).
 
-vhost_or_bad_request(ReqData, Context) ->
-    case rabbit_web_dispatch_access_control:vhost(ReqData) of
-        not_found -> 
-            bad_request(rabbit_data_coercion:to_binary("vhost_not_found"),
-                      ReqData, Context);
-        VHost -> VHost
-    end.
-
 user(ReqData) ->
   case id(user, ReqData) of
     none     -> not_found;
@@ -831,18 +823,23 @@ direct_request(MethodName, Transformers, Extra, ErrorMsg, ReqData,
       end, ReqData, Context).
 
 with_vhost_and_props(Fun, ReqData, Context) ->
-    VHost = vhost_or_bad_request(ReqData, Context),
-    {ok, Body, ReqData1} = read_complete_body(ReqData),
-    case decode(Body) of
-        {ok, Props} ->
-            try
-                Fun(VHost, Props, ReqData1)
-            catch {error, Error} ->
-                    bad_request(Error, ReqData1, Context)
-            end;
-        {error, Reason} ->
-            bad_request(rabbit_mgmt_format:escape_html_tags(Reason),
-                        ReqData1, Context)
+    case vhost(ReqData) of
+        not_found ->
+            not_found(rabbit_data_coercion:to_binary("vhost_not_found"),
+                      ReqData, Context);
+        VHost ->
+            {ok, Body, ReqData1} = read_complete_body(ReqData),
+            case decode(Body) of
+                {ok, Props} ->
+                    try
+                        Fun(VHost, Props, ReqData1)
+                    catch {error, Error} ->
+                            bad_request(Error, ReqData1, Context)
+                    end;
+                {error, Reason} ->
+                    bad_request(rabbit_mgmt_format:escape_html_tags(Reason),
+                                ReqData1, Context)
+            end
     end.
 
 props_to_method(MethodName, Props, Transformers, Extra) when Props =:= null orelse

deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl

@@ -37,9 +37,12 @@ allowed_methods(ReqData, Context) ->
     {[<<"HEAD">>, <<"GET">>, <<"POST">>, <<"OPTIONS">>], ReqData, Context}.
 
 to_json(ReqData, Context) ->
-    case rabbit_mgmt_util:vhost_or_bad_request(ReqData, Context) of
+    case rabbit_mgmt_util:vhost(ReqData) of
         none ->
             all_definitions(ReqData, Context);
+        not_found ->
+            rabbit_mgmt_util:bad_request(rabbit_data_coercion:to_binary("vhost_not_found"),
+                                         ReqData, Context);
         VHost ->
             vhost_definitions(ReqData, VHost, Context)
     end.

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]).
@@ -35,14 +35,20 @@ resource_exists(ReqData, Context) ->
          _         -> true
      end, ReqData, Context}.
 
+allow_missing_post(ReqData, Context) ->
+    rabbit_mgmt_util:not_found(
+        rabbit_data_coercion:to_binary("vhost_not_found"),
+        ReqData,
+        Context).
+
 content_types_accepted(ReqData, Context) ->
    {[{'*', accept_content}], ReqData, Context}.
 
 accept_content(ReqData, Context) ->
     rabbit_mgmt_util:post_respond(do_it(ReqData, Context)).
 
 do_it(ReqData0, Context) ->
-    VHost = rabbit_mgmt_util:vhost_or_bad_request(ReqData0, Context),
+    VHost = rabbit_mgmt_util:vhost(ReqData0),
     X = rabbit_mgmt_util:id(exchange, ReqData0),
     rabbit_mgmt_util:with_decode(
       [routing_key, properties, payload, payload_encoding], ReqData0, Context,

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]).
 
@@ -32,14 +32,20 @@ resource_exists(ReqData, Context) ->
          _         -> true
      end, ReqData, Context}.
 
+allow_missing_post(ReqData, Context) ->
+    rabbit_mgmt_util:not_found(
+        rabbit_data_coercion:to_binary("vhost_not_found"),
+        ReqData,
+        Context).
+
 content_types_accepted(ReqData, Context) ->
    {[{'*', accept_content}], ReqData, Context}.
 
 accept_content(ReqData, Context) ->
     rabbit_mgmt_util:post_respond(do_it(ReqData, Context)).
 
 do_it(ReqData0, Context) ->
-    VHost = rabbit_mgmt_util:vhost_or_bad_request(ReqData0, Context),
+    VHost = rabbit_mgmt_util:vhost(ReqData0),
     QName = rabbit_mgmt_util:id(queue, ReqData0),
     rabbit_mgmt_util:with_decode(
       [action], ReqData0, Context,

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]).
@@ -35,14 +35,20 @@ resource_exists(ReqData, Context) ->
          _         -> true
      end, ReqData, Context}.
 
+allow_missing_post(ReqData, Context) ->
+     rabbit_mgmt_util:not_found(
+       rabbit_data_coercion:to_binary("vhost_not_found"),
+       ReqData,
+       Context).
+
 content_types_accepted(ReqData, Context) ->
    {[{'*', accept_content}], ReqData, Context}.
 
 accept_content(ReqData, Context) ->
     rabbit_mgmt_util:post_respond(do_it(ReqData, Context)).
 
 do_it(ReqData0, Context) ->
-    VHost = rabbit_mgmt_util:vhost_or_bad_request(ReqData0, Context),
+    VHost = rabbit_mgmt_util:vhost(ReqData0),
     Q = rabbit_mgmt_util:id(queue, ReqData0),
     rabbit_mgmt_util:with_decode(
       [ackmode, count, encoding], ReqData0, Context,