X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fxmppserver_listener.lua;h=1f27d841721cd4b6a1f5b5fabb18c1cb14405d20;hb=7b9f5dde4cdb0661198660080428e862df55bc01;hp=7c5b0d9cb62fc528038434440f83fce2d5219c26;hpb=9f1c9a4cfa4a75014a767a214c8d47413ff0fd8b;p=prosody.git diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index 7c5b0d9c..1f27d841 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -1,10 +1,39 @@ +-- Prosody IM +-- 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("xmppserver_listener"); local lxp = require "lxp" local init_xmlhandlers = require "core.xmlhandlers" -local sm_new_session = require "core.sessionmanager".new_session; local s2s_new_incoming = require "core.s2smanager".new_incoming; local s2s_streamopened = require "core.s2smanager".streamopened; +local s2s_streamclosed = require "core.s2smanager".streamclosed; +local s2s_destroy_session = require "core.s2smanager".destroy_session; +local s2s_attempt_connect = require "core.s2smanager".attempt_connection; +local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", + default_ns = "jabber:server", + streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza = core_process_stanza }; + +function stream_callbacks.error(session, error, data) + if error == "no-stream" then + session:close("invalid-namespace"); + else + session.log("debug", "Server-to-server XML parse error: %s", tostring(error)); + session:close("xml-not-well-formed"); + end +end + +local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end +function stream_callbacks.handlestanza(a, b) + xpcall(function () core_process_stanza(a, b) end, handleerr); +end local connlisteners_register = require "net.connlisteners".register; @@ -13,27 +42,70 @@ local t_concat = table.concat; 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 st = stanza; +local sessionmanager = require "core.sessionmanager"; +local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; +local st = require "util.stanza"; local sessions = {}; -local xmppserver = { default_port = 5269 }; +local xmppserver = { default_port = 5269, default_mode = "*a" }; -- These are session methods -- local function session_reset_stream(session) -- Reset stream - local parser = lxp.new(init_xmlhandlers(session, s2s_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 + log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " ")); + session:close("xml-not-well-formed"); end + return true; end + +local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'}; +local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:gsub("%|[^|]+$", ""), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" }; +local function session_close(session, reason) + local log = session.log or log; + if session.conn then + if session.notopen then + session.sends2s(""); + session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag()); + end + if reason then + if type(reason) == "string" then -- assume stream error + log("info", "Disconnecting %s[%s], is: %s", session.host or "(unknown host)", session.type, reason); + session.sends2s(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 %s[%s], is: %s", session.host or "(unknown host)", session.type, tostring(stanza)); + session.sends2s(stanza); + elseif reason.name then -- a stanza + log("info", "Disconnecting %s->%s[%s], is: %s", session.from_host or "(unknown host)", session.to_host or "(unknown host)", session.type, tostring(reason)); + session.sends2s(reason); + end + end + end + session.sends2s(""); + session.conn.close(); + xmppserver.disconnect(session.conn, "stream error"); + end +end + + -- End of session methods -- function xmppserver.listener(conn, data) @@ -44,45 +116,52 @@ function xmppserver.listener(conn, data) -- Logging functions -- - local mainlog, log = log; - do - local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$"); - log = logger.init(conn_name); - end - local print = function (...) log("info", t_concatall({...}, "\t")); end - session.log = log; - - print("Incoming s2s connection"); + + local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$"); + session.log = logger.init(conn_name); + + session.log("info", "Incoming s2s connection"); session.reset_stream = session_reset_stream; + session.close = session_close; session_reset_stream(session); -- Initialise, ready for use - -- FIXME: 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) - 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 xmppserver.disconnect(conn) +function xmppserver.disconnect(conn, err) + local session = sessions[conn]; + if session then + if err and err ~= "closed" and session.srv_hosts then + (session.log or log)("debug", "s2s connection closed unexpectedly"); + if s2s_attempt_connect(session, err) then + (session.log or log)("debug", "...so we're going to try again"); + return; -- Session lives for now + end + end + (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err)); + s2s_destroy_session(session); + sessions[conn] = nil; + session = nil; + collectgarbage("collect"); + end end function xmppserver.register_outgoing(conn, session) session.direction = "outgoing"; sessions[conn] = session; - session.reset_stream = session_reset_stream; + session.reset_stream = session_reset_stream; + session.close = session_close; session_reset_stream(session); -- Initialise, ready for use - -- FIXME: 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) - session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end + --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 end connlisteners_register("xmppserver", xmppserver); @@ -92,4 +171,4 @@ connlisteners_register("xmppserver", xmppserver); -- We also need to perform that same initialisation at other points (SASL, TLS, ...) -- ...and we need to handle data --- ...and record all sessions associated with connections \ No newline at end of file +-- ...and record all sessions associated with connections