Send host, and not the recipient's JID to module manager (fixes #53)

[prosody.git] / core / stanza_router.lua

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 965c77ecf267311479529f4942949bca809e56ab..fe3749127ce3c19f8096f7543a89e342fad9b792 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -72,36 +72,37 @@ function core_process_stanza(origin, stanza)
        if origin.type == "c2s" then
                stanza.attr.from = origin.full_jid;
        end
-       local to = stanza.attr.to;
+       local to, xmlns = stanza.attr.to, stanza.attr.xmlns;
        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 origin.type == "s2sin" then
-               if origin.from_host ~= from_host 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, origin.from_host);
-                       return; -- FIXME what should we do here? does this work with subdomains?
-               end
-       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" then
+       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 -- 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[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
@@ -109,6 +110,10 @@ function core_process_stanza(origin, 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
@@ -120,7 +125,7 @@ end
 -- that is, they are handled by this server
 function core_handle_stanza(origin, stanza)
        -- Handlers
-       if modules_handle_stanza(stanza.attr.to or origin.host, origin, stanza) then return; 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
@@ -224,7 +229,7 @@ function core_route_stanza(origin, stanza)
                                        else
                                                -- TODO send unavailable presence or unsubscribed
                                        end
-                               elseif stanza.name == "message" then
+                               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
@@ -232,12 +237,13 @@ function core_route_stanza(origin, stanza)
                                        -- 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
+                                       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