Software `/` code `/` prosody

Annotate

net/xmppserver_listener.lua @ 1926:e1c5b537f240

mod_tls: Mark sessions as not secure when negotiating outward TLS, so they get marked secure later. Fixes missing (encrypted) for outgoing sessions in s2s:show(). Thanks albert, McKael :)

author	Matthew Wild <mwild1@gmail.com>
date	Tue, 06 Oct 2009 10:34:13 +0100
parent	1902:a7b06e2539c8
child	1953:64538c620450

rev	line source
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1040 diff changeset	1 -- Prosody IM
760 90ce865eebd8 Update copyright notices for 2009 Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	2 -- Copyright (C) 2008-2009 Matthew Wild
90ce865eebd8 Update copyright notices for 2009 Matthew Wild <mwild1@gmail.com> parents: 759 diff changeset	3 -- Copyright (C) 2008-2009 Waqas Hussain
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	4 --
758 b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 625 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 625 diff changeset	6 -- COPYING file in the source package for more information.
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	7 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	8
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 451 diff changeset	9
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	10
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	11 local logger = require "logger";
1040 4c79b28bce64 xmpp{server,client}_listener: Fix global accesses Matthew Wild <mwild1@gmail.com> parents: 990 diff changeset	12 local log = logger.init("xmppserver_listener");
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	13 local lxp = require "lxp"
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	14 local init_xmlhandlers = require "core.xmlhandlers"
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	15 local s2s_new_incoming = require "core.s2smanager".new_incoming;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	16 local s2s_streamopened = require "core.s2smanager".streamopened;
342 52f75260a22d Incorrect function set as callback Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	17 local s2s_streamclosed = require "core.s2smanager".streamclosed;
163 3fec9b512d4e Clean up session when s2s connections are disconnected Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	18 local s2s_destroy_session = require "core.s2smanager".destroy_session;
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 431 diff changeset	19 local s2s_attempt_connect = require "core.s2smanager".attempt_connection;
900 686e3e4a7e15 net.xmppserver_listener: Set default namespace to jabber:server Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	20 local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\|stream",
686e3e4a7e15 net.xmppserver_listener: Set default namespace to jabber:server Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	21 default_ns = "jabber:server",
686e3e4a7e15 net.xmppserver_listener: Set default namespace to jabber:server Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	22 streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza = core_process_stanza };
557 c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	23
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	24 function stream_callbacks.error(session, error, data)
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	25 if error == "no-stream" then
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	26 session:close("invalid-namespace");
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	27 else
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	28 session.log("debug", "Server-to-server XML parse error: %s", tostring(error));
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	29 session:close("xml-not-well-formed");
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	30 end
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	31 end
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 330 diff changeset	32
611 7bb91fcddaf8 Fix blank tracebacks for c2s/s2s connections Matthew Wild <mwild1@gmail.com> parents: 604 diff changeset	33 local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
585 033817e12ddb Code tidying for xmpp{client,server}_listeners Matthew Wild <mwild1@gmail.com> parents: 557 diff changeset	34 function stream_callbacks.handlestanza(a, b)
033817e12ddb Code tidying for xmpp{client,server}_listeners Matthew Wild <mwild1@gmail.com> parents: 557 diff changeset	35 xpcall(function () core_process_stanza(a, b) end, handleerr);
033817e12ddb Code tidying for xmpp{client,server}_listeners Matthew Wild <mwild1@gmail.com> parents: 557 diff changeset	36 end
033817e12ddb Code tidying for xmpp{client,server}_listeners Matthew Wild <mwild1@gmail.com> parents: 557 diff changeset	37
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	38 local connlisteners_register = require "net.connlisteners".register;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	39
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 local t_insert = table.insert;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	41 local t_concat = table.concat;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 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
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	43 local m_random = math.random;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	44 local format = string.format;
1040 4c79b28bce64 xmpp{server,client}_listener: Fix global accesses Matthew Wild <mwild1@gmail.com> parents: 990 diff changeset	45 local sessionmanager = require "core.sessionmanager";
4c79b28bce64 xmpp{server,client}_listener: Fix global accesses Matthew Wild <mwild1@gmail.com> parents: 990 diff changeset	46 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
4c79b28bce64 xmpp{server,client}_listener: Fix global accesses Matthew Wild <mwild1@gmail.com> parents: 990 diff changeset	47 local st = require "util.stanza";
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	48
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	49 local sessions = {};
451 e9f269e5204e No more reading 1 byte at a time from sockets Matthew Wild <mwild1@gmail.com> parents: 434 diff changeset	50 local xmppserver = { default_port = 5269, default_mode = "*a" };
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	51
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	52 -- These are session methods --
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	53
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 local function session_reset_stream(session)
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	55 -- Reset stream
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 330 diff changeset	56 local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "\|");
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	57 session.parser = parser;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	58
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 session.notopen = true;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	60
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	61 function session.data(conn, data)
557 c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	62 local ok, err = parser:parse(data);
c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	63 if ok then return; end
1877 23c39f66406f xmppserver_listener: Better log messages on invalid XML Matthew Wild <mwild1@gmail.com> parents: 1686 diff changeset	64 session.log("warn", "Received invalid XML: %s", data);
23c39f66406f xmppserver_listener: Better log messages on invalid XML Matthew Wild <mwild1@gmail.com> parents: 1686 diff changeset	65 session.log("warn", "Problem was: %s", err);
557 c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	66 session:close("xml-not-well-formed");
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	67 end
557 c9b3ffb08fe3 Disconnect with stream errors on bad XML, or invalid stream namespace Matthew Wild <mwild1@gmail.com> parents: 545 diff changeset	68
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	69 return true;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	70 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	71
330 d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	72 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
1617 c6e175a0d83b xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120 Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	73 local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:gsub("%\|[^\|]+$", ""), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
333 8d15b073fdbe session:disconnect() -> session:close() for consistency with other Lua APIs Matthew Wild <mwild1@gmail.com> parents: 331 diff changeset	74 local function session_close(session, reason)
330 d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	75 local log = session.log or log;
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	76 if session.conn then
1617 c6e175a0d83b xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120 Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	77 if session.notopen then
c6e175a0d83b xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120 Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	78 session.sends2s("<?xml version='1.0'?>");
c6e175a0d83b xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120 Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	79 session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag());
c6e175a0d83b xmpp{client,server,component]_listener: Open stream if sending an error and it isn't already open. Fixes #120 Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	80 end
330 d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	81 if reason then
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	82 if type(reason) == "string" then -- assume stream error
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	83 log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, reason);
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 330 diff changeset	84 session.sends2s(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' }));
330 d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	85 elseif type(reason) == "table" then
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	86 if reason.condition then
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	87 local stanza = st.stanza("stream:error"):tag(reason.condition, stream_xmlns_attr):up();
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	88 if reason.text then
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	89 stanza:tag("text", stream_xmlns_attr):text(reason.text):up();
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	90 end
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	91 if reason.extra then
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	92 stanza:add_child(reason.extra);
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	93 end
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	94 log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, tostring(stanza));
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 330 diff changeset	95 session.sends2s(stanza);
330 d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	96 elseif reason.name then -- a stanza
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 330 diff changeset	97 log("info", "Disconnecting %s->%s[%s], <stream:error> is: %s", session.from_host or "(unknown host)", session.to_host or "(unknown host)", session.type, tostring(reason));
830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 330 diff changeset	98 session.sends2s(reason);
330 d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	99 end
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	100 end
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	101 end
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 330 diff changeset	102 session.sends2s("</stream:stream>");
330 d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	103 session.conn.close();
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	104 xmppserver.disconnect(session.conn, "stream error");
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	105 end
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	106 end
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	107
d9d4c1de16ce s2s sessions can now be disconnected, with or without a stream error. Fixes #8 Matthew Wild <mwild1@gmail.com> parents: 232 diff changeset	108
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	109 -- End of session methods --
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	110
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	111 function xmppserver.listener(conn, data)
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	112 local session = sessions[conn];
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	113 if not session then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	114 session = s2s_new_incoming(conn);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	115 sessions[conn] = session;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	116
1879 42157c066813 xmppserver_listener: Add logger to s2s sessions Matthew Wild <mwild1@gmail.com> parents: 1878 diff changeset	117 -- Logging functions --
42157c066813 xmppserver_listener: Add logger to s2s sessions Matthew Wild <mwild1@gmail.com> parents: 1878 diff changeset	118
42157c066813 xmppserver_listener: Add logger to s2s sessions Matthew Wild <mwild1@gmail.com> parents: 1878 diff changeset	119
42157c066813 xmppserver_listener: Add logger to s2s sessions Matthew Wild <mwild1@gmail.com> parents: 1878 diff changeset	120 local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$");
42157c066813 xmppserver_listener: Add logger to s2s sessions Matthew Wild <mwild1@gmail.com> parents: 1878 diff changeset	121 session.log = logger.init(conn_name);
42157c066813 xmppserver_listener: Add logger to s2s sessions Matthew Wild <mwild1@gmail.com> parents: 1878 diff changeset	122
585 033817e12ddb Code tidying for xmpp{client,server}_listeners Matthew Wild <mwild1@gmail.com> parents: 557 diff changeset	123 session.log("info", "Incoming s2s connection");
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	124
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	125 session.reset_stream = session_reset_stream;
333 8d15b073fdbe session:disconnect() -> session:close() for consistency with other Lua APIs Matthew Wild <mwild1@gmail.com> parents: 331 diff changeset	126 session.close = session_close;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	127
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	128 session_reset_stream(session); -- Initialise, ready for use
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	129
604 b6a31e97d018 stanza_dispatch != dispatch_stanza Matthew Wild <mwild1@gmail.com> parents: 598 diff changeset	130 session.dispatch_stanza = stream_callbacks.handlestanza;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	131 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	132 if data then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	133 session.data(conn, data);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	134 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	135 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	136
1880 d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	137 function xmppserver.status(conn, status)
d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	138 if status == "ssl-handshake-complete" then
d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	139 local session = sessions[conn];
d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	140 if session and session.direction == "outgoing" then
d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	141 local format, to_host, from_host = string.format, session.to_host, session.from_host;
1902 a7b06e2539c8 xmppserver_listener: Lower log-level of debug message to, er, 'debug' Matthew Wild <mwild1@gmail.com> parents: 1880 diff changeset	142 session.log("debug", "Sending stream header...");
1880 d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	143 session.sends2s(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0'>]], from_host, to_host));
d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	144 end
d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	145 end
d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	146 end
d5dc9e06d917 xmppserver_listener: Add status() function to signal when a connection completes its SSL handshake Matthew Wild <mwild1@gmail.com> parents: 1879 diff changeset	147
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 431 diff changeset	148 function xmppserver.disconnect(conn, err)
163 3fec9b512d4e Clean up session when s2s connections are disconnected Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	149 local session = sessions[conn];
3fec9b512d4e Clean up session when s2s connections are disconnected Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	150 if session then
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 431 diff changeset	151 if err and err ~= "closed" and session.srv_hosts then
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 900 diff changeset	152 (session.log or log)("debug", "s2s connection closed unexpectedly");
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 431 diff changeset	153 if s2s_attempt_connect(session, err) then
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 900 diff changeset	154 (session.log or log)("debug", "...so we're going to try again");
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 431 diff changeset	155 return; -- Session lives for now
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 431 diff changeset	156 end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 431 diff changeset	157 end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 431 diff changeset	158 (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err));
163 3fec9b512d4e Clean up session when s2s connections are disconnected Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	159 s2s_destroy_session(session);
3fec9b512d4e Clean up session when s2s connections are disconnected Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	160 sessions[conn] = nil;
3fec9b512d4e Clean up session when s2s connections are disconnected Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	161 session = nil;
3fec9b512d4e Clean up session when s2s connections are disconnected Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	162 collectgarbage("collect");
3fec9b512d4e Clean up session when s2s connections are disconnected Matthew Wild <mwild1@gmail.com> parents: 148 diff changeset	163 end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	164 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	165
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	166 function xmppserver.register_outgoing(conn, session)
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	167 session.direction = "outgoing";
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	168 sessions[conn] = session;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	169
990 235abebc896e xmppserver_listener: Add session:close() method to outgoing s2s connections too Matthew Wild <mwild1@gmail.com> parents: 974 diff changeset	170 session.reset_stream = session_reset_stream;
235abebc896e xmppserver_listener: Add session:close() method to outgoing s2s connections too Matthew Wild <mwild1@gmail.com> parents: 974 diff changeset	171 session.close = session_close;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	172 session_reset_stream(session); -- Initialise, ready for use
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	173
585 033817e12ddb Code tidying for xmpp{client,server}_listeners Matthew Wild <mwild1@gmail.com> parents: 557 diff changeset	174 --local function handleerr(err) print("Traceback:", err, debug.traceback()); end
033817e12ddb Code tidying for xmpp{client,server}_listeners Matthew Wild <mwild1@gmail.com> parents: 557 diff changeset	175 --session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	176 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	177
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	178 connlisteners_register("xmppserver", xmppserver);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	179
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	180
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	181 -- We need to perform some initialisation when a connection is created
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	182 -- We also need to perform that same initialisation at other points (SASL, TLS, ...)
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	183
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	184 -- ...and we need to handle data
226 ba4711c4e8d2 Committing code to get nicer tracebacks for errors, also we no longer consider such errors fatal (probably a bad thing, I know...) Matthew Wild <mwild1@gmail.com> parents: 163 diff changeset	185 -- ...and record all sessions associated with connections

prosody

e1c5b537f240

net/xmppserver_listener.lua

Software / code / prosody

Annotate

net/xmppserver_listener.lua @ 1926:e1c5b537f240

Software `/` code `/` prosody