Merge 0.6.2/waqas with 0.6.2/MattJ
[prosody.git] / core / sessionmanager.lua
index 34cc9f0f76d557d4de4153176f6a2854aa4e3433..5fa757d6dbb08ba66cbc52230bdaf9b97e90a2ef 100644 (file)
@@ -1,46 +1,39 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
 
-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;
-local sessions = sessions;
+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;
 
@@ -49,53 +42,69 @@ 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;
        end
        open_sessions = open_sessions + 1;
-       log("info", "open sessions now: ".. open_sessions);
+       log("debug", "open sessions now: ".. open_sessions);
        local w = conn.write;
-       session.send = function (t) w(tostring(t)); end
+       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
 
-function destroy_session(session, err)
-       (session.log or log)("info", "Destroying session");
-       
-       -- 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);
-               session:dispatch_stanza(pres);
+local resting_session = { -- Resting, not dead
+               destroyed = true;
+               close = function (session)
+                       session.log("debug", "Attempt to close already-closed session");
+               end;
+       }; 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)");
+       if session.destroyed then return; end
        
        -- Remove session/resource from user's session list
-       if session.host and session.username then
-               -- FIXME: How can the below ever be nil? (but they sometimes are...)
-               if hosts[session.host] and hosts[session.host].sessions[session.username] then
-                       if session.resource then
-                               hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
-                       end
-                               
-                       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;
-                       end
-               else
-                       log("error", "host or session table didn't exist, please report this! Host: %s [%s] Sessions: %s [%s]", 
-                                       tostring(hosts[session.host]), tostring(session.host),
-                                       tostring(hosts[session.host].sessions[session.username] ), tostring(session.username));
+       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)
@@ -103,6 +112,7 @@ function make_authenticated(session, username)
        if session.type == "c2s_unauthed" then
                session.type = "c2s";
        end
+       session.log("info", "Authenticated as %s@%s", username or "(unknown)", session.host or "(unknown)");
        return true;
 end
 
@@ -113,13 +123,14 @@ 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
 
-       session.conntimetotal = gettime()-session.conntime;
-       
-       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
-               hosts[session.host].sessions[session.username] = { sessions = {} };
+               local sessions = { sessions = {} };
+               hosts[session.host].sessions[session.username] = sessions;
+               bare_sessions[session.username..'@'..session.host] = sessions;
        else
                local sessions = hosts[session.host].sessions[session.username].sessions;
                local limit = config_get(session.host, "core", "max_resources") or 10;
@@ -138,10 +149,14 @@ function bind_resource(session, resource)
                        elseif policy == "kick_new" then
                                return nil, "cancel", "conflict", "Resource already exists";
                        else -- if policy == "kick_old" then
-                               hosts[session.host].sessions[session.username].sessions[resource]:close {
+                               sessions[resource]:close {
                                        condition = "conflict";
                                        text = "Replaced by new connection";
                                };
+                               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
                                local count = 1;
@@ -156,57 +171,87 @@ function bind_resource(session, resource)
        session.resource = resource;
        session.full_jid = session.username .. '@' .. session.host .. '/' .. resource;
        hosts[session.host].sessions[session.username].sessions[resource] = session;
+       full_sessions[session.full_jid] = session;
        
        session.roster = rm_load_roster(session.username, session.host);
        
+       hosts[session.host].events.fire_event("resource-bind", {session=session});
+       
        return true;
 end
 
 function streamopened(session, attr)
-                                               local send = session.send;
-                                               session.host = attr.to or error("Client failed to specify destination hostname");
-                                               session.version = tonumber(attr.version) or 0;
-                                               session.streamid = m_random(1000000, 99999999);
-                                               (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
-                                               
-                                               
-                                               local features = st.stanza("stream:features");
-                                               fire_event("stream-features", session, features);
-                                               
-                                               send(features);
-                                               
-                                               (session.log or log)("info", "Sent reply <stream:stream> to client");
-                                               session.notopen = nil;
+       local send = session.send;
+       session.host = attr.to;
+       if not session.host then
+               session:close{ condition = "improper-addressing",
+                       text = "A 'to' attribute is required on stream headers" };
+               return;
+       end
+       session.host = nameprep(session.host);
+       session.version = tonumber(attr.version) or 0;
+       session.streamid = uuid_generate();
+       (session.log or session)("debug", "Client sent opening <stream:stream> to %s", 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);
+
+end
+
+function streamclosed(session)
+       session.log("debug", "Received </stream:stream>");
+       session:close();
 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
 
-return _M;
\ No newline at end of file
+return _M;