Forced merge.
[prosody.git] / core / stanza_router.lua
index 68a71d3b16d7c07d82bf82295e55231cc050d6af..308ae2f4be0f6350c92c00b0c0befe285adb7f71 100644 (file)
@@ -1,10 +1,4 @@
 
--- The code in this file should be self-explanatory, though the logic is horrible
--- for more info on that, see doc/stanza_routing.txt, which attempts to condense
--- the rules from the RFCs (mainly 3921)
-
-require "core.servermanager"
-
 local log = require "util.logger".init("stanzarouter")
 
 local st = require "util.stanza";
@@ -13,6 +7,7 @@ local user_exists = require "core.usermanager".user_exists;
 
 local rostermanager = require "core.rostermanager";
 local sessionmanager = require "core.sessionmanager";
+local offlinemanager = require "core.offlinemanager";
 
 local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
 local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
@@ -20,6 +15,9 @@ local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
 local modules_handle_stanza = require "core.modulemanager".handle_stanza;
 local component_handle_stanza = require "core.componentmanager".handle_stanza;
 
+local handle_outbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes;
+local handle_inbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes;
+
 local format = string.format;
 local tostring = tostring;
 local t_concat = table.concat;
@@ -31,8 +29,9 @@ local jid_split = require "util.jid".split;
 local print = print;
 
 function core_process_stanza(origin, stanza)
-       log("debug", "Received["..origin.type.."]: "..tostring(stanza))
+       (origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:pretty_print()) --top_tag())
 
+       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
@@ -48,7 +47,7 @@ function core_process_stanza(origin, stanza)
                error("Client MUST bind resource after auth");
        end
 
-       -- TODO also, stazas should be returned to their original state before the function ends
+       -- TODO also, stanzas should be returned to their original state before the function ends
        if origin.type == "c2s" then
                stanza.attr.from = origin.full_jid;
        end
@@ -71,26 +70,28 @@ function core_process_stanza(origin, stanza)
        end]] -- FIXME
 
        -- FIXME do stanzas not of jabber:client get handled by components?
-       if not to then
-               core_handle_stanza(origin, stanza);
-       elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server
-               core_handle_stanza(origin, stanza);
-       elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then
-               modules_handle_stanza(origin, stanza);
-       elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server
-               component_handle_stanza(origin, stanza);
-       elseif hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource
-               component_handle_stanza(origin, stanza);
-       elseif 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
-               handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
-       elseif stanza.name == "iq" and not resource then -- directed at bare JID
-               core_handle_stanza(origin, stanza);
-       elseif origin.type == "c2s" or origin.type == "s2sin" then
-               core_route_stanza(origin, stanza);
+       if origin.type == "s2sin" or origin.type == "c2s" then
+               if not to then
+                       core_handle_stanza(origin, stanza);
+               elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server
+                       core_handle_stanza(origin, stanza);
+               elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then
+                       modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza);
+               elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server
+                       component_handle_stanza(origin, stanza);
+               elseif hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource
+                       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
+                       handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
+               elseif origin.type ~= "c2s" and stanza.name == "iq" and not resource then -- directed at bare JID
+                       core_handle_stanza(origin, stanza);
+               else
+                       core_route_stanza(origin, stanza);
+               end
        else
-               log("warn", "stanza not processed");
+               core_handle_stanza(origin, stanza);
        end
 end
 
@@ -98,7 +99,7 @@ end
 -- that is, they are handled by this server
 function core_handle_stanza(origin, stanza)
        -- Handlers
-       if modules_handle_stanza(origin, stanza) then return; end
+       if modules_handle_stanza(stanza.attr.to or origin.host, origin, stanza) then return; end
        if origin.type == "c2s" or origin.type == "c2s_unauthed" then
                local session = origin;
 
@@ -146,6 +147,10 @@ function core_handle_stanza(origin, stanza)
                                                        core_route_stanza(origin, request);
                                                end
                                        end
