# HG changeset patch # User Matthew Wild # Date 1240967335 -3600 # Node ID 0cb325970a50fd88113bbdf0a89589ceed80024a # Parent 63b7a81d45eb9ad4d3b3ba36c188288f14ee525c# Parent 3806173670f2ddecdcc1effbe0e3b83699e14c02 Merge with 0.4 diff -r 3806173670f2 -r 0cb325970a50 core/componentmanager.lua --- a/core/componentmanager.lua Wed Apr 29 02:08:12 2009 +0100 +++ b/core/componentmanager.lua Wed Apr 29 02:08:55 2009 +0100 @@ -80,8 +80,7 @@ function create_component(host, component) -- TODO check for host well-formedness - local session = session or { type = "component", host = host, connected = true, s2sout = {} }; - return session; + return { type = "component", host = host, connected = true, s2sout = {} }; end function register_component(host, component, session) diff -r 3806173670f2 -r 0cb325970a50 core/eventmanager2.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/eventmanager2.lua Wed Apr 29 02:08:55 2009 +0100 @@ -0,0 +1,6 @@ + +local events = require "util.events".new(); + +module "eventmanager" + +return events; diff -r 3806173670f2 -r 0cb325970a50 core/stanza_router.lua --- a/core/stanza_router.lua Wed Apr 29 02:08:12 2009 +0100 +++ b/core/stanza_router.lua Wed Apr 29 02:08:55 2009 +0100 @@ -10,6 +10,8 @@ local log = require "util.logger".init("stanzarouter") +local hosts = _G.hosts; + local st = require "util.stanza"; local send_s2s = require "core.s2smanager".send_to_host; local user_exists = require "core.usermanager".user_exists; @@ -24,9 +26,9 @@ 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 handle_outbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes; +local handle_inbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes; +local handle_normal_presence = function()end;--require "core.presencemanager".handle_normal_presence; local format = string.format; local tostring = tostring; @@ -40,6 +42,7 @@ local jid_split = require "util.jid".split; local jid_prepped_split = require "util.jid".prepped_split; local print = print; +local fire_event = require "core.eventmanager2".fire_event; 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? @@ -100,6 +103,8 @@ -- FIXME do stanzas not of jabber:client get handled by components? if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and (not xmlns or xmlns == "jabber:server" or xmlns == "jabber:client") then + local event_data = {origin=origin, stanza=stanza}; + fire_event(tostring(host or origin.host).."/"..stanza.name, event_data); 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? diff -r 3806173670f2 -r 0cb325970a50 net/http.lua --- a/net/http.lua Wed Apr 29 02:08:12 2009 +0100 +++ b/net/http.lua Wed Apr 29 02:08:55 2009 +0100 @@ -9,8 +9,8 @@ local listener = connlisteners_get("httpclient") or error("No httpclient listener!"); local t_insert, t_concat = table.insert, table.concat; -local tonumber, tostring, pairs, xpcall, select, debug_traceback = - tonumber, tostring, pairs, xpcall, select, debug.traceback; +local tonumber, tostring, pairs, xpcall, select, debug_traceback, char = + tonumber, tostring, pairs, xpcall, select, debug.traceback, string.char; local log = require "util.logger".init("http"); local print = function () end diff -r 3806173670f2 -r 0cb325970a50 net/httpserver.lua --- a/net/httpserver.lua Wed Apr 29 02:08:12 2009 +0100 +++ b/net/httpserver.lua Wed Apr 29 02:08:55 2009 +0100 @@ -8,10 +8,10 @@ local listener; local t_insert, t_concat = table.insert, table.concat; -local s_match, s_gmatch = string.match, string.gmatch; +local s_match, s_gmatch, s_char = string.match, string.gmatch; local tonumber, tostring, pairs = tonumber, tostring, pairs; -local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end }); +local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = s_char(tonumber("0x"..k)); return t[k]; end }); local urlencode = function (s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end local log = require "util.logger".init("httpserver"); diff -r 3806173670f2 -r 0cb325970a50 net/server.lua --- a/net/server.lua Wed Apr 29 02:08:12 2009 +0100 +++ b/net/server.lua Wed Apr 29 02:08:55 2009 +0100 @@ -786,7 +786,7 @@ end local addclient = function( address, port, listeners, pattern, sslctx, startssl ) - local client, err = socket.tcp( ) + local client, err = luasocket.tcp( ) if err then return nil, err end @@ -795,7 +795,7 @@ if err then -- try again local handler = wrapclient( client, address, port, listeners ) else - wrapconnection( server, listeners, socket, address, port, "clientport", pattern, sslctx, startssl ) + wrapconnection( nil, listeners, client, address, port, "clientport", pattern, sslctx, startssl ) end end diff -r 3806173670f2 -r 0cb325970a50 net/xmppclient_listener.lua --- a/net/xmppclient_listener.lua Wed Apr 29 02:08:12 2009 +0100 +++ b/net/xmppclient_listener.lua Wed Apr 29 02:08:55 2009 +0100 @@ -9,6 +9,7 @@ local logger = require "logger"; +local log = logger.init("xmppclient_listener"); local lxp = require "lxp" local init_xmlhandlers = require "core.xmlhandlers" local sm_new_session = require "core.sessionmanager".new_session; @@ -20,10 +21,11 @@ local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end local m_random = math.random; local format = string.format; -local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); +local sessionmanager = require "core.sessionmanager"; +local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; local sm_streamopened = sessionmanager.streamopened; local sm_streamclosed = sessionmanager.streamclosed; -local st = stanza; +local st = require "util.stanza"; local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", default_ns = "jabber:client", diff -r 3806173670f2 -r 0cb325970a50 net/xmppserver_listener.lua --- a/net/xmppserver_listener.lua Wed Apr 29 02:08:12 2009 +0100 +++ b/net/xmppserver_listener.lua Wed Apr 29 02:08:55 2009 +0100 @@ -9,9 +9,9 @@ local logger = require "logger"; +local log = logger.init("xmppserver_listener"); local lxp = require "lxp" local init_xmlhandlers = require "core.xmlhandlers" -local sm_new_session = require "core.sessionmanager".new_session; local s2s_new_incoming = require "core.s2smanager".new_incoming; local s2s_streamopened = require "core.s2smanager".streamopened; local s2s_streamclosed = require "core.s2smanager".streamclosed; @@ -42,8 +42,9 @@ local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end local m_random = math.random; local format = string.format; -local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); -local st = stanza; +local sessionmanager = require "core.sessionmanager"; +local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; +local st = require "util.stanza"; local sessions = {}; local xmppserver = { default_port = 5269, default_mode = "*a" }; diff -r 3806173670f2 -r 0cb325970a50 plugins/mod_bosh.lua --- a/plugins/mod_bosh.lua Wed Apr 29 02:08:12 2009 +0100 +++ b/plugins/mod_bosh.lua Wed Apr 29 02:08:55 2009 +0100 @@ -1,6 +1,7 @@ module.host = "*" -- Global module +local hosts = _G.hosts; local lxp = require "lxp"; local init_xmlhandlers = require "core.xmlhandlers" local server = require "net.server"; diff -r 3806173670f2 -r 0cb325970a50 plugins/mod_muc.lua diff -r 3806173670f2 -r 0cb325970a50 plugins/mod_posix.lua diff -r 3806173670f2 -r 0cb325970a50 plugins/mod_presence.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/mod_presence.lua Wed Apr 29 02:08:55 2009 +0100 @@ -0,0 +1,279 @@ +-- Prosody IM v0.4 +-- Copyright (C) 2008-2009 Matthew Wild +-- Copyright (C) 2008-2009 Waqas Hussain +-- +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. +-- + + + +local log = require "util.logger".init("mod_presence") + +local require = require; +local pairs, ipairs = pairs, ipairs; +local t_concat = table.concat; +local s_find = string.find; +local tonumber = tonumber; + +local st = require "util.stanza"; +local jid_split = require "util.jid".split; +local jid_bare = require "util.jid".bare; +local hosts = hosts; + +local rostermanager = require "core.rostermanager"; +local sessionmanager = require "core.sessionmanager"; +local offlinemanager = require "core.offlinemanager"; + +local _core_route_stanza = core_route_stanza; +local core_route_stanza; +function core_route_stanza(origin, stanza) + if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then + local node, host = jid_split(stanza.attr.to); + host = hosts[host]; + if host and host.type == "local" then + handle_inbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza); + return; + end + end + _core_route_stanza(origin, stanza); +end + +function handle_presence(origin, stanza, from_bare, to_bare, core_route_stanza, inbound) + local type = stanza.attr.type; + if type and type ~= "unavailable" and type ~= "error" then + if inbound then + handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); + else + handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); + end + elseif not inbound and not stanza.attr.to then + handle_normal_presence(origin, stanza, core_route_stanza); + else + core_route_stanza(origin, stanza); + end +end + +function handle_normal_presence(origin, stanza, core_route_stanza) + if origin.roster 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 ~= origin and res.presence then -- to resource + stanza.attr.to = res.full_jid; + core_route_stanza(origin, stanza); + end + end + if stanza.attr.type == nil and not origin.presence then -- initial presence + local probe = st.presence({from = origin.full_jid, type = "probe"}); + for jid in pairs(origin.roster) do -- probe all contacts we are subscribed to + local subscription = origin.roster[jid].subscription; + if subscription == "both" or subscription == "to" then + probe.attr.to = jid; + core_route_stanza(origin, probe); + end + end + for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast from all available resources + if res ~= origin and res.presence then + res.presence.attr.to = origin.full_jid; + core_route_stanza(res, res.presence); + res.presence.attr.to = nil; + end + end + if origin.roster.pending then -- resend incoming subscription requests + for jid in pairs(origin.roster.pending) do + origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original? + end + end + local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host}); + for jid, item in pairs(origin.roster) do -- resend outgoing subscription requests + if item.ask then + request.attr.to = jid; + core_route_stanza(origin, request); + end + end + local offline = offlinemanager.load(node, host); + if offline then + for _, msg in ipairs(offline) do + origin.send(msg); -- FIXME do we need to modify to/from in any way? + end + offlinemanager.deleteAll(node, host); + end + end + origin.priority = 0; + if stanza.attr.type == "unavailable" then + origin.presence = nil; + if origin.directed then + local old_from = stanza.attr.from; + stanza.attr.from = origin.full_jid; + for jid in pairs(origin.directed) do + stanza.attr.to = jid; + core_route_stanza(origin, stanza); + end + stanza.attr.from = old_from; + origin.directed = nil; + end + else + origin.presence = stanza; + local priority = stanza:child_with_name("priority"); + if priority and #priority > 0 then + priority = t_concat(priority); + if s_find(priority, "^[+-]?[0-9]+$") then + priority = tonumber(priority); + if priority < -128 then priority = -128 end + if priority > 127 then priority = 127 end + origin.priority = priority; + end + end + end + stanza.attr.to = nil; -- reset it + else + log("error", "presence recieved from client with no roster"); + end +end + +function send_presence_of_available_resources(user, host, jid, recipient_session, core_route_stanza) + 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; + core_route_stanza(session, pres); + pres.attr.to = nil; + pres.attr.from = nil; + count = count + 1; + end + end + end + end + log("info", "broadcasted presence of "..count.." resources from "..user.."@"..host.." to "..jid); + return count; +end + +function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza) + 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; + log("debug", "outbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare); + if stanza.attr.type == "subscribe" then + -- 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 + -- 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 + -- 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); + end + core_route_stanza(origin, stanza); + send_presence_of_available_resources(node, host, to_bare, origin, core_route_stanza); + elseif stanza.attr.type == "unsubscribed" then + -- 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); + end + core_route_stanza(origin, stanza); + 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, core_route_stanza) + 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; + log("debug", "inbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare); + if stanza.attr.type == "probe" then + if rostermanager.is_contact_subscribed(node, host, from_bare) then + if 0 == send_presence_of_available_resources(node, host, from_bare, origin, core_route_stanza) 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 + 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 + -- Sending presence is not clearly stated in the RFC, but it seems appropriate + if 0 == send_presence_of_available_resources(node, host, from_bare, origin, core_route_stanza) then + -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) + end + 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 + end + end + elseif stanza.attr.type == "unsubscribe" then + if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then + rostermanager.roster_push(node, host, from_bare); + end + elseif stanza.attr.type == "subscribed" then + 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 + if rostermanager.process_inbound_subscription_cancellation(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 + +local function presence_handler(data) + local origin, stanza = data.origin, data.stanza; + local to = stanza.attr.to; + local node, host = jid_split(to); + local to_bare = jid_bare(to); + local from_bare = jid_bare(stanza.attr.from); + if origin.type == "c2s" then + if to ~= nil and not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then -- directed presence + origin.directed = origin.directed or {}; + origin.directed[to] = true; + end + if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then + handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); + elseif not to then + handle_normal_presence(origin, stanza, core_route_stanza); + else + core_route_stanza(origin, stanza); + end + elseif (origin.type == "s2sin" or origin.type == "component") and hosts[host] then + if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then + handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); + else + core_route_stanza(origin, stanza); + end + end +end + +local add_handler = require "core.eventmanager2".add_handler; +local remove_handler = require "core.eventmanager2".remove_handler; + +add_handler(module:get_host().."/presence", presence_handler); +module.unload = function() + remove_handler(module:get_host().."/presence", presence_handler); +end