# HG changeset patch # User Matthew Wild # Date 1228416540 0 # Node ID c80137472280e230335ba2e0cd6e457a5928d956 # Parent 265c4b8f0a8ae41974474e33adffb62ba3c7bdaa# Parent 60002993be048f53f6ae459150222fdf9480c24e Automated merge with http://waqas.ath.cx/ diff -r 265c4b8f0a8a -r c80137472280 core/s2smanager.lua --- a/core/s2smanager.lua Thu Dec 04 23:40:15 2008 +0500 +++ b/core/s2smanager.lua Thu Dec 04 18:49:00 2008 +0000 @@ -108,7 +108,7 @@ local log; do - local conn_name = "s2sout"..tostring(conn):match("[a-f0-9]*$"); + local conn_name = "s2sout"..tostring(host_session):match("[a-f0-9]*$"); log = logger_init(conn_name); host_session.log = log; end @@ -180,7 +180,9 @@ function streamopened(session, attr) local send = session.sends2s; - session.version = tonumber(attr.version) or 0; + -- TODO: #29: SASL/TLS on s2s streams + session.version = 0; --tonumber(attr.version) or 0; + if session.version >= 1.0 and not (attr.to and attr.from) then --print("to: "..tostring(attr.to).." from: "..tostring(attr.from)); log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC"); diff -r 265c4b8f0a8a -r c80137472280 core/xmlhandlers.lua --- a/core/xmlhandlers.lua Thu Dec 04 23:40:15 2008 +0500 +++ b/core/xmlhandlers.lua Thu Dec 04 18:49:00 2008 +0000 @@ -52,12 +52,13 @@ local chardata = {}; local xml_handlers = {}; local log = session.log or default_log; - --local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end - + local send = session.send; local cb_streamopened = stream_callbacks.streamopened; local cb_streamclosed = stream_callbacks.streamclosed; + local cb_error = stream_callbacks.error or function (e) error("XML stream error: "..tostring(e)); end; + local cb_handlestanza = stream_callbacks.handlestanza; local stanza function xml_handlers:StartElement(name, attr) @@ -92,12 +93,14 @@ if cb_streamopened then cb_streamopened(session, attr); end - return; + else + -- Garbage before stream? + cb_error("no-stream"); end - error("Client failed to open stream successfully"); + return; end if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then - error("Client sent invalid top-level stanza"); + cb_error("invalid-top-level-element"); end stanza = st.stanza(name, attr); @@ -119,15 +122,14 @@ curr_ns,name = name:match("^(.+)|([%w%-]+)$"); if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then if name == "stream" then - log("debug", "Stream closed"); if cb_streamclosed then cb_streamclosed(session); end return; elseif name == "error" then - error("Stream error: "..tostring(name)..": "..tostring(stanza)); + cb_error("stream-error", stanza); else - error("XML parse error in client stream with element: "..name); + cb_error("parse-error", "unexpected-element-close", name); end end if stanza and #chardata > 0 then @@ -137,7 +139,7 @@ end -- Complete stanza if #stanza.last_add == 0 then - session.stanza_dispatch(stanza); + cb_handlestanza(session, stanza); stanza = nil; else stanza:up(); diff -r 265c4b8f0a8a -r c80137472280 net/xmppclient_listener.lua --- a/net/xmppclient_listener.lua Thu Dec 04 23:40:15 2008 +0500 +++ b/net/xmppclient_listener.lua Thu Dec 04 18:49:00 2008 +0000 @@ -36,7 +36,7 @@ local sm_streamclosed = sessionmanager.streamclosed; local st = stanza; -local stream_callbacks = { streamopened = sm_streamopened, streamclosed = sm_streamclosed }; +local stream_callbacks = { streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza }; local sessions = {}; local xmppclient = { default_port = 5222, default_mode = "*a" }; @@ -101,7 +101,7 @@ local mainlog, log = log; do - local conn_name = tostring(conn):match("[a-f0-9]+$"); + local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$"); log = logger.init(conn_name); end local print = function (...) log("info", t_concatall({...}, "\t")); end @@ -119,8 +119,9 @@ -- (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 + --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 if data then session.data(conn, data); diff -r 265c4b8f0a8a -r c80137472280 net/xmppserver_listener.lua --- a/net/xmppserver_listener.lua Thu Dec 04 23:40:15 2008 +0500 +++ b/net/xmppserver_listener.lua Thu Dec 04 18:49:00 2008 +0000 @@ -28,7 +28,7 @@ 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 = { streamopened = s2s_streamopened, streamclosed = s2s_streamclosed }; +local stream_callbacks = { streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza = core_process_stanza }; local connlisteners_register = require "net.connlisteners".register; @@ -121,8 +121,8 @@ -- (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 +-- 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 if data then session.data(conn, data);