+                                       for _, msg in ipairs(offlinemanager.load(node, host) or {}) do
+                                               origin.send(msg); -- FIXME do we need to modify to/from in any way?
+                                       end
+                                       offlinemanager.deleteAll(node, host);
                                end
                                origin.priority = 0;
                                if stanza.attr.type == "unavailable" then
@@ -165,119 +170,24 @@ function core_handle_stanza(origin, stanza)
                                end
                                stanza.attr.to = nil; -- reset it
                        else
-                               -- TODO error, bad type
-                       end
-               end -- TODO handle other stanzas
-       else
-               log("warn", "Unhandled origin: %s", origin.type); -- FIXME reply with error
-       end
-end
-
-function send_presence_of_available_resources(user, host, jid, recipient_session)
-       local h = hosts[host];
-       local count = 0;
-       if h and h.type == "local" then
-               local u = h.sessions[user];
-               if u then
-                       for k, session in pairs(u.sessions) do
-                               local pres = session.presence;
-                               if pres then
-                                       pres.attr.to = jid;
-                                       pres.attr.from = session.full_jid;
-                                       recipient_session.send(pres);
-                                       pres.attr.to = nil;
-                                       pres.attr.from = nil;
-                                       count = count + 1;
+                               log("warn", "Unhandled c2s presence: %s", tostring(stanza));
+                               if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" then
+                                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
                                end
                        end
-               end
-       end
-       return count;
-end
-
-function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
-       local node, host = jid_split(from_bare);
-       local st_from, st_to = stanza.attr.from, stanza.attr.to;
-       stanza.attr.from, stanza.attr.to = from_bare, to_bare;
-       if stanza.attr.type == "subscribe" then
-               log("debug", "outbound subscribe from "..from_bare.." for "..to_bare);
-               -- 1. route stanza
-               -- 2. roster push (subscription = none, ask = subscribe)
-               if rostermanager.set_contact_pending_out(node, host, to_bare) then
-                       rostermanager.roster_push(node, host, to_bare);
-               end -- else file error
-               core_route_stanza(origin, stanza);
-       elseif stanza.attr.type == "unsubscribe" then
-               log("debug", "outbound unsubscribe from "..from_bare.." for "..to_bare);
-               -- 1. route stanza
-               -- 2. roster push (subscription = none or from)
-               if rostermanager.unsubscribe(node, host, to_bare) then
-                       rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed?
-               end -- else file error
-               core_route_stanza(origin, stanza);
-       elseif stanza.attr.type == "subscribed" then
-               log("debug", "outbound subscribed from "..from_bare.." for "..to_bare);
-               -- 1. route stanza
-               -- 2. roster_push ()
-               -- 3. send_presence_of_available_resources
-               if rostermanager.subscribed(node, host, to_bare) then
-                       rostermanager.roster_push(node, host, to_bare);
-                       core_route_stanza(origin, stanza);
-                       send_presence_of_available_resources(node, host, to_bare, origin);
-               end
-       elseif stanza.attr.type == "unsubscribed" then
-               log("debug", "outbound unsubscribed from "..from_bare.." for "..to_bare);
-               -- 1. route stanza
-               -- 2. roster push (subscription = none or to)
-               if rostermanager.unsubscribed(node, host, to_bare) then
-                       rostermanager.roster_push(node, host, to_bare);
-                       core_route_stanza(origin, stanza);
-               end
-       end
-       stanza.attr.from, stanza.attr.to = st_from, st_to;
-end
-
-function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
-       local node, host = jid_split(to_bare);
-       local st_from, st_to = stanza.attr.from, stanza.attr.to;
-       stanza.attr.from, stanza.attr.to = from_bare, to_bare;
-       if stanza.attr.type == "probe" then
-               log("debug", "inbound probe from "..from_bare.." for "..to_bare);
-               if rostermanager.is_contact_subscribed(node, host, from_bare) then
-                       if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then
-                               -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
-                       end
                else
