mod_admin_telnet: Don't rely on getpeerchain returning an empty list

[prosody.git] / plugins / mod_iq.lua

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index 256a9419652c92e69c0c1f4ca189379430f94b74..e7901ab451c1014a73dee303d870b4ad4b9318a2 100644 (file)
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -8,69 +8,69 @@
 
 
 local st = require "util.stanza";
-local jid_split = require "util.jid".split;
 
-local full_sessions = full_sessions;
-local bare_sessions = bare_sessions;
+local full_sessions = prosody.full_sessions;
 
-module:hook("iq/full", function(data)
-       -- IQ to full JID recieved
-       local origin, stanza = data.origin, data.stanza;
+if module:get_host_type() == "local" then
+       module:hook("iq/full", function(data)
+               -- IQ to full JID recieved
+               local origin, stanza = data.origin, data.stanza;
 
-       local session = full_sessions[stanza.attr.to];
-       if session then
-               -- TODO fire post processing event
-               session.send(stanza);
-       else -- resource not online
-               if stanza.attr.type == "get" or stanza.attr.type == "set" then
-                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+               local session = full_sessions[stanza.attr.to];
+               if not (session and session.send(stanza)) then
+                       if stanza.attr.type == "get" or stanza.attr.type == "set" then
+                               origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+                       end
                end
-       end
-       return true;
-end);
+               return true;
+       end);
+end
 
 module:hook("iq/bare", function(data)
        -- IQ to bare JID recieved
-       local origin, stanza = data.origin, data.stanza;
+       local stanza = data.stanza;
        local type = stanza.attr.type;
 
        -- TODO fire post processing events
        if type == "get" or type == "set" then
-               local ret = module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+               local child = stanza.tags[1];
+               local xmlns = child.attr.xmlns or "jabber:client";
+               local ret = module:fire_event("iq/bare/"..xmlns..":"..child.name, data);
                if ret ~= nil then return ret; end
-               return module:fire_event("iq-"..type.."/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+               return module:fire_event("iq-"..type.."/bare/"..xmlns..":"..child.name, data);
        else
-               module:fire_event("iq-"..type.."/bare/"..stanza.attr.id, data);
-               return true;
+               return module:fire_event("iq-"..type.."/bare/"..stanza.attr.id, data);
        end
 end);
 
 module:hook("iq/self", function(data)
        -- IQ to self JID recieved
-       local origin, stanza = data.origin, data.stanza;
+       local stanza = data.stanza;
        local type = stanza.attr.type;
 
        if type == "get" or type == "set" then
-               local ret = module:fire_event("iq/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+               local child = stanza.tags[1];
+               local xmlns = child.attr.xmlns or "jabber:client";
+               local ret = module:fire_event("iq/self/"..xmlns..":"..child.name, data);
                if ret ~= nil then return ret; end
-               return module:fire_event("iq-"..type.."/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+               return module:fire_event("iq-"..type.."/self/"..xmlns..":"..child.name, data);
        else
-               module:fire_event("iq-"..type.."/self/"..stanza.attr.id, data);
-               return true;
+               return module:fire_event("iq-"..type.."/self/"..stanza.attr.id, data);
        end
 end);
 
 module:hook("iq/host", function(data)
        -- IQ to a local host recieved
-       local origin, stanza = data.origin, data.stanza;
+       local stanza = data.stanza;
        local type = stanza.attr.type;
 
        if type == "get" or type == "set" then
-               local ret = module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+               local child = stanza.tags[1];
+               local xmlns = child.attr.xmlns or "jabber:client";
+               local ret = module:fire_event("iq/host/"..xmlns..":"..child.name, data);
                if ret ~= nil then return ret; end
-               return module:fire_event("iq-"..type.."/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+               return module:fire_event("iq-"..type.."/host/"..xmlns..":"..child.name, data);
        else
-               module:fire_event("iq-"..type.."/host/"..stanza.attr.id, data);
-               return true;
+               return module:fire_event("iq-"..type.."/host/"..stanza.attr.id, data);
        end
 end);