--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.4
+-- 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 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 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;
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.ip = conn.ip();
return session;
end
function destroy_session(session, err)
- (session.log or log)("info", "Destroying session");
+ (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);
+ pres:tag("status"):text("Disconnected: "..err):up();
session:dispatch_stanza(pres);
end
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;
+ full_sessions[session.full_jid] = 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;
+ bare_sessions[session.host..'@'..session.username] = nil;
end
else
log("error", "host or session table didn't exist, please report this! Host: %s [%s] Sessions: %s [%s]",
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
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();
--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.host..'@'..session.username] = sessions;
else
local sessions = hosts[session.host].sessions[session.username].sessions;
local limit = config_get(session.host, "core", "max_resources") or 10;
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 };
+ end
end
if increment and sessions[resource] then
local count = 1;
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);
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);
+ 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 <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
+
+ -- 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
- (session.log or log)("info", "Sent reply <stream:stream> to client");
- session.notopen = nil;
+ local features = st.stanza("stream:features");
+ fire_event("stream-features", session, features);
+
+ send(features);
+
+ (session.log or log)("debug", "Sent reply <stream:stream> to client");
+ session.notopen = nil;
+end
+
+function streamclosed(session)
+ session.send("</stream:stream>");
+ session.notopen = true;
end
function send_to_available_resources(user, host, stanza)
projects / prosody.git / blobdiff