-                       core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
-               end
-       elseif stanza.attr.type == "subscribe" then
-               log("debug", "inbound subscribe from "..from_bare.." for "..to_bare);
-               if rostermanager.is_contact_subscribed(node, host, from_bare) then
-                       core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed
-               else
-                       if not rostermanager.is_contact_pending_in(node, host, from_bare) then
-                               if rostermanager.set_contact_pending_in(node, host, from_bare) then
-                                       sessionmanager.send_to_available_resources(node, host, stanza);
-                               end -- TODO else return error, unable to save
+                       log("warn", "Unhandled c2s stanza: %s", tostring(stanza));
+                       if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
+                               origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
                        end
+               end -- TODO handle other stanzas
+       else
+               log("warn", "Unhandled origin: %s", origin.type);
+               if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
+                       -- s2s stanzas can get here
+                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
                end
-       elseif stanza.attr.type == "unsubscribe" then
-               log("debug", "inbound unsubscribe from "..from_bare.." for "..to_bare);
-               if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
-                       rostermanager.roster_push(node, host, from_bare);
-               end
-       elseif stanza.attr.type == "subscribed" then
-               log("debug", "inbound subscribed from "..from_bare.." for "..to_bare);
-               if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
-                       rostermanager.roster_push(node, host, from_bare);
-               end
-       elseif stanza.attr.type == "unsubscribed" then
-               log("debug", "inbound unsubscribed from "..from_bare.." for "..to_bare);
-               if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
-                       rostermanager.roster_push(node, host, from_bare);
-               end
-       end -- discard any other type
-       stanza.attr.from, stanza.attr.to = st_from, st_to;
+       end
 end
 
 function core_route_stanza(origin, stanza)
@@ -292,6 +202,10 @@ function core_route_stanza(origin, stanza)
        local from_node, from_host, from_resource = jid_split(from);
        local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
 
+       -- Auto-detect origin if not specified
+       origin = origin or hosts[from_host];
+       if not origin then return false; end
+       
        if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end
 
        local host_session = hosts[host]
@@ -304,7 +218,7 @@ function core_route_stanza(origin, stanza)
                                -- 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
-                                               handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
+                                               handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
                                        else -- sender is available or unavailable
                                                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?
@@ -325,8 +239,14 @@ function core_route_stanza(origin, stanza)
                                                        t_insert(recipients, session);
                                                end
                                        end
-                                       for _, session in pairs(recipient) do
+                                       local count = 0;
+                                       for _, session in pairs(recipients) do
                                                session.send(stanza);
+                                               count = count + 1;
+                                       end
+                                       if count == 0 then
+                                               offlinemanager.store(node, host, stanza);
+                                               -- TODO deal with storage errors
                                        end
                                else
                                        -- TODO send IQ error
@@ -341,12 +261,17 @@ function core_route_stanza(origin, stanza)
                        if user_exists(node, host) then
                                if stanza.name == "presence" then
                                        if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
-                                               handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
+                                               handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
                                        else
                                                -- TODO send unavailable presence or unsubscribed
                                        end
                                elseif stanza.name == "message" then
-                                       -- TODO send message error, or store offline messages
+                                       if stanza.attr.type == "chat" or stanza.attr.type == "normal" or not stanza.attr.type then
+                                               offlinemanager.store(node, host, stanza);
+                                               -- FIXME don't store messages with only chat state notifications
+                                       end
+                                       -- TODO allow configuration of offline storage
+                                       -- TODO send error if not storing offline
                                elseif stanza.name == "iq" then
                                        -- TODO send IQ error
                                end
@@ -373,8 +298,6 @@ function core_route_stanza(origin, stanza)
        elseif origin.type == "component" or origin.type == "local" then
                -- Route via s2s for components and modules
                log("debug", "Routing outgoing stanza for %s to %s", origin.host, host);
-               for k,v in pairs(origin) do print("origin:", tostring(k), tostring(v)); end
-               print(tostring(host), tostring(from_host))
                send_s2s(origin.host, host, stanza);
        else
                log("warn", "received stanza from unhandled connection type: %s", origin.type);