Reply with error iq when receiving IQ with unknown id format in ejabberd_local

Author: arcusfelis

big_tests/tests/local_iq_SUITE.erl

@@ -19,7 +19,8 @@ groups() ->
 
 cases() ->
     [process_iq_works_across_multiple_nodes,
-     process_iq_timeout].
+     process_iq_timeout,
+     send_unexpected_result_iq].
 
 %%--------------------------------------------------------------------
 %% Init & teardown
@@ -77,6 +78,19 @@ process_iq_timeout(Config) ->
         end,
     escalus:fresh_story(Config, [{alice, 1}], F).
 
+
+send_unexpected_result_iq(Config) ->
+    F = fun(Alice) ->
+          Jid = escalus_client:full_jid(Alice),
+          Server = escalus_client:server(Alice),
+          Request = unexpected_result_iq(Server),
+          escalus_client:send(Alice, Request),
+          Stanza = escalus:wait_for_stanza(Alice),
+          escalus:assert(is_iq_error, [Request], Stanza),
+          escalus:assert(is_error, [<<"cancel">>, <<"service-unavailable">>], Stanza)
+        end,
+    escalus:fresh_story(Config, [{alice, 1}], F).
+
 %%--------------------------------------------------------------------
 %% Helpers
 %%--------------------------------------------------------------------
@@ -100,3 +114,10 @@ route_iq(Alice, Timeout) ->
                        Self ! {result, CbFrom, CbTo, CbAcc, CbIQ}, CbAcc end,
     Args = [From, To, Acc, IQ, Callback, Timeout],
     rpc(mim2(), ejabberd_local, route_iq, Args).
+
+
+unexpected_result_iq(To) ->
+    #xmlel{name = <<"iq">>,
+           attrs = #{<<"id">> => <<"unexp3443">>, <<"type">> => <<"result">>,
+                     <<"to">> => To},
+           children = []}.

src/ejabberd_local.erl

@@ -127,11 +127,16 @@ process_iq(_, Acc, From, To, El) ->
                        To :: jid:jid(),
                        Acc :: mongoose_acc:t(),
                        IQ :: jlib:iq()) -> mongoose_acc:t().
-process_iq_reply(From, To, Acc, #iq{id = ID} = IQ) ->
+process_iq_reply(From, To, Acc, #iq{type = Type, id = ID} = IQ) ->
     case get_iq_callback_in_cluster(ID, Acc) of
         {ok, Callback} ->
             Callback(From, To, Acc, IQ);
-        _ ->
+        _ when Type =:= result ->
+            ejabberd_router:route_error_reply(To, From, Acc,
+                mongoose_xmpp_errors:service_unavailable(<<"en">>, <<"Unexpected IQ with this ID">>));
+        _ when Type =:= error ->
+            %% Do not reply on errors to avoid loops
+            ?LOG_INFO(#{what => client_sends_error_iq, acc => Acc}),
             Acc
     end.
 
@@ -145,7 +150,7 @@ get_iq_callback_in_cluster(ID, Acc) ->
         {remote_node, NodeName} ->
             rpc:call(NodeName, ?MODULE, get_iq_callback, [ID]);
         {error, Reason} ->
-            ?LOG_ERROR(#{what => parse_iq_id_failed,
+            ?LOG_DEBUG(#{what => parse_iq_id_failed,
                          reason => Reason, acc => Acc}),
             {error, Reason}
     end.