X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fsessionmanager.lua;h=24be2e69205a8d57952ae6d01330ad44b02b0856;hb=ad90ce045af05bf847949e9bf6577b03c619ec8e;hp=f19721ed148f2045772abe23f5965ffe9fe9f5be;hpb=f9872e22a7a02e77dfeb037aed4db8aaa439dc56;p=prosody.git diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index f19721ed..24be2e69 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -1,55 +1,123 @@ local tonumber, tostring = tonumber, tostring; -local ipairs = ipairs; - -local m_random = math.random; -local format = string.format; - -local print = print; +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 modulemanager = require "core.modulemanager"; 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; module "sessionmanager" +local open_sessions = 0; + function new_session(conn) - local session = { conn = conn, notopen = true, priority = 0, type = "c2s_unauthed" }; + local session = { conn = conn, priority = 0, type = "c2s_unauthed" }; + if true then + session.trace = newproxy(true); + 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) -end - -function send_to_session(session, data) - log("debug", "Sending: %s", tostring(data)); - session.conn.write(tostring(data)); +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; + end + if hosts[session.host] and hosts[session.host].sessions[session.username] then + 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 + end + end + + for k in pairs(session) do + if k ~= "trace" then + session[k] = nil; + end + end end function make_authenticated(session, username) session.username = username; - session.resource = resource; if session.type == "c2s_unauthed" then session.type = "c2s"; end + return true; end +-- returns true, nil on success +-- returns nil, err_type, err, err_message on failure function bind_resource(session, resource) - if not session.username then return false, "auth"; end - if session.resource then return false, "constraint"; end -- We don't support binding multiple resources - resource = resource or math.random(100000, 99999999); -- FIXME: Clearly we have issues :) + if not session.username then return nil, "auth", "not-authorized", "Cannot bind resource before authentication"; end + 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(); --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 = {} }; 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 false, "conflict"; + 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 @@ -57,6 +125,8 @@ function bind_resource(session, resource) session.full_jid = session.username .. '@' .. session.host .. '/' .. resource; hosts[session.host].sessions[session.username].sessions[resource] = session; + session.roster = rm_load_roster(session.username, session.host); + return true; end @@ -65,22 +135,46 @@ function streamopened(session, attr) 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); - print(session, session.host, "Client opened stream"); - send(""); + (session.log or session)("debug", "Client sent opening to %s", session.host); + + + send(""); send(format("", session.streamid, session.host)); - local features = {}; + 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"); modulemanager.fire_event("stream-features", session, features); - send(""); + send(features); - for _, feature in ipairs(features) do - send_to_session(session, tostring(feature)); - end - - send(""); - log("info", "core", "Stream opened successfully"); + (session.log or log)("info", "Sent reply to client"); session.notopen = nil; end +function send_to_available_resources(user, host, stanza) + 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 + end + end + end + stanza.attr.to = to; + return count; +end + return _M; \ No newline at end of file