Backed out changeset 98e9fea75e5b
authorMatthew Wild <mwild1@gmail.com>
Thu, 23 Oct 2008 17:43:00 +0000 (18:43 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 23 Oct 2008 17:43:00 +0000 (18:43 +0100)
core/stanza_router.lua

index fe1c8754c70fd883c3889f83b7bcec777ede78df..2203f351167b63f31fbd27b5acd16cb7811dd21c 100644 (file)
@@ -1,223 +1,3 @@
-<<<<<<< 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
 
 -- 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
@@ -313,7 +93,6 @@ function core_handle_stanza(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];
@@ -407,7 +186,11 @@ function core_route_stanza(origin, stanza)
                end
        else
                -- Remote host
-               send_s2s(origin.host, host, stanza);
+               if host_session then
+                       -- Send to session
+               else
+                       -- Need to establish the connection
+               end
        end
        stanza.attr.to = to; -- reset
 end
@@ -415,4 +198,3 @@ end
 function handle_stanza_toremote(stanza)
        log("error", "Stanza bound for remote host, but s2s is not implemented");
 end
->>>>>>> other\r