modulemanager: Added module.path to the plugin API to let plugins determine their...

[prosody.git] / core / stanza_router.lua

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index e261076957f27307ce7d5bf409d085cf33299d5a..406ad2f04d1c61fcb340a0e7dacff77ee6ae4968 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -12,7 +12,6 @@ local hosts = _G.prosody.hosts;
 local tostring = tostring;
 local st = require "util.stanza";
 local send_s2s = require "core.s2smanager".send_to_host;
-local component_handle_stanza = require "core.componentmanager".handle_stanza;
 local jid_split = require "util.jid".split;
 local jid_prepped_split = require "util.jid".prepped_split;
 
@@ -41,6 +40,7 @@ local function handle_unhandled_stanza(host, origin, stanza)
        end
 end
 
+local iq_types = { set=true, get=true, result=true, error=true };
 function core_process_stanza(origin, stanza)
        (origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
 
@@ -48,8 +48,8 @@ function core_process_stanza(origin, stanza)
        if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
        if stanza.name == "iq" then
                if not stanza.attr.id then stanza.attr.id = ""; end -- COMPAT Jabiru doesn't send the id attribute on roster requests
-               if (stanza.attr.type == "set" or stanza.attr.type == "get") and (#stanza.tags ~= 1) then
-                       origin.send(st.error_reply(stanza, "modify", "bad-request"));
+               if not iq_types[stanza.attr.type] or ((stanza.attr.type == "set" or stanza.attr.type == "get") and (#stanza.tags ~= 1)) then
+                       origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid IQ type or incorrect number of children"));
                        return;
                end
        end
@@ -172,11 +172,6 @@ function core_post_stanza(origin, stanza, preevents)
        if h then
                if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing
                if to_self and h.events.fire_event(stanza.name..'/self', event_data) then return; end -- do processing
-
-               if h.type == "component" then
-                       component_handle_stanza(origin, stanza);
-                       return;
-               end
                handle_unhandled_stanza(h.host, origin, stanza);
        else
                core_route_stanza(origin, stanza);