Forced merge.

[prosody.git] / core / sessionmanager.lua

diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 331575671f8da722c8364654f3b6bb7208849f01..24be2e69205a8d57952ae6d01330ad44b02b0856 100644 (file)
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -13,6 +13,9 @@ local log = require "util.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 st = require "util.stanza";
 
 local newproxy = newproxy;
 local getmetatable = getmetatable;
@@ -28,13 +31,24 @@ function new_session(conn)
                getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") end;
        end
        open_sessions = open_sessions + 1;
+       log("info", "open sessions now: ".. open_sessions);
        local w = conn.write;
        session.send = function (t) w(tostring(t)); end
        return session;
 end
 
-function destroy_session(session)
+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.stanza_dispatch(pres);
+       end
+       
+       -- Remove session/resource from user's session list
        if session.host and session.username then
                if session.resource then
                        hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
@@ -46,8 +60,7 @@ function destroy_session(session)
                        end
                end
        end
-       session.conn = nil;
-       session.disconnect = nil;
+       
        for k in pairs(session) do
                if k ~= "trace" then
                        session[k] = nil;
@@ -76,9 +89,35 @@ function bind_resource(session, resource)
        if not hosts[session.host].sessions[session.username] then
                hosts[session.host].sessions[session.username] = { sessions = {} };
        else
-               if hosts[session.host].sessions[session.username].sessions[resource] then
+               local sessions = hosts[session.host].sessions[session.username].sessions;
+               local limit = config_get(session.host, "core", "max_resources") or 10;
+               if #sessions >= limit then
+                       return nil, "cancel", "conflict", "Resource limit reached; only "..limit.." resources allowed";
+               end
+               if sessions[resource] then
                        -- Resource conflict
-                       return nil, "cancel", "conflict", "Resource already exists"; -- TODO kick old resource
+                       local policy = config_get(session.host, "core", "conflict_resolve");
+                       local increment;
+                       if policy == "random" then
+                               resource = uuid_generate();
+                               increment = true;
+                       elseif policy == "increment" then
+                               increment = true; -- TODO ping old 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 {
+                                       condition = "conflict";
+                                       text = "Replaced by new connection";
+                               };
+                       end
+                       if increment and sessions[resource] then
+                               local count = 1;
+                               while sessions[resource.."#"..count] do
+                                       count = count + 1;
+                               end
+                               resource = resource.."#"..count;
+                       end
                end
        end
        
@@ -104,23 +143,17 @@ function streamopened(session, attr)
                                                
                                                if not hosts[session.host] then
                                                        -- We don't serve this host...
-                                                       session:disconnect{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
+                                                       session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
                                                        return;
                                                end
                                                
                                                
-                                               local features = {};
+                                               local features = st.stanza("stream:features");
                                                modulemanager.fire_event("stream-features", session, features);
                                                
-                                               -- FIXME: Need to send() this all at once
-                                               send("<stream:features>");
+                                               send(features);
                                                
-                                               for _, feature in ipairs(features) do
-                                                       send(tostring(feature));
-                                               end
- 
-                                               send("</stream:features>");
-                                               log("info", "Stream opened successfully");
+                                               (session.log or log)("info", "Sent reply <stream:stream> to client");
                                                session.notopen = nil;
 end