Merge bug25466

deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl

@@ -443,7 +443,17 @@ with_destination(Command, Frame, State, Fun) ->
         {ok, DestHdr} ->
             case rabbit_routing_util:parse_endpoint(DestHdr) of
                 {ok, Destination} ->
-                    Fun(Destination, DestHdr, Frame, State);
+                    case Fun(Destination, DestHdr, Frame, State) of
+                        {error, invalid_endpoint} ->
+                            error("Invalid destination",
+                                  "'~s' is not a valid destination for '~s'~n",
+                                  [DestHdr, Command],
+                                  State);
+                        {error, Reason} ->
+                            throw(Reason);
+                        Result ->
+                            Result
+                    end;
                 {error, {invalid_destination, Type, Content}} ->
                     error("Invalid destination",
                           "'~s' is not a valid ~p destination~n",
@@ -540,14 +550,11 @@ do_subscribe(Destination, DestHdr, Frame,
                                                      global         = false}),
                       Channel1
               end,
-
     {AckMode, IsMulti} = rabbit_stomp_util:ack_mode(Frame),
-
+    case ensure_endpoint(source, Destination, Frame, Channel, RouteState) of
-    {ok, Queue, RouteState1} =
+        {ok, Queue, RouteState1} ->
-      ensure_endpoint(source, Destination, Frame, Channel, RouteState),
+            {ok, ConsumerTag, Description} =
-
+                rabbit_stomp_util:consumer_tag(Frame),
-    {ok, ConsumerTag, Description} = rabbit_stomp_util:consumer_tag(Frame),
-
             amqp_channel:subscribe(Channel,
                                    #'basic.consume'{
                                      queue        = Queue,
@@ -557,23 +564,29 @@ do_subscribe(Destination, DestHdr, Frame,
                                      exclusive    = false},
                                    self()),
             ExchangeAndKey = rabbit_routing_util:parse_routing(Destination),
-    ok = rabbit_routing_util:ensure_binding(Queue, ExchangeAndKey, Channel),
+            ok = rabbit_routing_util:ensure_binding(
-
+                   Queue, ExchangeAndKey, Channel),
             ok(State#state{subscriptions =
-                       dict:store(ConsumerTag,
+                               dict:store(
+                                 ConsumerTag,
                                  #subscription{dest_hdr    = DestHdr,
                                                channel     = Channel,
                                                ack_mode    = AckMode,
                                                multi_ack   = IsMulti,
                                                description = Description},
                                  Subs),
-                   route_state = RouteState1}).
+                           route_state = RouteState1});
+        {error, _} = Err ->
+            Err
+    end.
 
 do_send(Destination, _DestHdr,
         Frame = #stomp_frame{body_iolist = BodyFragments},
         State = #state{channel = Channel, route_state = RouteState}) ->
-    {ok, _Q, RouteState1} = ensure_endpoint(dest, Destination, Frame, Channel,
+
-                                            RouteState),
+    case ensure_endpoint(dest, Destination, Frame, Channel, RouteState) of
+
+        {ok, _Q, RouteState1} ->
 
             {Frame1, State1} =
                 ensure_reply_to(Frame, State#state{route_state = RouteState1}),
@@ -591,7 +604,8 @@ do_send(Destination, _DestHdr,
 
             case transactional(Frame1) of
                 {yes, Transaction} ->
-            extend_transaction(Transaction,
+                    extend_transaction(
+                      Transaction,
                       fun(StateN) ->
                               maybe_record_receipt(Frame1, StateN)
                       end,
@@ -600,6 +614,11 @@ do_send(Destination, _DestHdr,
                 no ->
                     ok(send_method(Method, Props, BodyFragments,
                                    maybe_record_receipt(Frame1, State1)))
+            end;
+
+        {error, _} = Err ->
+
+            Err
     end.
 
 create_ack_method(DeliveryTag, #subscription{multi_ack = IsMulti}) ->

deps/rabbitmq_stomp/test/src/rabbit_stomp_amqqueue_test.erl

@@ -35,7 +35,8 @@ all_tests() ->
                      fun test_subscribe_ack/3,
                      fun test_send/3,
                      fun test_delete_queue_subscribe/3,
-                     fun test_temp_destination_queue/3]]
+                     fun test_temp_destination_queue/3,
+                     fun test_temp_destination_in_send/3]]
      || Version <- ?SUPPORTED_VERSIONS],
     ok.
 
@@ -200,6 +201,13 @@ test_temp_destination_queue(Channel, Client, _Version) ->
     {ok, _Client1, _, [<<"pong">>]} = stomp_receive(Client, "MESSAGE"),
     ok.
 
+test_temp_destination_in_send(Channel, Client, _Version) ->
+    rabbit_stomp_client:send( Client, "SEND", [{"destination", "/temp-queue/foo"}],
+                                              ["poing"]),
+    {ok, _Client1, Hdrs, _} = stomp_receive(Client, "ERROR"),
+    "Invalid destination" = proplists:get_value("message", Hdrs),
+    ok.
+
 stomp_receive(Client, Command) ->
     {#stomp_frame{command     = Command,
                   headers     = Hdrs,