X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=core%2Fsessionmanager.lua;h=64f6df9732aef0b437614f9f3bc1eabdfca2bbc2;hb=489e8504301004d44240e4b9cb7194340d869a0a;hp=9fa002124ffb7f40de305d4103c4970b82e2e926;hpb=24ff4888ceaa8e8cc43f3238f473e6aa9ca1d30a;p=prosody.git diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 9fa00212..64f6df97 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -1,3 +1,12 @@ +-- Prosody IM v0.2 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 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,13 @@ 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 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 +38,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("info", "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) +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); + 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,11 +88,6 @@ 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 @@ -81,9 +109,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 @@ -101,21 +155,25 @@ 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 = {}; - modulemanager.fire_event("stream-features", session, 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 - send(""); - for _, feature in ipairs(features) do - send_to_session(session, tostring(feature)); - end - - send(""); - log("info", "Stream opened successfully"); + local features = st.stanza("stream:features"); + fire_event("stream-features", session, features); + + send(features); + + (session.log or log)("info", "Sent reply to client"); session.notopen = nil; end @@ -139,4 +197,4 @@ function send_to_available_resources(user, host, stanza) return count; end -return _M; \ No newline at end of file +return _M;