0.2->0.3
[prosody.git] / core / stanza_router.lua
index fe1c8754c70fd883c3889f83b7bcec777ede78df..844cbf881a9c5d53eada5d5f6f99c00145ec65fa 100644 (file)
-<<<<<<< local\r
-\r
--- The code in this file should be self-explanatory, though the logic is horrible\r
--- for more info on that, see doc/stanza_routing.txt, which attempts to condense\r
--- the rules from the RFCs (mainly 3921)\r
-\r
-require "core.servermanager"\r
-\r
-local log = require "util.logger".init("stanzarouter")\r
-\r
-local st = require "util.stanza";\r
-local send = require "core.sessionmanager".send_to_session;\r
--- local send_s2s = require "core.s2smanager".send_to_host;\r
-local user_exists = require "core.usermanager".user_exists;\r
-\r
-local jid_split = require "util.jid".split;\r
-local print, debug = print, debug;\r
-\r
-function core_process_stanza(origin, stanza)\r
-       log("debug", "Received: "..tostring(stanza))\r
-       -- TODO verify validity of stanza (as well as JID validity)\r
-       if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then\r
-               if stanza.attr.type == "set" or stanza.attr.type == "get" then\r
-                       error("Invalid IQ");\r
-               elseif #stanza.tags > 1 or not(stanza.attr.type == "error" or stanza.attr.type == "result") then\r
-                       error("Invalid IQ");\r
-               end\r
-       end\r
-\r
-       if origin.type == "c2s" and not origin.full_jid\r
-               and not(stanza.name == "iq" and stanza.tags[1].name == "bind"\r
-                               and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then\r
-               error("Client MUST bind resource after auth");\r
-       end\r
-\r
-       local to = stanza.attr.to;\r
-       stanza.attr.from = origin.full_jid; -- quick fix to prevent impersonation (FIXME this would be incorrect when the origin is not c2s)\r
-       -- TODO also, stazas should be returned to their original state before the function ends\r
-       \r
-       -- TODO presence subscriptions\r
-       if not to then\r
-                       core_handle_stanza(origin, stanza);\r
-       elseif hosts[to] and hosts[to].type == "local" then\r
-               core_handle_stanza(origin, stanza);\r
-       elseif stanza.name == "iq" and not select(3, jid_split(to)) then\r
-               core_handle_stanza(origin, stanza);\r
-       elseif origin.type == "c2s" then\r
-               core_route_stanza(origin, stanza);\r
-       end\r
-end\r
-\r
--- This function handles stanzas which are not routed any further,\r
--- that is, they are handled by this server\r
-function core_handle_stanza(origin, stanza)\r
-       -- Handlers\r
-       if origin.type == "c2s" or origin.type == "c2s_unauthed" then\r
-               local session = origin;\r
-               \r
-               if stanza.name == "presence" and origin.roster then\r
-                       if stanza.attr.type == nil or stanza.attr.type == "available" or stanza.attr.type == "unavailable" then\r
-                               for jid in pairs(origin.roster) do -- broadcast to all interested contacts\r
-                                       local subscription = origin.roster[jid].subscription;\r
-                                       if subscription == "both" or subscription == "from" then\r
-                                               stanza.attr.to = jid;\r
-                                               core_route_stanza(origin, stanza);\r
-                                       end\r
-                               end\r
-                               local node, host = jid_split(stanza.attr.from);\r
-                               for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources and from resources\r
-                                       if res ~= origin then\r
-                                               if res.full_jid then -- to resource. FIXME is this check correct? Maybe it should be res.presence\r
-                                                       stanza.attr.to = res.full_jid;\r
-                                                       core_route_stanza(origin, stanza);\r
-                                               end\r
-                                               if res.presence then -- from all resources for which we have presence\r
-                                                       res.presence.attr.to = origin.full_jid;\r
-                                                       core_route_stanza(res, res.presence);\r
-                                                       res.presence.attr.to = nil;\r
-                                               end\r
-                                       end\r
-                               end\r
-                               if not origin.presence then -- presence probes on initial presence\r
-                                       local probe = st.presence({from = origin.full_jid, type = "probe"});\r
-                                       for jid in pairs(origin.roster) do\r
-                                               local subscription = origin.roster[jid].subscription;\r
-                                               if subscription == "both" or subscription == "to" then\r
-                                                       probe.attr.to = jid;\r
-                                                       core_route_stanza(origin, probe);\r
-                                               end\r
-                                       end\r
-                                       -- TODO resend subscription requests\r
-                               end\r
-                               origin.presence = stanza;\r
-                               stanza.attr.to = nil; -- reset it\r
-                       else\r
-                               -- TODO error, bad type\r
-                       end\r
-               else\r
-                       log("debug", "Routing stanza to local");\r
-                       handle_stanza(session, stanza);\r
-               end\r
-       end\r
-end\r
-\r
-function is_authorized_to_see_presence(origin, username, host)\r
-       local roster = datamanager.load(username, host, "roster") or {};\r
-       local item = roster[origin.username.."@"..origin.host];\r
-       return item and (item.subscription == "both" or item.subscription == "from");\r
-end\r
-\r
-function core_route_stanza(origin, stanza)\r
-       -- Hooks\r
-       --- ...later\r
-       \r
-       -- Deliver\r
-       local to = stanza.attr.to;\r
-       local node, host, resource = jid_split(to);\r
-\r
-       if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end\r
-\r
-       local host_session = hosts[host]\r
-       if host_session and host_session.type == "local" then\r
-               -- Local host\r
-               local user = host_session.sessions[node];\r
-               if user then\r
-                       local res = user.sessions[resource];\r
-                       if not res then\r
-                               -- if we get here, resource was not specified or was unavailable\r
-                               if stanza.name == "presence" then\r
-                                       if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then\r
-                                               if stanza.attr.type == "probe" then\r
-                                                       if is_authorized_to_see_presence(origin, node, host) then\r
-                                                               for k in pairs(user.sessions) do -- return presence for all resources\r
-                                                                       if user.sessions[k].presence then\r
-                                                                               local pres = user.sessions[k].presence;\r
-                                                                               pres.attr.to = origin.full_jid;\r
-                                                                               pres.attr.from = user.sessions[k].full_jid;\r
-                                                                               send(origin, pres);\r
-                                                                               pres.attr.to = nil;\r
-                                                                               pres.attr.from = nil;\r
-                                                                       end\r
-                                                               end\r
-                                                       else\r
-                                                               send(origin, st.presence({from=user.."@"..host, to=origin.username.."@"..origin.host, type="unsubscribed"}));\r
-                                                       end\r
-                                               elseif stanza.attr.type == "subscribe" then\r
-                                                       -- TODO\r
-                                               elseif stanza.attr.type == "unsubscribe" then\r
-                                                       -- TODO\r
-                                               elseif stanza.attr.type == "subscribed" then\r
-                                                       -- TODO\r
-                                               elseif stanza.attr.type == "unsubscribed" then\r
-                                                       -- TODO\r
-                                               end -- discard any other type\r
-                                       else -- sender is available or unavailable\r
-                                               for k in pairs(user.sessions) do -- presence broadcast to all user resources\r
-                                                       if user.sessions[k].full_jid then\r
-                                                               stanza.attr.to = user.sessions[k].full_jid;\r
-                                                               send(user.sessions[k], stanza);\r
-                                                       end\r
-                                               end\r
-                                       end\r
-                               elseif stanza.name == "message" then -- select a resource to recieve message\r
-                                       for k in pairs(user.sessions) do\r
-                                               if user.sessions[k].full_jid then\r
-                                                       res = user.sessions[k];\r
-                                                       break;\r
-                                               end\r
-                                       end\r
-                                       -- TODO find resource with greatest priority\r
-                                       send(res, stanza);\r
-                               else\r
-                                       -- TODO send IQ error\r
-                               end\r
-                       else\r
-                               -- User + resource is online...\r
-                               stanza.attr.to = res.full_jid;\r
-                               send(res, stanza); -- Yay \o/\r
-                       end\r
-               else\r
-                       -- user not online\r
-                       if user_exists(node, host) then\r
-                               if stanza.name == "presence" then\r
-                                       if stanza.attr.type == "probe" and is_authorized_to_see_presence(origin, node, host) then -- FIXME what to do for not c2s?\r
-                                               -- TODO send last recieved unavailable presence\r
-                                       else\r
-                                               -- TODO send unavailable presence\r
-                                       end\r
-                               elseif stanza.name == "message" then\r
-                                       -- TODO send message error, or store offline messages\r
-                               elseif stanza.name == "iq" then\r
-                                       -- TODO send IQ error\r
-                               end\r
-                       else -- user does not exist\r
-                               -- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?\r
-                               if stanza.name == "presence" then\r
-                                       if stanza.attr.type == "probe" then\r
-                                               send(origin, st.presence({from = user.."@"..host, to = origin.username.."@"..origin.host, type = "unsubscribed"}));\r
-                                       end\r
-                                       -- else ignore\r
-                               else\r
-                                       send(origin, st.error_reply(stanza, "cancel", "service-unavailable"));\r
-                               end\r
-                       end\r
-               end\r
-       else\r
-               -- Remote host\r
-               if host_session then\r
-                       -- Send to session\r
-               else\r
-                       -- Need to establish the connection\r
-               end\r
-       end\r
-       stanza.attr.to = to; -- reset\r
-end\r
-\r
-function handle_stanza_toremote(stanza)\r
-       log("error", "Stanza bound for remote host, but s2s is not implemented");\r
-end\r
-=======\r
+-- Prosody IM v0.3
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
 
--- 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";
-local send = require "core.sessionmanager".send_to_session;
--- local send_s2s = require "core.s2smanager".send_to_host;
+local send_s2s = require "core.s2smanager".send_to_host;
 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;
+
+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 handle_normal_presence = require "core.presencemanager".handle_normal_presence;
+
+local format = string.format;
+local tostring = tostring;
+local t_concat = table.concat;
+local t_insert = table.insert;
+local tonumber = tonumber;
+local s_find = string.find;
+
 local jid_split = require "util.jid".split;
+local jid_prepped_split = require "util.jid".prepped_split;
 local print = print;
+local function checked_error_reply(origin, 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
 
 function core_process_stanza(origin, stanza)
-       log("debug", "Received: "..tostring(stanza))
+       (origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza: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
                        error("Invalid IQ");
-               elseif #stanza.tags > 1 or not(stanza.attr.type == "error" or stanza.attr.type == "result") then
+               elseif #stanza.tags > 1 and not(stanza.attr.type == "error" or stanza.attr.type == "result") then
                        error("Invalid IQ");
                end
        end
@@ -252,19 +63,73 @@ function core_process_stanza(origin, stanza)
                error("Client MUST bind resource after auth");
        end
 
-       local to = stanza.attr.to;
-       stanza.attr.from = origin.full_jid; -- quick fix to prevent impersonation (FIXME this would be incorrect when the origin is not c2s)
-       -- TODO also, stazas should be returned to their original state before the function ends
-       
-       -- TODO presence subscriptions
-       if not to then
+       -- 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
+       local to, xmlns = stanza.attr.to, stanza.attr.xmlns;
+       local from = stanza.attr.from;
+       local node, host, resource;
+       local from_node, from_host, from_resource;
+       local to_bare, from_bare;
+       if to then
+               node, host, resource = jid_prepped_split(to);
+               if not host then
+                       error("Invalid to JID");
+               end
+               to_bare = node and (node.."@"..host) or host; -- bare JID
+               if resource then to = to_bare.."/"..resource; else to = to_bare; end
+               stanza.attr.to = to;
+       end
+       if from then
+               from_node, from_host, from_resource = jid_prepped_split(from);
+               if not from_host then
+                       error("Invalid from JID");
+               end
+               from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
+               if from_resource then from = from_bare.."/"..from_resource; else from = from_bare; end
+               stanza.attr.from = from;
+       end
+
+       --[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us?
+               log("warn", "stanza recieved for a non-local server");
+               return; -- FIXME what should we do here?
+       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" 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?
+                               log("warn", "Received a stanza claiming to be from %s, over a conn authed for %s!", from_host, origin.from_host);
+                               return; -- FIXME what should we do here? does this work with subdomains?
+                       end
+               end
+               if not to then
                        core_handle_stanza(origin, stanza);
-       elseif hosts[to] and hosts[to].type == "local" then
-               core_handle_stanza(origin, stanza);
-       elseif stanza.name == "iq" and not select(3, jid_split(to)) then
+               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] 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[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server
+                       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
+                       if origin.type == "c2s" and stanza.name == "presence" and to ~= nil and not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then
+                               origin.directed = origin.directed or {};
+                               t_insert(origin.directed, to); -- FIXME does it make more sense to add to_bare rather than to?
+                       end
+                       core_route_stanza(origin, stanza);
+               end
+       else
                core_handle_stanza(origin, stanza);
-       elseif origin.type == "c2s" then
-               core_route_stanza(origin, stanza);
        end
 end
 
@@ -272,63 +137,47 @@ end
 -- that is, they are handled by this server
 function core_handle_stanza(origin, stanza)
        -- Handlers
-       if origin.type == "c2s" or origin.type == "c2s_unauthed" then
-               local session = origin;
-               
-               if stanza.name == "presence" and origin.roster then
-                       if stanza.attr.type == nil or stanza.attr.type == "available" or stanza.attr.type == "unavailable" then
-                               for jid in pairs(origin.roster) do -- broadcast to all interested contacts
-                                       local subscription = origin.roster[jid].subscription;
-                                       if subscription == "both" or subscription == "from" then
-                                               stanza.attr.to = jid;
-                                               core_route_stanza(origin, stanza);
-                                       end
-                               end
-                               --[[local node, host = jid_split(stanza.attr.from);
-                               for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources
-                                       if res.full_jid then
-                                               res = user.sessions[k];
-                                               break;
-                                       end
-                               end]]
-                               if not origin.presence then -- presence probes on initial presence
-                                       local probe = st.presence({from = origin.full_jid, type = "probe"});
-                                       for jid in pairs(origin.roster) do
-                                               local subscription = origin.roster[jid].subscription;
-                                               if subscription == "both" or subscription == "to" then
-                                                       probe.attr.to = jid;
-                                                       core_route_stanza(origin, probe);
-                                               end
-                                       end
+       if modules_handle_stanza(select(2, jid_split(stanza.attr.to)) or origin.host, origin, stanza) then return; end
+       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
+                                       handle_normal_presence(origin, stanza, core_route_stanza);
+                               else
+                                       log("warn", "Unhandled c2s presence: %s", tostring(stanza));
+                                       checked_error_reply(origin, stanza);
                                end
-                               origin.presence = stanza;
-                               stanza.attr.to = nil; -- reset it
                        else
-                               -- TODO error, bad type
+                               log("warn", "Unhandled c2s stanza: %s", tostring(stanza));
+                               checked_error_reply(origin, stanza);
                        end
-               else
-                       log("debug", "Routing stanza to local");
-                       handle_stanza(session, stanza);
+               else -- s2s stanzas
+                       log("warn", "Unhandled s2s stanza: %s", tostring(stanza));
+                       checked_error_reply(origin, stanza);
                end
+       else
+               log("warn", "Unhandled %s stanza: %s", origin.type, tostring(stanza));
+               checked_error_reply(origin, stanza);
        end
 end
 
--- TODO: Does this function belong here?
-function is_authorized_to_see_presence(origin, username, host)
-       local roster = datamanager.load(username, host, "roster") or {};
-       local item = roster[origin.username.."@"..origin.host];
-       return item and (item.subscription == "both" or item.subscription == "from");
-end
-
 function core_route_stanza(origin, stanza)
        -- Hooks
        --- ...later
-       
+
        -- Deliver
        local to = stanza.attr.to;
        local node, host, resource = jid_split(to);
+       local to_bare = node and (node.."@"..host) or host; -- bare JID
+       local from = stanza.attr.from;
+       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
 
-       if stanza.name == "presence" and stanza.attr.type == "probe" then resource = nil; end
+       -- 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]
        if host_session and host_session.type == "local" then
@@ -339,80 +188,91 @@ 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 == "probe" then
-                                               if is_authorized_to_see_presence(origin, node, host) then
-                                                       for k in pairs(user.sessions) do -- return presence for all resources
-                                                               if user.sessions[k].presence then
-                                                                       local pres = user.sessions[k].presence;
-                                                                       pres.attr.to = origin.full_jid;
-                                                                       pres.attr.from = user.sessions[k].full_jid;
-                                                                       send(origin, pres);
-                                                                       pres.attr.to = nil;
-                                                                       pres.attr.from = nil;
-                                                               end
-                                                       end
-                                               else
-                                                       send(origin, st.presence({from = user.."@"..host, to = origin.username.."@"..origin.host, type = "unsubscribed"}));
-                                               end
-                                       else
-                                               for k in pairs(user.sessions) do -- presence broadcast to all user resources
-                                                       if user.sessions[k].full_jid then
-                                                               stanza.attr.to = user.sessions[k].full_jid;
-                                                               send(user.sessions[k], stanza);
+                                       if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+                                               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?
+                                                               stanza.attr.to = session.full_jid; -- reset at the end of function
+                                                               session.send(stanza);
                                                        end
                                                end
                                        end
                                elseif stanza.name == "message" then -- select a resource to recieve message
-                                       for k in pairs(user.sessions) do
-                                               if user.sessions[k].full_jid then
-                                                       res = user.sessions[k];
-                                                       break;
+                                       local priority = 0;
+                                       local recipients = {};
+                                       for _, session in pairs(user.sessions) do -- find resource with greatest priority
+                                               local p = session.priority;
+                                               if p > priority then
+                                                       priority = p;
+                                                       recipients = {session};
+                                               elseif p == priority then
+                                                       t_insert(recipients, session);
                                                end
                                        end
-                                       -- TODO find resource with greatest priority
-                                       send(res, stanza);
+                                       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
                                end
                        else
                                -- User + resource is online...
-                               stanza.attr.to = res.full_jid;
-                               send(res, stanza); -- Yay \o/
+                               stanza.attr.to = res.full_jid; -- reset at the end of function
+                               res.send(stanza); -- Yay \o/
                        end
                else
                        -- user not online
                        if user_exists(node, host) then
                                if stanza.name == "presence" then
-                                       if stanza.attr.type == "probe" and is_authorized_to_see_presence(origin, node, host) then -- FIXME what to do for not c2s?
-                                               -- TODO send last recieved unavailable presence
+                                       if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
+                                               handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
                                        else
-                                               -- TODO send unavailable presence
+                                               -- TODO send unavailable presence or unsubscribed
+                                       end
+                               elseif stanza.name == "message" then -- FIXME if full jid, then send out to resources with highest priority
+                                       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
-                               elseif stanza.name == "message" then
-                                       -- TODO send message error, or store offline messages
+                                       -- TODO allow configuration of offline storage
+                                       -- TODO send error if not storing offline
                                elseif stanza.name == "iq" then
-                                       -- TODO send IQ error
+                                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
                                end
                        else -- user does not exist
                                -- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?
                                if stanza.name == "presence" then
-                                       if stanza.attr.type == "probe" then
-                                               send(origin, st.presence({from = user.."@"..host, to = origin.username.."@"..origin.host, type = "unsubscribed"}));
+                                       local t = stanza.attr.type;
+                                       if t == "subscribe" or t == "probe" then
+                                               origin.send(st.presence({from = to_bare, to = from_bare, type = "unsubscribed"}));
                                        end
                                        -- else ignore
                                else
-                                       send(origin, st.error_reply(stanza, "cancel", "service-unavailable"));
+                                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
                                end
                        end
                end
-       else
+       elseif origin.type == "c2s" then
                -- Remote host
+               local xmlns = stanza.attr.xmlns;
+               --stanza.attr.xmlns = "jabber:server";
+               stanza.attr.xmlns = nil;
+               log("debug", "sending s2s stanza: %s", tostring(stanza));
+               send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
+               stanza.attr.xmlns = xmlns; -- reset
+       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);
                send_s2s(origin.host, host, stanza);
+       else
+               log("warn", "received stanza from unhandled connection type: %s", origin.type);
        end
        stanza.attr.to = to; -- reset
 end
-
-function handle_stanza_toremote(stanza)
-       log("error", "Stanza bound for remote host, but s2s is not implemented");
-end
->>>>>>> other\r