X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fsessionmanager.lua;h=68493d87cb506e6cf90d6e2dad0839801ada87b6;hb=34215744d79b2fcf146b69a59007d104085dff4a;hp=2b7659d26d36b76c7f46c88924d0689e332bb8f3;hpb=e9a8b9230d8614b2b02438519d02719d6be6a86b;p=prosody.git diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 2b7659d2..68493d87 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -1,3 +1,12 @@ +-- Prosody IM v0.4 +-- Copyright (C) 2008-2009 Matthew Wild +-- Copyright (C) 2008-2009 Waqas Hussain +-- +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. +-- + + local tonumber, tostring = tonumber, tostring; local ipairs, pairs, print, next= ipairs, pairs, print, next; @@ -13,6 +22,14 @@ 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 nameprep = require "util.encodings".stringprep.nameprep; + +local fire_event = require "core.eventmanager".fire_event; + +local gettime = require "socket".gettime; + +local st = require "util.stanza"; local newproxy = newproxy; local getmetatable = getmetatable; @@ -22,32 +39,49 @@ module "sessionmanager" local open_sessions = 0; function new_session(conn) - local session = { conn = conn, priority = 0, type = "c2s_unauthed" }; + local session = { conn = conn, priority = 0, type = "c2s_unauthed", conntime = gettime() }; 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; + getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end; end 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(); return session; end -function destroy_session(session) - session.log("info", "Destroying session"); +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.host and session.username then - if session.resource then - hosts[session.host].sessions[session.username].sessions[session.resource] = nil; - end + -- 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)); end end - session.conn = nil; - session.disconnect = nil; + for k in pairs(session) do if k ~= "trace" then session[k] = nil; @@ -55,31 +89,60 @@ function destroy_session(session) end end -function send_to_session(session, data) - log("debug", "Sending: %s", tostring(data)); - session.conn.write(tostring(data)); -end - function make_authenticated(session, username) session.username = 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 +-- 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 + 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"; -- 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 + sessions[resource]:close { + condition = "conflict"; + text = "Replaced by new connection"; + }; + if not next(sessions) then + hosts[session.host].sessions[session.username] = { sessions = sessions }; + end + 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 @@ -93,26 +156,54 @@ function bind_resource(session, resource) 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); - print(session, session.host, "Client opened stream"); - send(""); - send(format("", session.streamid, session.host)); - - local features = {}; - modulemanager.fire_event("stream-features", session, features); - - send(""); + local send = session.send; + 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.log or session)("debug", "Client sent opening to %s", session.host); + + send(""); + send(format("", 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 - for _, feature in ipairs(features) do - send_to_session(session, tostring(feature)); - end - - send(""); - log("info", "Stream opened successfully"); - session.notopen = nil; + local features = st.stanza("stream:features"); + fire_event("stream-features", session, features); + + send(features); + + (session.log or log)("debug", "Sent reply to client"); + session.notopen = nil; +end + +function streamclosed(session) + session.send(""); + session.notopen = true; +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 +return _M;