net.http.server: Properly handle persistent connections

[prosody.git] / plugins / mod_iq.lua

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index 0e1dadfca4413d2bd64e64c4726fcecc82a58b11..8044a533aeadec26d3d23e1d3738b16f413c8dc8 100644 (file)
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -8,71 +8,69 @@
 
 
 local st = require "util.stanza";
-local jid_split = require "util.jid".split;
-local user_exists = require "core.usermanager".user_exists;
 
 local full_sessions = full_sessions;
-local bare_sessions = bare_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;
 
-       local to = stanza.attr.to;
-       if to and not bare_sessions[to] then -- quick check for account existance
-               local node, host = jid_split(to);
-               if not user_exists(node, host) then -- full check for account existance
-                       if stanza.attr.type == "get" or stanza.attr.type == "set" then
-                               origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-                       end
-                       return true;
-               end
-       end
        -- TODO fire post processing events
-       if stanza.attr.type == "get" or stanza.attr.type == "set" then
-               return module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+       if type == "get" or type == "set" then
+               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/"..xmlns..":"..child.name, data);
        else
-               module:fire_event("iq/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 bare JID recieved
-       local origin, stanza = data.origin, data.stanza;
+       -- IQ to self JID recieved
+       local stanza = data.stanza;
+       local type = stanza.attr.type;
 
-       if stanza.attr.type == "get" or stanza.attr.type == "set" then
-               return module:fire_event("iq/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+       if type == "get" or type == "set" then
+               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/"..xmlns..":"..child.name, data);
        else
-               module:fire_event("iq/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 stanza.attr.type == "get" or stanza.attr.type == "set" then
-               return module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+       if type == "get" or type == "set" then
+               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/"..xmlns..":"..child.name, data);
        else
-               module:fire_event("iq/host/"..stanza.attr.id, data);
-               return true;
+               return module:fire_event("iq-"..type.."/host/"..stanza.attr.id, data);
        end
 end);