+-- 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 logger = require "logger";
+local log = logger.init("xmppclient_listener");
local lxp = require "lxp"
local init_xmlhandlers = require "core.xmlhandlers"
local sm_new_session = require "core.sessionmanager".new_session;
local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
local m_random = math.random;
local format = string.format;
-local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session");
+local sessionmanager = require "core.sessionmanager";
+local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
local sm_streamopened = sessionmanager.streamopened;
-local st = stanza;
+local sm_streamclosed = sessionmanager.streamclosed;
+local st = require "util.stanza";
+
+local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream",
+ default_ns = "jabber:client",
+ streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
+
+function stream_callbacks.error(session, error, data)
+ if error == "no-stream" then
+ session.log("debug", "Invalid opening stream header");
+ session:close("invalid-namespace");
+ elseif session.close then
+ (session.log or log)("debug", "Client XML parse error: %s", tostring(error));
+ session:close("xml-not-well-formed");
+ end
+end
+
+local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), debug.traceback()); end
+function stream_callbacks.handlestanza(a, b)
+ xpcall(function () core_process_stanza(a, b) end, handleerr);
+end
local sessions = {};
-local xmppclient = { default_port = 5222 };
+local xmppclient = { default_port = 5222, default_mode = "*a" };
-- These are session methods --
local function session_reset_stream(session)
-- Reset stream
- local parser = lxp.new(init_xmlhandlers(session, sm_streamopened), "|");
+ local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|");
session.parser = parser;
session.notopen = true;
function session.data(conn, data)
- parser:parse(data);
+ local ok, err = parser:parse(data);
+ if ok then return; end
+ session:close("xml-not-well-formed");
end
+
return true;
end
+
+local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
+local function session_close(session, reason)
+ local log = session.log or log;
+ if session.conn then
+ if reason then
+ if type(reason) == "string" then -- assume stream error
+ log("info", "Disconnecting client, <stream:error> is: %s", reason);
+ session.send(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' }));
+ elseif type(reason) == "table" then
+ if reason.condition then
+ local stanza = st.stanza("stream:error"):tag(reason.condition, stream_xmlns_attr):up();
+ if reason.text then
+ stanza:tag("text", stream_xmlns_attr):text(reason.text):up();
+ end
+ if reason.extra then
+ stanza:add_child(reason.extra);
+ end
+ log("info", "Disconnecting client, <stream:error> is: %s", tostring(stanza));
+ session.send(stanza);
+ elseif reason.name then -- a stanza
+ log("info", "Disconnecting client, <stream:error> is: %s", tostring(reason));
+ session.send(reason);
+ end
+ end
+ end
+ session.send("</stream:stream>");
+ session.conn.close();
+ xmppclient.disconnect(session.conn, reason.condition or reason or "session closed");
+ end
+end
+
+
-- End of session methods --
function xmppclient.listener(conn, data)
-- Logging functions --
- local mainlog, log = log;
- do
- local conn_name = tostring(conn):match("[a-f0-9]+$");
- log = logger.init(conn_name);
+ local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
+ session.log = logger.init(conn_name);
+
+ session.log("info", "Client connected");
+
+ -- Client is using legacy SSL (otherwise mod_tls sets this flag)
+ if conn.ssl() then
+ session.secure = true;
end
- local print = function (...) log("info", t_concatall({...}, "\t")); end
- session.log = log;
-
- print("Client connected");
session.reset_stream = session_reset_stream;
+ session.close = session_close;
session_reset_stream(session); -- Initialise, ready for use
- -- TODO: Below function should be session,stanza - and xmlhandlers should use :method() notation to call,
- -- this will avoid the useless indirection we have atm
- -- (I'm on a mission, no time to fix now)
-
- -- Debug version --
- local function handleerr(err) print("Traceback:", err, debug.traceback()); end
- session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end
-
--- session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end
-
+ session.dispatch_stanza = stream_callbacks.handlestanza;
end
if data then
session.data(conn, data);
end
end
-function xmppclient.disconnect(conn)
+function xmppclient.disconnect(conn, err)
local session = sessions[conn];
if session then
- if session.last_presence and session.last_presence.attr.type ~= "unavailable" then
- local pres = st.presence{ type = "unavailable" };
- if err == "closed" then err = "connection closed"; end --FIXME where did err come from?
- pres:tag("status"):text("Disconnected: "..err);
- session.stanza_dispatch(pres);
- end
- sm_destroy_session(session);
+ (session.log or log)("info", "Client disconnected: %s", err);
+ sm_destroy_session(session, err);
sessions[conn] = nil;
session = nil;
collectgarbage("collect");
projects / prosody.git / blobdiff