Merged from Matthew
authorWaqas Hussain <waqas20@gmail.com>
Thu, 23 Oct 2008 16:51:00 +0000 (21:51 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 23 Oct 2008 16:51:00 +0000 (21:51 +0500)
core/offlinemessage.lua
core/rostermanager.lua
core/stanza_router.lua
doc/roster_format.txt
main.lua
plugins/mod_roster.lua
util/datamanager.lua

index dda9b7d878e68086d77c56f8c20608a65f1ea67e..ebb357ba475a089b20d9a422285aa3b61b82d3aa 100644 (file)
@@ -11,3 +11,5 @@ function new(user, host, stanza)
        t_insert(offlinedata, stanza);
        return datamanager.store(user, host, "offlinemsg", offlinedata);
 end
+
+return _M;
\ No newline at end of file
index 26a142568fa247388634dc034144bf45f45bcf47..c39d28ed1b9090884cd5c1b2a6056584c9a96e6b 100644 (file)
@@ -18,17 +18,6 @@ local st = require "util.stanza";
 
 module "rostermanager"
 
---[[function getroster(username, host)
-       return { 
-                       ["mattj@localhost"] = true,
-                       ["tobias@getjabber.ath.cx"] = true,
-                       ["waqas@getjabber.ath.cx"] = true,
-                       ["thorns@getjabber.ath.cx"] = true, 
-                       ["idw@getjabber.ath.cx"] = true, 
-               }
-       --return datamanager.load(username, host, "roster") or {};
-end]]
-
 function add_to_roster(session, jid, item)
        if session.roster then
                local old_item = session.roster[jid];
@@ -65,7 +54,7 @@ function roster_push(username, host, jid)
                local stanza = st.iq({type="set"});
                stanza:tag("query", {xmlns = "jabber:iq:roster"});
                if item then
-                       stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name});
+                       stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name, ask = item.ask});
                        for group in pairs(item.groups) do
                                stanza:tag("group"):text(group):up();
                        end
@@ -94,6 +83,7 @@ function load_roster(username, host)
                return roster;
        end
        -- Attempt to load roster for non-loaded user
+       -- TODO also support loading for offline user
 end
 
 function save_roster(username, host)
index 2203f351167b63f31fbd27b5acd16cb7811dd21c..06a5af9cedabc2d803f7a7884dc7a2d7c0fb709d 100644 (file)
-
--- 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 user_exists = require "core.usermanager".user_exists;
-
-local jid_split = require "util.jid".split;
-local print = print;
-
-function core_process_stanza(origin, stanza)
-       log("debug", "Received: "..tostring(stanza))
-       -- 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
-                       error("Invalid IQ");
-               end
-       end
-
-       if origin.type == "c2s" and not origin.full_jid
-               and not(stanza.name == "iq" and stanza.tags[1].name == "bind"
-                               and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
-               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
-                       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
-               core_handle_stanza(origin, stanza);
-       elseif origin.type == "c2s" then
-               core_route_stanza(origin, stanza);
-       end
-end
-
--- This function handles stanzas which are not routed any further,
--- 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
-                               end
-                               origin.presence = stanza;
-                               stanza.attr.to = nil; -- reset it
-                       else
-                               -- TODO error, bad type
-                       end
-               else
-                       log("debug", "Routing stanza to local");
-                       handle_stanza(session, stanza);
-               end
-       end
-end
-
-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);
-
-       if stanza.name == "presence" and stanza.attr.type == "probe" then resource = nil; end
-
-       local host_session = hosts[host]
-       if host_session and host_session.type == "local" then
-               -- Local host
-               local user = host_session.sessions[node];
-               if user then
-                       local res = user.sessions[resource];
-                       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);
-                                                       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;
-                                               end
-                                       end
-                                       -- TODO find resource with greatest priority
-                                       send(res, stanza);
-                               else
-                                       -- TODO send IQ error
-                               end
-                       else
-                               -- User + resource is online...
-                               stanza.attr.to = res.full_jid;
-                               send(res, 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
-                                       else
-                                               -- TODO send unavailable presence
-                                       end
-                               elseif stanza.name == "message" then
-                                       -- TODO send message error, or store offline messages
-                               elseif stanza.name == "iq" then
-                                       -- TODO send IQ error
-                               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"}));
-                                       end
-                                       -- else ignore
-                               else
-                                       send(origin, st.error_reply(stanza, "cancel", "service-unavailable"));
-                               end
-                       end
-               end
-       else
-               -- Remote host
-               if host_session then
-                       -- Send to session
-               else
-                       -- Need to establish the connection
-               end
-       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
+\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
+                               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
index 9094b5a16527594ff7925b0eac503ac32e3c5aa5..132dbf4ebf3379b2879ed07ecdbc715d439f5d72 100644 (file)
@@ -9,6 +9,7 @@ table roster_item {
   string subscription = "none" | "to" | "from" | "both"\r
   string name = Opaque string set by client. (optional)\r
   set groups = a set of opaque strings set by the client\r
+  boolean ask = nil | "subscribe" - a value of true indicates subscription is pending\r
 }\r
 \r
 The roster is available as\r
index 272486ce1e70176e80f86fcafcf3d798374eb51a..e9e8fca2cf4483d52221be6aa28e729c7a80e3e9 100644 (file)
--- a/main.lua
+++ b/main.lua
@@ -1,4 +1,4 @@
-require "luarocks.require"
+pcall(require, "luarocks.require")
 
 local server = require "net.server"
 require "lxp"
@@ -31,7 +31,7 @@ require "util.stanza"
 require "util.jid"
 
 ------------------------------------------------------------------------
+
 -- Locals for faster access --
 local t_insert = table.insert;
 local t_concat = table.concat;
index 8a20f76dc181ecd888c9c2f717f19341d00b30ee..d02f77a565f271a9e224cad0af079ca5ebbf6455 100644 (file)
@@ -19,6 +19,7 @@ add_iq_handler("c2s", "jabber:iq:roster",
                                                roster:tag("item", {
                                                        jid = jid,
                                                        subscription = session.roster[jid].subscription,
+                                                       ask = session.roster[jid].ask,
                                                        name = session.roster[jid].name,
                                                });
                                                for group in pairs(session.roster[jid].groups) do
@@ -54,6 +55,7 @@ add_iq_handler("c2s", "jabber:iq:roster",
                                                                        if r_item.name == "" then r_item.name = nil; end
                                                                        if session.roster[item.attr.jid] then
                                                                                r_item.subscription = session.roster[item.attr.jid].subscription;
+                                                                               r_item.ask = session.roster[item.attr.jid].ask;
                                                                        else
                                                                                r_item.subscription = "none";
                                                                        end
index f4ae958c702e5b4ec36aa9550e6785b3c00c18c8..43e23dc32af634de8d4ce1b229cf281700e91904 100644 (file)
@@ -93,3 +93,4 @@ function store(username, host, datastore, data)
        return true;
 end
 
+return _M;
\ No newline at end of file