sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead)...
[prosody.git] / core / sessionmanager.lua
index 19943db0bae65c7995a19e1000efa0eb64ee6930..a2c6ed9557931d162a71e9cd0d6a3e4138ec5274 100644 (file)
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -8,10 +8,8 @@
 
 
 
-local tonumber, tostring = tonumber, tostring;
+local tonumber, tostring, setmetatable = tonumber, tostring, setmetatable;
 local ipairs, pairs, print, next= ipairs, pairs, print, next;
-local collectgarbage = collectgarbage;
-local m_random = import("math", "random");
 local format = import("string", "format");
 
 local hosts = hosts;
@@ -19,19 +17,23 @@ local full_sessions = full_sessions;
 local bare_sessions = bare_sessions;
 
 local modulemanager = require "core.modulemanager";
-local log = require "util.logger".init("sessionmanager");
+local logger = require "util.logger";
+local log = logger.init("sessionmanager");
 local error = error;
 local uuid_generate = require "util.uuid".generate;
 local rm_load_roster = require "core.rostermanager".load_roster;
 local config_get = require "core.configmanager".get;
 local nameprep = require "util.encodings".stringprep.nameprep;
+local resourceprep = require "util.encodings".stringprep.resourceprep;
 
 local fire_event = require "core.eventmanager".fire_event;
-
+local add_task = require "util.timer".add_task;
 local gettime = require "socket".gettime;
 
 local st = require "util.stanza";
 
+local c2s_timeout = config_get("*", "core", "c2s_timeout");
+
 local newproxy = newproxy;
 local getmetatable = getmetatable;
 
@@ -40,7 +42,7 @@ module "sessionmanager"
 local open_sessions = 0;
 
 function new_session(conn)
-       local session = { conn = conn,  priority = 0, type = "c2s_unauthed", conntime = gettime() };
+       local session = { conn = conn, type = "c2s_unauthed", conntime = gettime() };
        if true then
                session.trace = newproxy(true);
                getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
@@ -48,39 +50,57 @@ function new_session(conn)
        open_sessions = open_sessions + 1;
        log("debug", "open sessions now: ".. open_sessions);
        local w = conn.write;
-       session.send = function (t) w(tostring(t)); end
-       session.ip = conn.ip();
+       session.send = function (t) w(conn, tostring(t)); end
+       session.ip = conn:ip();
+       local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
+       session.log = logger.init(conn_name);
+       
+       if c2s_timeout then
+               add_task(c2s_timeout, function ()
+                       if session.type == "c2s_unauthed" then
+                               session:close("connection-timeout");
+                       end
+               end);
+       end
+               
        return session;
 end
 
+local resting_session = { -- Resting, not dead
+               destroyed = true;
+       }; resting_session.__index = resting_session;
+
+function retire_session(session)
+       local log = session.log or log;
+       for k in pairs(session) do
+               if k ~= "trace" and k ~= "log" and k ~= "id" then
+                       session[k] = nil;
+               end
+       end
+
+       function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end
+       function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end
+       return setmetatable(session, resting_session);
+end
+
 function destroy_session(session, err)
        (session.log or log)("info", "Destroying session for %s (%s@%s)", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)");
        
-       -- Send unavailable presence
-       if session.presence then
-               local pres = st.presence{ type = "unavailable" };
-               if (not err) or err == "closed" then err = "connection closed"; end
-               pres:tag("status"):text("Disconnected: "..err):up();
-               session:dispatch_stanza(pres);
-       end
-       
        -- Remove session/resource from user's session list
        if session.full_jid then
                hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
                full_sessions[session.full_jid] = nil;
-                       
+               
                if not next(hosts[session.host].sessions[session.username].sessions) then
                        log("debug", "All resources of %s are now offline", session.username);
                        hosts[session.host].sessions[session.username] = nil;
                        bare_sessions[session.username..'@'..session.host] = nil;
                end
+
+               hosts[session.host].events.fire_event("resource-unbind", {session=session, error=err});
        end
        
-       for k in pairs(session) do
-               if k ~= "trace" then
-                       session[k] = nil;
-               end
-       end
+       retire_session(session);
 end
 
 function make_authenticated(session, username)
@@ -99,7 +119,8 @@ function bind_resource(session, resource)
        if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end
        -- We don't support binding multiple resources
 
-       resource = resource or uuid_generate();
+       resource = resourceprep(resource);
+       resource = resource ~= "" and resource or uuid_generate();
        --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing
        
        if not hosts[session.host].sessions[session.username] then
@@ -130,6 +151,7 @@ function bind_resource(session, resource)
                                };
                                if not next(sessions) then
                                        hosts[session.host].sessions[session.username] = { sessions = sessions };
+                                       bare_sessions[session.username.."@"..session.host] = hosts[session.host].sessions[session.username];
                                end
                        end
                        if increment and sessions[resource] then
@@ -149,6 +171,8 @@ function bind_resource(session, resource)
        
        session.roster = rm_load_roster(session.username, session.host);
        
+       hosts[session.host].events.fire_event("resource-bind", {session=session});
+       
        return true;
 end
 
@@ -157,31 +181,33 @@ function streamopened(session, attr)
        session.host = attr.to or error("Client failed to specify destination hostname");
        session.host = nameprep(session.host);
        session.version = tonumber(attr.version) or 0;
-       session.streamid = m_random(1000000, 99999999);
+       session.streamid = uuid_generate();
        (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host);
-       
-       send("<?xml version='1.0'?>");
-       send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0'>", session.streamid, session.host));
 
        if not hosts[session.host] then
                -- We don't serve this host...
                session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
                return;
        end
-       
+
+       send("<?xml version='1.0'?>");
+       send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0' xml:lang='en'>", session.streamid, session.host));
+
+       (session.log or log)("debug", "Sent reply <stream:stream> to client");
+       session.notopen = nil;
+
        -- If session.secure is *false* (not nil) then it means we /were/ encrypting
        -- since we now have a new stream header, session is secured
        if session.secure == false then
                session.secure = true;
        end
-                                               
+
        local features = st.stanza("stream:features");
+       hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
        fire_event("stream-features", session, features);
-       
+
        send(features);
-       
-       (session.log or log)("debug", "Sent reply <stream:stream> to client");
-       session.notopen = nil;
+
 end
 
 function streamclosed(session)
@@ -190,22 +216,32 @@ function streamclosed(session)
 end
 
 function send_to_available_resources(user, host, stanza)
+       local jid = user.."@"..host;
        local count = 0;
-       local to = stanza.attr.to;
-       stanza.attr.to = nil;
-       local h = hosts[host];
-       if h and h.type == "local" then
-               local u = h.sessions[user];
-               if u then
-                       for k, session in pairs(u.sessions) do
-                               if session.presence then
-                                       session.send(stanza);
-                                       count = count + 1;
-                               end
+       local user = bare_sessions[jid];
+       if user then
+               for k, session in pairs(user.sessions) do
+                       if session.presence then
+                               session.send(stanza);
+                               count = count + 1;
+                       end
+               end
+       end
+       return count;
+end
+
+function send_to_interested_resources(user, host, stanza)
+       local jid = user.."@"..host;
+       local count = 0;
+       local user = bare_sessions[jid];
+       if user then
+               for k, session in pairs(user.sessions) do
+                       if session.interested then
+                               session.send(stanza);
+                               count = count + 1;
                        end
                end
        end
-       stanza.attr.to = to;
        return count;
 end