Merge with 0.5

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 1b6aee177335b72ad6c70cde08ad73214b6fa178..08e70d44dc3f53c5ea00e266a5254f4df8327fe5 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -11,7 +11,6 @@
 local tonumber, tostring = tonumber, tostring;
 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,7 +18,8 @@ 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;
@@ -27,11 +27,13 @@ local config_get = require "core.configmanager".get;
 local nameprep = require "util.encodings".stringprep.nameprep;
 
 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;
 
@@ -50,23 +52,26 @@ function new_session(conn)
        local w = conn.write;
        session.send = function (t) w(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
 
 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].events.fire_event("resource-unbind", session);
+               hosts[session.host].events.fire_event("resource-unbind", {session=session, error=err});
 
                hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
                full_sessions[session.full_jid] = nil;
@@ -152,7 +157,7 @@ function bind_resource(session, resource)
        
        session.roster = rm_load_roster(session.username, session.host);
        
-       hosts[session.host].events.fire_event("resource-bind", session);
+       hosts[session.host].events.fire_event("resource-bind", {session=session});
        
        return true;
 end
@@ -162,31 +167,32 @@ 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' xml:lang='en'>", 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");
        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)