Remove more debugging code which was accidentally committed (don't trust hg)

[prosody.git] / core / stanza_router.lua

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 29a4797b5bf1c16b1f504d029a061e96d1b6c7b9..08224c8ddac927cba338d73ea4b4761ae3829d3a 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM v0.4
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -51,11 +51,11 @@ function core_process_stanza(origin, stanza)
 
        if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling.
        -- TODO verify validity of stanza (as well as JID validity)
-       if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then
-               if stanza.attr.type == "set" or stanza.attr.type == "get" then
-                       error("Invalid IQ");
-               elseif #stanza.tags > 1 and not(stanza.attr.type == "error" or stanza.attr.type == "result") then
-                       error("Invalid IQ");
+       if stanza.attr.xmlns == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
+       if stanza.name == "iq" then
+               if (stanza.attr.type == "set" or stanza.attr.type == "get") and #stanza.tags ~= 1 then
+                       origin.send(st.error_reply(stanza, "modify", "bad-request"));
+                       return;
                end
        end
 
@@ -99,7 +99,7 @@ function core_process_stanza(origin, stanza)
        end]] -- FIXME
 
        -- FIXME do stanzas not of jabber:client get handled by components?
-       if (origin.type == "s2sin" or origin.type == "c2s") and (not xmlns or xmlns == "jabber:server" or xmlns == "jabber:client") then                        
+       if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and (not xmlns or xmlns == "jabber:server" or xmlns == "jabber:client") then                  
                if origin.type == "s2sin" and not origin.dummy then
                        local host_status = origin.hosts[from_host];
                        if not host_status or not host_status.authed then -- remote server trying to impersonate some other server?
@@ -124,7 +124,7 @@ function core_process_stanza(origin, stanza)
                        component_handle_stanza(origin, stanza);
                elseif hosts[host] and hosts[host].type == "component" then -- directed at a component
                        component_handle_stanza(origin, stanza);
-               elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+               elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then
                        handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
                elseif hosts[host] and hosts[host].type == "local" and stanza.name == "iq" and not resource then -- directed at bare JID
                        core_handle_stanza(origin, stanza);
@@ -144,7 +144,7 @@ function core_handle_stanza(origin, stanza)
        if origin.type == "c2s" or origin.type == "s2sin" then
                if origin.type == "c2s" then
                        if stanza.name == "presence" and origin.roster then
-                               if stanza.attr.type == nil or stanza.attr.type == "unavailable" then
+                               if stanza.attr.type == nil or stanza.attr.type == "unavailable" and stanza.attr.type ~= "error" then
                                        handle_normal_presence(origin, stanza, core_route_stanza);
                                else
                                        log("warn", "Unhandled c2s presence: %s", tostring(stanza));
@@ -188,7 +188,7 @@ function core_route_stanza(origin, stanza)
                return component_handle_stanza(origin, stanza);
        end
 
-       if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end
+       if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error") then resource = nil; end
 
        local host_session = hosts[host]
        if host_session and host_session.type == "local" then
@@ -199,9 +199,9 @@ function core_route_stanza(origin, stanza)
                        if not res then
                                -- if we get here, resource was not specified or was unavailable
                                if stanza.name == "presence" then
-                                       if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+                                       if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then
                                                handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
-                                       else -- sender is available or unavailable
+                                       elseif not resource then -- sender is available or unavailable or error
                                                for _, session in pairs(user.sessions) do -- presence broadcast to all user resources.
                                                        if session.full_jid then -- FIXME should this be just for available resources? Do we need to check subscription?
                                                                stanza.attr.to = session.full_jid; -- reset at the end of function
@@ -244,8 +244,8 @@ function core_route_stanza(origin, stanza)
                                                        -- TODO deal with storage errors
                                                end
                                        end
-                               else
-                                       -- TODO send IQ error
+                               elseif stanza.attr.type == "get" or stanza.attr.type == "set" then
+                                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
                                end
                        else
                                -- User + resource is online...
@@ -256,7 +256,7 @@ function core_route_stanza(origin, stanza)
                        -- user not online
                        if user_exists(node, host) then
                                if stanza.name == "presence" then
-                                       if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+                                       if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then
                                                handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
                                        else
                                                -- TODO send unavailable presence or unsubscribed
@@ -273,7 +273,7 @@ function core_route_stanza(origin, stanza)
                                        end
                                        -- TODO allow configuration of offline storage
                                        -- TODO send error if not storing offline
-                               elseif stanza.name == "iq" then
+                               elseif stanza.name == "iq" and (stanza.attr.type == "get" or stanza.attr.type == "set") then
                                        origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
                                end
                        else -- user does not exist
@@ -284,7 +284,7 @@ function core_route_stanza(origin, stanza)
                                                origin.send(st.presence({from = to_bare, to = from_bare, type = "unsubscribed"}));
                                        end
                                        -- else ignore
-                               else
+                               elseif stanza.attr.type ~= "error" and (stanza.name ~= "iq" or stanza.attr.type ~= "result") then
                                        origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
                                end
                        end