Software `/` code `/` prosody

Annotate

core/s2smanager.lua @ 3383:c7acddf80583

s2smanager: Handle disallow_s2s for incoming streams as well as outgoing

author	Matthew Wild <mwild1@gmail.com>
date	Fri, 16 Jul 2010 22:47:26 +0100
parent	3329:9adafeeadecb
child	3431:c499f4752cd8

rev	line source
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1492 diff changeset	1 -- Prosody IM
2923 b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2889 diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2889 diff changeset	3 -- Copyright (C) 2008-2010 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: 739 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 739 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 hosts = hosts;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 local sessions = sessions;
631 6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	13 local core_process_stanza = function(a, b) core_process_stanza(a, b); end
1204 dea89234e545 s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config) Matthew Wild <mwild1@gmail.com> parents: 1199 diff changeset	14 local add_task = require "util.timer".add_task;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	15 local socket = require "socket";
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	16 local format = string.format;
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	17 local t_insert, t_sort = table.insert, table.sort;
255 43a9683bcd19 Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...) Matthew Wild <mwild1@gmail.com> parents: 254 diff changeset	18 local get_traceback = debug.traceback;
2746 3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	19 local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber,
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	20 setmetatable
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	21 = tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber,
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	22 setmetatable;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	23
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	24 local idna_to_ascii = require "util.encodings".idna.to_ascii;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 local connlisteners_get = require "net.connlisteners".get;
3146 aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	26 local initialize_filters = require "util.filters".initialize;
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 631 diff changeset	27 local wrapclient = require "net.server".wrapclient;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	28 local modulemanager = require "core.modulemanager";
244 0e3bda34f958 Missed importing a function in last commit Matthew Wild <mwild1@gmail.com> parents: 243 diff changeset	29 local st = require "stanza";
0e3bda34f958 Missed importing a function in last commit Matthew Wild <mwild1@gmail.com> parents: 243 diff changeset	30 local stanza = st.stanza;
931 4514ed5ee943 Fixed: s2smanager: Apply nameprep on hostnames passed in stream tag (part of issue #57) Waqas Hussain <waqas20@gmail.com> parents: 896 diff changeset	31 local nameprep = require "util.encodings".stringprep.nameprep;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	32
1889 e875833ae08e s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0 Matthew Wild <mwild1@gmail.com> parents: 1888 diff changeset	33 local fire_event = require "core.eventmanager".fire_event;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	34 local uuid_gen = require "util.uuid".generate;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	35
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	36 local logger_init = require "util.logger".init;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	37
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	38 local log = logger_init("s2smanager");
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	39
448 2623519b25b0 Switched from md5 to sha256 for dialback key generation Waqas Hussain <waqas20@gmail.com> parents: 435 diff changeset	40 local sha256_hash = require "util.hashes".sha256;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	41
1793 1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs Matthew Wild <mwild1@gmail.com> parents: 1791 diff changeset	42 local adns, dns = require "net.adns", require "net.dns";
1962 3e7231c6d6a9 s2smanager: Fix access of 'config' global without requiring configmanager Matthew Wild <mwild1@gmail.com> parents: 1936 diff changeset	43 local config = require "core.configmanager";
1796 5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	44 local connect_timeout = config.get("*", "core", "s2s_timeout") or 60;
3329 9adafeeadecb s2smanager: Lower default DNS timeout to 15s (it's now a per-DNS-server timeout, rather than total timeout), use net.dns's new timeout system, and remove our custom timeout handlers Matthew Wild <mwild1@gmail.com> parents: 3312 diff changeset	45 local dns_timeout = config.get("*", "core", "dns_timeout") or 15;
1805 7e41ad68fe3c core.s2smanager: Don't recurse CNAMEs infinitely :) Matthew Wild <mwild1@gmail.com> parents: 1796 diff changeset	46 local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3;
1204 dea89234e545 s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config) Matthew Wild <mwild1@gmail.com> parents: 1199 diff changeset	47
3329 9adafeeadecb s2smanager: Lower default DNS timeout to 15s (it's now a per-DNS-server timeout, rather than total timeout), use net.dns's new timeout system, and remove our custom timeout handlers Matthew Wild <mwild1@gmail.com> parents: 3312 diff changeset	48 dns.settimeout(dns_timeout);
9adafeeadecb s2smanager: Lower default DNS timeout to 15s (it's now a per-DNS-server timeout, rather than total timeout), use net.dns's new timeout system, and remove our custom timeout handlers Matthew Wild <mwild1@gmail.com> parents: 3312 diff changeset	49
621 cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	50 incoming_s2s = {};
1976 5f3eaab987c3 s2smanager: Add incoming_s2s to the prosody object Matthew Wild <mwild1@gmail.com> parents: 1962 diff changeset	51 _G.prosody.incoming_s2s = incoming_s2s;
621 cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	52 local incoming_s2s = incoming_s2s;
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	53
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 module "s2smanager"
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	55
2711 5d97fb043141 s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 2165 diff changeset	56 function compare_srv_priorities(a,b)
5d97fb043141 s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 2165 diff changeset	57 return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight);
5d97fb043141 s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 2165 diff changeset	58 end
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	59
2781 4b5881b6bbfc s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas Matthew Wild <mwild1@gmail.com> parents: 2780 diff changeset	60 local function bounce_sendq(session, reason)
631 6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	61 local sendq = session.sendq;
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	62 if sendq then
1075 831c84cbf5fa s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible Matthew Wild <mwild1@gmail.com> parents: 1007 diff changeset	63 session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
631 6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	64 local dummy = {
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	65 type = "s2sin";
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	66 send = function(s)
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	67 (session.log or log)("error", "Replying to to an s2s error reply, please report this! Traceback: %s", get_traceback());
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	68 end;
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	69 dummy = true;
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	70 };
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	71 for i, data in ipairs(sendq) do
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	72 local reply = data[2];
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	73 local xmlns = reply.attr.xmlns;
2949 ef19faa7d106 stanza_router, s2smanager, modulemanager: Fix for handling of the default namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted Matthew Wild <mwild1@gmail.com> parents: 2923 diff changeset	74 if not xmlns then
631 6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	75 reply.attr.type = "error";
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	76 reply:tag("error", {type = "cancel"})
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	77 :tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
2781 4b5881b6bbfc s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas Matthew Wild <mwild1@gmail.com> parents: 2780 diff changeset	78 if reason then
4b5881b6bbfc s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas Matthew Wild <mwild1@gmail.com> parents: 2780 diff changeset	79 reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):text("Connection failed: "..reason):up();
4b5881b6bbfc s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas Matthew Wild <mwild1@gmail.com> parents: 2780 diff changeset	80 end
631 6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	81 core_process_stanza(dummy, reply);
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	82 end
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	83 sendq[i] = nil;
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	84 end
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	85 session.sendq = nil;
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	86 end
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	87 end
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	88
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	89 function send_to_host(from_host, to_host, data)
2165 529af807ba1a s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter) Matthew Wild <mwild1@gmail.com> parents: 2090 diff changeset	90 if not hosts[from_host] then
529af807ba1a s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter) Matthew Wild <mwild1@gmail.com> parents: 2090 diff changeset	91 log("warn", "Attempt to send stanza from %s - a host we don't serve", from_host);
529af807ba1a s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter) Matthew Wild <mwild1@gmail.com> parents: 2090 diff changeset	92 return false;
529af807ba1a s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter) Matthew Wild <mwild1@gmail.com> parents: 2090 diff changeset	93 end
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	94 local host = hosts[from_host].s2sout[to_host];
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	95 if host then
241 021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	96 -- We have a connection to this host already
2949 ef19faa7d106 stanza_router, s2smanager, modulemanager: Fix for handling of the default namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted Matthew Wild <mwild1@gmail.com> parents: 2923 diff changeset	97 if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) then
558 ab3960421356 Fix for s2s with jabberd2 (we weren't routing db:verify's over s2sout_unauthed) Matthew Wild <mwild1@gmail.com> parents: 544 diff changeset	98 (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);
241 021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	99
021ccf988f3b Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow Matthew Wild <mwild1@gmail.com> parents: 233 diff changeset	100 -- Queue stanza until we are able to send it
631 6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	101 if host.sendq then t_insert(host.sendq, {tostring(data), st.reply(data)});
6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	102 else host.sendq = { {tostring(data), st.reply(data)} }; end
559 fa4a51fe6442 Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings. Matthew Wild <mwild1@gmail.com> parents: 558 diff changeset	103 host.log("debug", "stanza [%s] queued ", data.name);
255 43a9683bcd19 Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...) Matthew Wild <mwild1@gmail.com> parents: 254 diff changeset	104 elseif host.type == "local" or host.type == "component" then
43a9683bcd19 Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...) Matthew Wild <mwild1@gmail.com> parents: 254 diff changeset	105 log("error", "Trying to send a stanza to ourselves??")
256 c14ddd0912a2 Print out the stanza also Matthew Wild <mwild1@gmail.com> parents: 255 diff changeset	106 log("error", "Traceback: %s", get_traceback());
258 a93ccd84db83 Yep, s2s definitely works now. This is just a small fix for logging... Matthew Wild <mwild1@gmail.com> parents: 257 diff changeset	107 log("error", "Stanza: %s", tostring(data));
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	108 else
253 f2869ded1d37 Another small fix, for logging in s2smanager Matthew Wild <mwild1@gmail.com> parents: 252 diff changeset	109 (host.log or log)("debug", "going to send stanza to "..to_host.." from "..from_host);
225 bbbd169b326b Just committing this warning, because I want to know if the problem really affects us Matthew Wild <mwild1@gmail.com> parents: 199 diff changeset	110 -- FIXME
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	111 if host.from_host ~= from_host then
254 6eb3dea1d68b Another small fix, for logging in s2smanager Matthew Wild <mwild1@gmail.com> parents: 253 diff changeset	112 log("error", "WARNING! This might, possibly, be a bug, but it might not...");
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	113 log("error", "We are going to send from %s instead of %s", tostring(host.from_host), tostring(from_host));
254 6eb3dea1d68b Another small fix, for logging in s2smanager Matthew Wild <mwild1@gmail.com> parents: 253 diff changeset	114 end
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	115 host.sends2s(data);
182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	116 host.log("debug", "stanza sent over "..host.type);
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	117 end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	118 else
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	119 log("debug", "opening a new outgoing connection for this stanza");
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	120 local host_session = new_outgoing(from_host, to_host);
2090 7810648ea26d s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas Matthew Wild <mwild1@gmail.com> parents: 2089 diff changeset	121
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	122 -- Store in buffer
631 6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	123 host_session.sendq = { {tostring(data), st.reply(data)} };
1006 9166d7a8c3c0 core.s2smanager: Logging improvements Matthew Wild <mwild1@gmail.com> parents: 995 diff changeset	124 log("debug", "stanza [%s] queued until connection complete", tostring(data.name));
9166d7a8c3c0 core.s2smanager: Logging improvements Matthew Wild <mwild1@gmail.com> parents: 995 diff changeset	125 if (not host_session.connecting) and (not host_session.conn) then
9166d7a8c3c0 core.s2smanager: Logging improvements Matthew Wild <mwild1@gmail.com> parents: 995 diff changeset	126 log("warn", "Connection to %s failed already, destroying session...", to_host);
9166d7a8c3c0 core.s2smanager: Logging improvements Matthew Wild <mwild1@gmail.com> parents: 995 diff changeset	127 destroy_session(host_session);
9166d7a8c3c0 core.s2smanager: Logging improvements Matthew Wild <mwild1@gmail.com> parents: 995 diff changeset	128 end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	129 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	130 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	131
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	132 local open_sessions = 0;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	133
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	134 function new_incoming(conn)
621 cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	135 local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} };
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	136 if true then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	137 session.trace = newproxy(true);
583 5821eaa80baa Remove print()s from sessionmanager and s2smanager Matthew Wild <mwild1@gmail.com> parents: 559 diff changeset	138 getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	139 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	140 open_sessions = open_sessions + 1;
343 cae2178b5623 Log sent s2s stanzas Matthew Wild <mwild1@gmail.com> parents: 337 diff changeset	141 local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
1686 232c2bf155c7 core.s2smanager, xmppserver_listener: Move the responsibility of setting session.log from the latter to the former for incoming sessions (outgoing are already like this) Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	142 session.log = log;
3146 aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	143 local filter = initialize_filters(session);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	144 session.sends2s = function (t)
3224 9dd54a708523 s2smanager: Move 'sending' debug log message so that it sees the pre-filtered stanzas Matthew Wild <mwild1@gmail.com> parents: 3152 diff changeset	145 log("debug", "sending: %s", t.top_tag and t:top_tag() or t:match("^([^>]*>?)"));
3146 aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	146 if t.name then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	147 t = filter("stanzas/out", t);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	148 end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	149 if t then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	150 t = filter("bytes/out", tostring(t));
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	151 if t then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	152 return w(conn, t);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	153 end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	154 end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	155 end
621 cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	156 incoming_s2s[session] = true;
1796 5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	157 add_task(connect_timeout, function ()
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	158 if session.conn ~= conn or
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	159 session.type == "s2sin" then
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	160 return; -- Ok, we're connect[ed\|ing]
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	161 end
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	162 -- Not connected, need to close session and clean up
2419 00d985639a06 s2smanager: Trim trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2382 diff changeset	163 (session.log or log)("warn", "Destroying incomplete session %s->%s due to inactivity",
1796 5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	164 session.from_host or "(unknown)", session.to_host or "(unknown)");
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	165 session:close("connection-timeout");
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	166 end);
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	167 return session;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	168 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	169
2422 affeb565b050 s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false) Matthew Wild <mwild1@gmail.com> parents: 2421 diff changeset	170 function new_outgoing(from_host, to_host, connect)
2419 00d985639a06 s2smanager: Trim trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2382 diff changeset	171 local host_session = { to_host = to_host, from_host = from_host, host = from_host,
2426 4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	172 notopen = true, type = "s2sout_unauthed", direction = "outgoing",
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	173 open_stream = session_open_stream };
1888 562635baad36 s2smanager: Give outgoing sessions a host field (the local one) Matthew Wild <mwild1@gmail.com> parents: 1836 diff changeset	174
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	175 hosts[from_host].s2sout[to_host] = host_session;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	176
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	177 local log;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	178 do
543 cf6e19ea1cbc Fix logger ids for c2s and s2sout Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	179 local conn_name = "s2sout"..tostring(host_session):match("[a-f0-9]*$");
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	180 log = logger_init(conn_name);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	181 host_session.log = log;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	182 end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	183
3146 aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	184 initialize_filters(host_session);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	185
2422 affeb565b050 s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false) Matthew Wild <mwild1@gmail.com> parents: 2421 diff changeset	186 if connect ~= false then
affeb565b050 s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false) Matthew Wild <mwild1@gmail.com> parents: 2421 diff changeset	187 -- Kick the connection attempting machine into life
affeb565b050 s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false) Matthew Wild <mwild1@gmail.com> parents: 2421 diff changeset	188 attempt_connection(host_session);
affeb565b050 s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false) Matthew Wild <mwild1@gmail.com> parents: 2421 diff changeset	189 end
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	190
2419 00d985639a06 s2smanager: Trim trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2382 diff changeset	191 if not host_session.sends2s then
1007 c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	192 -- A sends2s which buffers data (until the stream is opened)
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	193 -- note that data in this buffer will be sent before the stream is authed
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	194 -- and will not be ack'd in any way, successful or otherwise
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	195 local buffer;
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	196 function host_session.sends2s(data)
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	197 if not buffer then
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	198 buffer = {};
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	199 host_session.send_buffer = buffer;
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	200 end
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	201 log("debug", "Buffering data on unconnected s2sout to %s", to_host);
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	202 buffer[#buffer+1] = data;
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	203 log("debug", "Buffered item %d: %s", #buffer, tostring(data));
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	204 end
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	205 end
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	206
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	207 return host_session;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	208 end
353 e7d776b5ebb9 Remove an old FIXME comment Matthew Wild <mwild1@gmail.com> parents: 351 diff changeset	209
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	210
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	211 function attempt_connection(host_session, err)
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	212 local from_host, to_host = host_session.from_host, host_session.to_host;
3309 1c58cb93ef3e s2smanager: Don't attempt to connect to a nil host (for whatever reason... invalid DNS record perhaps?) (thanks dersd) Matthew Wild <mwild1@gmail.com> parents: 3151 diff changeset	213 local connect_host, connect_port = to_host and idna_to_ascii(to_host), 5269;
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	214
2090 7810648ea26d s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas Matthew Wild <mwild1@gmail.com> parents: 2089 diff changeset	215 if not connect_host then
7810648ea26d s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas Matthew Wild <mwild1@gmail.com> parents: 2089 diff changeset	216 return false;
7810648ea26d s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas Matthew Wild <mwild1@gmail.com> parents: 2089 diff changeset	217 end
7810648ea26d s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas Matthew Wild <mwild1@gmail.com> parents: 2089 diff changeset	218
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	219 if not err then -- This is our first attempt
1006 9166d7a8c3c0 core.s2smanager: Logging improvements Matthew Wild <mwild1@gmail.com> parents: 995 diff changeset	220 log("debug", "First attempt to connect to %s, starting with SRV lookup...", to_host);
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	221 host_session.connecting = true;
1791 42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	222 local handle;
1204 dea89234e545 s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config) Matthew Wild <mwild1@gmail.com> parents: 1199 diff changeset	223 handle = adns.lookup(function (answer)
dea89234e545 s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config) Matthew Wild <mwild1@gmail.com> parents: 1199 diff changeset	224 handle = nil;
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	225 host_session.connecting = nil;
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	226 if answer then
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	227 log("debug", to_host.." has SRV records, handling...");
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	228 local srv_hosts = {};
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	229 host_session.srv_hosts = srv_hosts;
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	230 for _, record in ipairs(answer) do
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	231 t_insert(srv_hosts, record.srv);
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	232 end
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	233 t_sort(srv_hosts, compare_srv_priorities);
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	234
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	235 local srv_choice = srv_hosts[1];
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	236 host_session.srv_choice = 1;
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	237 if srv_choice then
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	238 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	239 log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port);
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	240 end
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	241 else
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	242 log("debug", to_host.." has no SRV records, falling back to A");
337 4a1dd1c2c219 We have SRV resolving \o/ Matthew Wild <mwild1@gmail.com> parents: 333 diff changeset	243 end
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	244 -- Try with SRV, or just the plain hostname if no SRV
1492 aaeccebad0f3 s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly Matthew Wild <mwild1@gmail.com> parents: 1468 diff changeset	245 local ok, err = try_connect(host_session, connect_host, connect_port);
aaeccebad0f3 s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly Matthew Wild <mwild1@gmail.com> parents: 1468 diff changeset	246 if not ok then
aaeccebad0f3 s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly Matthew Wild <mwild1@gmail.com> parents: 1468 diff changeset	247 if not attempt_connection(host_session, err) then
aaeccebad0f3 s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly Matthew Wild <mwild1@gmail.com> parents: 1468 diff changeset	248 -- No more attempts will be made
2783 57611584e27d s2smanager: Give reasons to destroy_session in more cases, including when DNS lookup fails Matthew Wild <mwild1@gmail.com> parents: 2781 diff changeset	249 destroy_session(host_session, err);
1492 aaeccebad0f3 s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly Matthew Wild <mwild1@gmail.com> parents: 1468 diff changeset	250 end
aaeccebad0f3 s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly Matthew Wild <mwild1@gmail.com> parents: 1468 diff changeset	251 end
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	252 end, "_xmpp-server._tcp."..connect_host..".", "SRV");
1204 dea89234e545 s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config) Matthew Wild <mwild1@gmail.com> parents: 1199 diff changeset	253
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	254 return true; -- Attempt in progress
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	255 elseif host_session.srv_hosts and #host_session.srv_hosts > host_session.srv_choice then -- Not our first attempt, and we also have SRV
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	256 host_session.srv_choice = host_session.srv_choice + 1;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	257 local srv_choice = host_session.srv_hosts[host_session.srv_choice];
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	258 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;
1075 831c84cbf5fa s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible Matthew Wild <mwild1@gmail.com> parents: 1007 diff changeset	259 host_session.log("info", "Connection failed (%s). Attempt #%d: This time to %s:%d", tostring(err), host_session.srv_choice, connect_host, connect_port);
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	260 else
1075 831c84cbf5fa s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible Matthew Wild <mwild1@gmail.com> parents: 1007 diff changeset	261 host_session.log("info", "Out of connection options, can't connect to %s", tostring(host_session.to_host));
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	262 -- We're out of options
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	263 return false;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	264 end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	265
960 6bc16062da6c core.s2smanager: Check for valid host and port before attempting connection Matthew Wild <mwild1@gmail.com> parents: 959 diff changeset	266 if not (connect_host and connect_port) then
6bc16062da6c core.s2smanager: Check for valid host and port before attempting connection Matthew Wild <mwild1@gmail.com> parents: 959 diff changeset	267 -- Likely we couldn't resolve DNS
1006 9166d7a8c3c0 core.s2smanager: Logging improvements Matthew Wild <mwild1@gmail.com> parents: 995 diff changeset	268 log("warn", "Hmm, we're without a host (%s) and port (%s) to connect to for %s, giving up :(", tostring(connect_host), tostring(connect_port), tostring(to_host));
960 6bc16062da6c core.s2smanager: Check for valid host and port before attempting connection Matthew Wild <mwild1@gmail.com> parents: 959 diff changeset	269 return false;
6bc16062da6c core.s2smanager: Check for valid host and port before attempting connection Matthew Wild <mwild1@gmail.com> parents: 959 diff changeset	270 end
6bc16062da6c core.s2smanager: Check for valid host and port before attempting connection Matthew Wild <mwild1@gmail.com> parents: 959 diff changeset	271
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	272 return try_connect(host_session, connect_host, connect_port);
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	273 end
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	274
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	275 function try_connect(host_session, connect_host, connect_port)
1791 42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	276 host_session.connecting = true;
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	277 local handle;
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	278 handle = adns.lookup(function (reply)
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	279 handle = nil;
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	280 host_session.connecting = nil;
1793 1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs Matthew Wild <mwild1@gmail.com> parents: 1791 diff changeset	281
1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs Matthew Wild <mwild1@gmail.com> parents: 1791 diff changeset	282 -- COMPAT: This is a compromise for all you CNAME-(ab)users :)
1828 48cb27e2716e core.s2smanager: Always use last record in the DNS cache Matthew Wild <mwild1@gmail.com> parents: 1805 diff changeset	283 if not (reply and reply[#reply] and reply[#reply].a) then
1805 7e41ad68fe3c core.s2smanager: Don't recurse CNAMEs infinitely :) Matthew Wild <mwild1@gmail.com> parents: 1796 diff changeset	284 local count = max_dns_depth;
1793 1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs Matthew Wild <mwild1@gmail.com> parents: 1791 diff changeset	285 reply = dns.peek(connect_host, "CNAME", "IN");
1828 48cb27e2716e core.s2smanager: Always use last record in the DNS cache Matthew Wild <mwild1@gmail.com> parents: 1805 diff changeset	286 while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do
48cb27e2716e core.s2smanager: Always use last record in the DNS cache Matthew Wild <mwild1@gmail.com> parents: 1805 diff changeset	287 log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count);
48cb27e2716e core.s2smanager: Always use last record in the DNS cache Matthew Wild <mwild1@gmail.com> parents: 1805 diff changeset	288 reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN");
1805 7e41ad68fe3c core.s2smanager: Don't recurse CNAMEs infinitely :) Matthew Wild <mwild1@gmail.com> parents: 1796 diff changeset	289 count = count - 1;
1793 1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs Matthew Wild <mwild1@gmail.com> parents: 1791 diff changeset	290 end
1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs Matthew Wild <mwild1@gmail.com> parents: 1791 diff changeset	291 end
1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs Matthew Wild <mwild1@gmail.com> parents: 1791 diff changeset	292 -- end of CNAME resolving
1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs Matthew Wild <mwild1@gmail.com> parents: 1791 diff changeset	293
1828 48cb27e2716e core.s2smanager: Always use last record in the DNS cache Matthew Wild <mwild1@gmail.com> parents: 1805 diff changeset	294 if reply and reply[#reply] and reply[#reply].a then
48cb27e2716e core.s2smanager: Always use last record in the DNS cache Matthew Wild <mwild1@gmail.com> parents: 1805 diff changeset	295 log("debug", "DNS reply for %s gives us %s", connect_host, reply[#reply].a);
48cb27e2716e core.s2smanager: Always use last record in the DNS cache Matthew Wild <mwild1@gmail.com> parents: 1805 diff changeset	296 return make_connect(host_session, reply[#reply].a, connect_port);
1791 42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	297 else
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	298 log("debug", "DNS lookup failed to get a response for %s", connect_host);
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	299 if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	300 log("debug", "No other records to try for %s - destroying", host_session.to_host);
2783 57611584e27d s2smanager: Give reasons to destroy_session in more cases, including when DNS lookup fails Matthew Wild <mwild1@gmail.com> parents: 2781 diff changeset	301 destroy_session(host_session, "DNS resolution failed"); -- End of the line, we can't
1791 42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	302 end
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	303 end
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	304 end, connect_host, "A", "IN");
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	305
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	306 return true;
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	307 end
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	308
42d0b68a1efd s2smanager: Pass A-record lookups through adns module Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	309 function make_connect(host_session, connect_host, connect_port)
2813 46dfcc33ea9e s2smanager: Use s2smanager log() if session doesn't have a logger (thanks Flo) Matthew Wild <mwild1@gmail.com> parents: 2801 diff changeset	310 (host_session.log or log)("info", "Beginning new connection attempt to %s (%s:%d)", host_session.to_host, connect_host, connect_port);
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	311 -- Ok, we're going to try to connect
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	312
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	313 local from_host, to_host = host_session.from_host, host_session.to_host;
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	314
82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	315 local conn, handler = socket.tcp()
2712 9c579864b20a s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault) Matthew Wild <mwild1@gmail.com> parents: 2711 diff changeset	316
9c579864b20a s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault) Matthew Wild <mwild1@gmail.com> parents: 2711 diff changeset	317 if not conn then
9c579864b20a s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault) Matthew Wild <mwild1@gmail.com> parents: 2711 diff changeset	318 log("warn", "Failed to create outgoing connection, system error: %s", handler);
9c579864b20a s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault) Matthew Wild <mwild1@gmail.com> parents: 2711 diff changeset	319 return false, handler;
9c579864b20a s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault) Matthew Wild <mwild1@gmail.com> parents: 2711 diff changeset	320 end
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	321
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	322 conn:settimeout(0);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	323 local success, err = conn:connect(connect_host, connect_port);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	324 if not success and err ~= "timeout" then
1468 83b297a412a2 s2smanager: Log the hostname and address when s2s connection fails instantly Matthew Wild <mwild1@gmail.com> parents: 1450 diff changeset	325 log("warn", "s2s connect() to %s (%s:%d) failed: %s", host_session.to_host, connect_host, connect_port, err);
1492 aaeccebad0f3 s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly Matthew Wild <mwild1@gmail.com> parents: 1468 diff changeset	326 return false, err;
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	327 end
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	328
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	329 local cl = connlisteners_get("xmppserver");
2545 99700e601d16 s2smanager: Update for new server SSL API (don't pass a sslctx) Matthew Wild <mwild1@gmail.com> parents: 2539 diff changeset	330 conn = wrapclient(conn, connect_host, connect_port, cl, cl.default_mode or 1 );
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	331 host_session.conn = conn;
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	332
3146 aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	333 local filter = initialize_filters(host_session);
2019 c712ea57b877 s2smanager: Use session-specific logger to log outgoing data on outgoing s2s connections Matthew Wild <mwild1@gmail.com> parents: 1976 diff changeset	334 local w, log = conn.write, host_session.log;
3146 aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	335 host_session.sends2s = function (t)
3265 9374f84c6677 s2smanager: Fix logging for outgoing sessions to also log pre-filtered data Matthew Wild <mwild1@gmail.com> parents: 3224 diff changeset	336 log("debug", "sending: %s", (t.top_tag and t:top_tag()) or t:match("^[^>]*>?"));
3146 aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	337 if t.name then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	338 t = filter("stanzas/out", t);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	339 end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	340 if t then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	341 t = filter("bytes/out", tostring(t));
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	342 if t then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	343 return w(conn, tostring(t));
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	344 end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	345 end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas Matthew Wild <mwild1@gmail.com> parents: 2951 diff changeset	346 end
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	347
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	348 -- Register this outgoing connection so that xmppserver_listener knows about it
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	349 -- otherwise it will assume it is a new incoming connection
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	350 cl.register_outgoing(conn, host_session);
0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	351
2469 9e0c0b08f219 s2smanager: No-one noticed that Prosody stopped sending to/from on stream headers recently? :) Matthew Wild <mwild1@gmail.com> parents: 2426 diff changeset	352 host_session:open_stream(from_host, to_host);
2426 4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	353
974 82f7261c0482 Merge Matthew Wild <mwild1@gmail.com> parents: 963 diff changeset	354 log("debug", "Connection attempt in progress...");
1796 5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	355 add_task(connect_timeout, function ()
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	356 if host_session.conn ~= conn or
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	357 host_session.type == "s2sout" or
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	358 host_session.connecting then
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	359 return; -- Ok, we're connect[ed\|ing]
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	360 end
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	361 -- Not connected, need to close session and clean up
2419 00d985639a06 s2smanager: Trim trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2382 diff changeset	362 (host_session.log or log)("warn", "Destroying incomplete session %s->%s due to inactivity",
1796 5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	363 host_session.from_host or "(unknown)", host_session.to_host or "(unknown)");
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	364 host_session:close("connection-timeout");
5f7b2f940816 s2smanager: Timeout unauthed s2s connections Matthew Wild <mwild1@gmail.com> parents: 1793 diff changeset	365 end);
434 0d7ba3742f7a (Basic) IDNA and SRV fallback support Matthew Wild <mwild1@gmail.com> parents: 360 diff changeset	366 return true;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	367 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	368
2426 4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	369 function session_open_stream(session, from, to)
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	370 session.sends2s(st.stanza("stream:stream", {
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	371 xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback',
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	372 ["xmlns:stream"]='http://etherx.jabber.org/streams',
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	373 from=from, to=to, version='1.0', ["xml:lang"]='en'}):top_tag());
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	374 end
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method Matthew Wild <mwild1@gmail.com> parents: 2422 diff changeset	375
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	376 function streamopened(session, attr)
186 bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	377 local send = session.sends2s;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	378
544 efde848869c5 Don't send stream:features to incoming s2s connections Matthew Wild <mwild1@gmail.com> parents: 543 diff changeset	379 -- TODO: #29: SASL/TLS on s2s streams
1894 53f34ba6f6d6 Minor changes; outgoing TLS works. Paul Aurich <paul@darkrain42.org> parents: 1891 diff changeset	380 session.version = tonumber(attr.version) or 0;
544 efde848869c5 Don't send stream:features to incoming s2s connections Matthew Wild <mwild1@gmail.com> parents: 543 diff changeset	381
1909 84027581c995 s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream Matthew Wild <mwild1@gmail.com> parents: 1895 diff changeset	382 if session.secure == false then
84027581c995 s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream Matthew Wild <mwild1@gmail.com> parents: 1895 diff changeset	383 session.secure = true;
84027581c995 s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream Matthew Wild <mwild1@gmail.com> parents: 1895 diff changeset	384 end
84027581c995 s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream Matthew Wild <mwild1@gmail.com> parents: 1895 diff changeset	385
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	386 if session.direction == "incoming" then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	387 -- Send a reply stream header
938 663f75dd7b42 Fixed: Some nil access bugs Waqas Hussain <waqas20@gmail.com> parents: 931 diff changeset	388 session.to_host = attr.to and nameprep(attr.to);
663f75dd7b42 Fixed: Some nil access bugs Waqas Hussain <waqas20@gmail.com> parents: 931 diff changeset	389 session.from_host = attr.from and nameprep(attr.from);
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	390
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	391 session.streamid = uuid_gen();
360 e918c979ad1a Remove or comment useless prints, or change them to log() Matthew Wild <mwild1@gmail.com> parents: 354 diff changeset	392 (session.log or log)("debug", "incoming s2s received <stream:stream>");
3383 c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	393 if session.to_host then
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	394 if not hosts[session.to_host] then
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	395 -- Attempting to connect to a host we don't serve
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	396 session:close({
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	397 condition = "host-unknown";
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	398 text = "This host does not serve "..session.to_host
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	399 });
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	400 return;
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	401 elseif hosts[session.to_host].disallow_s2s then
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	402 -- Attempting to connect to a host that disallows s2s
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	403 session:close({
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	404 condition = "policy-violation";
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	405 text = "Server-to-server communication is not allowed to this host";
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	406 });
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	407 return;
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing Matthew Wild <mwild1@gmail.com> parents: 3329 diff changeset	408 end
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	409 end
2780 f8232abcab2a s2smanager: Send reply stream header only after checking we serve this host (sorry darkrain... :) ) Matthew Wild <mwild1@gmail.com> parents: 2760 diff changeset	410 send("<?xml version='1.0'?>");
2419 00d985639a06 s2smanager: Trim trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2382 diff changeset	411 send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback',
2787 1067a454a068 s2smanager: Stamp a 'to' on the reply stream:stream. This makes prosody happy. Paul Aurich <paul@darkrain42.org> parents: 2783 diff changeset	412 ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host, to=session.from_host, version=(session.version > 0 and "1.0" or nil) }):top_tag());
345 6a7acfc1c933 Send version=1.0 in s2s stream header. Send s2s stream:features when in 1.0 mode. Matthew Wild <mwild1@gmail.com> parents: 344 diff changeset	413 if session.version >= 1.0 then
1889 e875833ae08e s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0 Matthew Wild <mwild1@gmail.com> parents: 1888 diff changeset	414 local features = st.stanza("stream:features");
2780 f8232abcab2a s2smanager: Send reply stream header only after checking we serve this host (sorry darkrain... :) ) Matthew Wild <mwild1@gmail.com> parents: 2760 diff changeset	415
1936 a6ca0dcc7b83 s2smanager: Make s2s-stream-features a per-host event Matthew Wild <mwild1@gmail.com> parents: 1930 diff changeset	416 if session.to_host then
2613 afa20941e098 s2smanager, mod_compression, mod_tls: Changed event.session to event.origin for s2s-stream-features event for consistency. Waqas Hussain <waqas20@gmail.com> parents: 2545 diff changeset	417 hosts[session.to_host].events.fire_event("s2s-stream-features", { origin = session, features = features });
1936 a6ca0dcc7b83 s2smanager: Make s2s-stream-features a per-host event Matthew Wild <mwild1@gmail.com> parents: 1930 diff changeset	418 else
a6ca0dcc7b83 s2smanager: Make s2s-stream-features a per-host event Matthew Wild <mwild1@gmail.com> parents: 1930 diff changeset	419 (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", session.from_host or "unknown host");
a6ca0dcc7b83 s2smanager: Make s2s-stream-features a per-host event Matthew Wild <mwild1@gmail.com> parents: 1930 diff changeset	420 end
1889 e875833ae08e s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0 Matthew Wild <mwild1@gmail.com> parents: 1888 diff changeset	421
e875833ae08e s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0 Matthew Wild <mwild1@gmail.com> parents: 1888 diff changeset	422 log("debug", "Sending stream features: %s", tostring(features));
e875833ae08e s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0 Matthew Wild <mwild1@gmail.com> parents: 1888 diff changeset	423 send(features);
345 6a7acfc1c933 Send version=1.0 in s2s stream header. Send s2s stream:features when in 1.0 mode. Matthew Wild <mwild1@gmail.com> parents: 344 diff changeset	424 end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	425 elseif session.direction == "outgoing" then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	426 -- If we are just using the connection for verifying dialback keys, we won't try and auth it
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	427 if not attr.id then error("stream response did not give us a streamid!!!"); end
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	428 session.streamid = attr.id;
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	429
1007 c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	430 -- Send unauthed buffer
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	431 -- (stanzas which are fine to send before dialback)
2419 00d985639a06 s2smanager: Trim trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2382 diff changeset	432 -- Note that this is not the stanza queue (which
1007 c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	433 -- we can only send if auth succeeds) :)
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	434 local send_buffer = session.send_buffer;
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	435 if send_buffer and #send_buffer > 0 then
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	436 log("debug", "Sending s2s send_buffer now...");
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	437 for i, data in ipairs(send_buffer) do
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	438 session.sends2s(tostring(data));
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	439 send_buffer[i] = nil;
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	440 end
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	441 end
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	442 session.send_buffer = nil;
c500d4cb7855 core.s2smanager: Buffer data sent before connection Matthew Wild <mwild1@gmail.com> parents: 1006 diff changeset	443
1890 aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts Matthew Wild <mwild1@gmail.com> parents: 1889 diff changeset	444 -- If server is pre-1.0, don't wait for features, just do dialback
aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts Matthew Wild <mwild1@gmail.com> parents: 1889 diff changeset	445 if session.version < 1.0 then
aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts Matthew Wild <mwild1@gmail.com> parents: 1889 diff changeset	446 if not session.dialback_verifying then
1894 53f34ba6f6d6 Minor changes; outgoing TLS works. Paul Aurich <paul@darkrain42.org> parents: 1891 diff changeset	447 log("debug", "Initiating dialback...");
1890 aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts Matthew Wild <mwild1@gmail.com> parents: 1889 diff changeset	448 initiate_dialback(session);
aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts Matthew Wild <mwild1@gmail.com> parents: 1889 diff changeset	449 else
aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts Matthew Wild <mwild1@gmail.com> parents: 1889 diff changeset	450 mark_connected(session);
aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts Matthew Wild <mwild1@gmail.com> parents: 1889 diff changeset	451 end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	452 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	453 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	454 session.notopen = nil;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	455 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	456
959 e3db909065f2 sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream Matthew Wild <mwild1@gmail.com> parents: 938 diff changeset	457 function streamclosed(session)
2747 168104895051 sessionmanager, s2smanager: Close session on </stream:stream> Matthew Wild <mwild1@gmail.com> parents: 2746 diff changeset	458 (session.log or log)("debug", "Received </stream:stream>");
168104895051 sessionmanager, s2smanager: Close session on </stream:stream> Matthew Wild <mwild1@gmail.com> parents: 2746 diff changeset	459 session:close();
959 e3db909065f2 sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream Matthew Wild <mwild1@gmail.com> parents: 938 diff changeset	460 end
e3db909065f2 sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream Matthew Wild <mwild1@gmail.com> parents: 938 diff changeset	461
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	462 function initiate_dialback(session)
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	463 -- generate dialback key
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	464 session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host);
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	465 session.sends2s(format("<db:result from='%s' to='%s'>%s</db:result>", session.from_host, session.to_host, session.dialback_key));
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	466 session.log("info", "sent dialback key on outgoing s2s stream");
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	467 end
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	468
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	469 function generate_dialback(id, to, from)
2420 6ccd36a95a81 s2smanager, hostmanager: Make dialback secrets per-host Matthew Wild <mwild1@gmail.com> parents: 2419 diff changeset	470 return sha256_hash(id..to..from..hosts[from].dialback_secret, true);
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	471 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	472
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	473 function verify_dialback(id, to, from, key)
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	474 return key == generate_dialback(id, to, from);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	475 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	476
621 cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	477 function make_authenticated(session, host)
2799 0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	478 if not session.secure then
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	479 local local_host = session.direction == "incoming" and session.to_host or session.from_host;
2801 0323bdb1fcfa s2smanager: Fix syntax error) Matthew Wild <mwild1@gmail.com> parents: 2800 diff changeset	480 if config.get(local_host, "core", "s2s_require_encryption") then
2799 0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	481 session:close({
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	482 condition = "policy-violation",
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	483 text = "Encrypted server-to-server communication is required but was not "
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	484 ..((session.direction == "outgoing" and "offered") or "used")
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	485 });
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	486 end
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin Matthew Wild <mwild1@gmail.com> parents: 2787 diff changeset	487 end
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	488 if session.type == "s2sout_unauthed" then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	489 session.type = "s2sout";
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	490 elseif session.type == "s2sin_unauthed" then
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	491 session.type = "s2sin";
621 cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	492 if host then
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	493 session.hosts[host].authed = true;
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	494 end
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	495 elseif session.type == "s2sin" and host then
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	496 session.hosts[host].authed = true;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	497 else
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	498 return false;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	499 end
1075 831c84cbf5fa s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible Matthew Wild <mwild1@gmail.com> parents: 1007 diff changeset	500 session.log("debug", "connection %s->%s is now authenticated", session.from_host or "(unknown)", session.to_host or "(unknown)");
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	501
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	502 mark_connected(session);
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	503
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	504 return true;
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	505 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	506
1891 fd725a28141d s2smanager: Small comment Matthew Wild <mwild1@gmail.com> parents: 1890 diff changeset	507 -- Stream is authorised, and ready for normal stanzas
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	508 function mark_connected(session)
186 bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	509 local sendq, send = session.sendq, session.sends2s;
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	510
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	511 local from, to = session.from_host, session.to_host;
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	512
1075 831c84cbf5fa s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible Matthew Wild <mwild1@gmail.com> parents: 1007 diff changeset	513 session.log("info", session.direction.." s2s connection "..from.."->"..to.." complete");
186 bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	514
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	515 local send_to_host = send_to_host;
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	516 function session.send(data) send_to_host(to, from, data); end
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	517
186 bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s() Matthew Wild <mwild1@gmail.com> parents: 179 diff changeset	518
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	519 if session.direction == "outgoing" then
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	520 if sendq then
269 3cfac0e5e6ca Log how many queued stanzas we send Waqas Hussain <waqas20@gmail.com> parents: 266 diff changeset	521 session.log("debug", "sending "..#sendq.." queued stanzas across new outgoing connection to "..session.to_host);
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	522 for i, data in ipairs(sendq) do
631 6957fe7b0313 Bounce stanza errors on failed s2s Waqas Hussain <waqas20@gmail.com> parents: 621 diff changeset	523 send(data[1]);
190 1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	524 sendq[i] = nil;
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	525 end
1e993b7deae7 General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc. Matthew Wild <mwild1@gmail.com> parents: 186 diff changeset	526 session.sendq = nil;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	527 end
1345 35b5686d73ea s2smanager: Remove srv_hosts from session when connected, this fixes attempting to reconnect s2s sessions when they are closed during shutdown Matthew Wild <mwild1@gmail.com> parents: 1308 diff changeset	528
35b5686d73ea s2smanager: Remove srv_hosts from session when connected, this fixes attempting to reconnect s2s sessions when they are closed during shutdown Matthew Wild <mwild1@gmail.com> parents: 1308 diff changeset	529 session.srv_hosts = nil;
148 4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	530 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	531 end
4c0dcd245d34 s2s works! \o/ \o/ Matthew Wild <mwild1@gmail.com> parents: diff changeset	532
2746 3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	533 local resting_session = { -- Resting, not dead
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	534 destroyed = true;
2915 f47bd0f7e2e6 sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fixes a logging traceback, thanks Flo) Matthew Wild <mwild1@gmail.com> parents: 2892 diff changeset	535 type = "s2s_destroyed";
2748 85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions Matthew Wild <mwild1@gmail.com> parents: 2747 diff changeset	536 open_stream = function (session)
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions Matthew Wild <mwild1@gmail.com> parents: 2747 diff changeset	537 session.log("debug", "Attempt to open stream on resting session");
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions Matthew Wild <mwild1@gmail.com> parents: 2747 diff changeset	538 end;
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions Matthew Wild <mwild1@gmail.com> parents: 2747 diff changeset	539 close = function (session)
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions Matthew Wild <mwild1@gmail.com> parents: 2747 diff changeset	540 session.log("debug", "Attempt to close already-closed session");
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions Matthew Wild <mwild1@gmail.com> parents: 2747 diff changeset	541 end;
2746 3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	542 }; resting_session.__index = resting_session;
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	543
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	544 function retire_session(session)
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	545 local log = session.log or log;
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	546 for k in pairs(session) do
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	547 if k ~= "trace" and k ~= "log" and k ~= "id" then
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	548 session[k] = nil;
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	549 end
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	550 end
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	551
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	552 function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	553 function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	554 return setmetatable(session, resting_session);
3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	555 end
2857 6036c4b75235 sessionmanager, s2smanager: Give sessions dummy data handlers that log when data is received by a destroyed session Matthew Wild <mwild1@gmail.com> parents: 2712 diff changeset	556
2781 4b5881b6bbfc s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas Matthew Wild <mwild1@gmail.com> parents: 2780 diff changeset	557 function destroy_session(session, reason)
2749 8dc5f3651501 s2smanager: Don't re-destroy destroyed sessions Matthew Wild <mwild1@gmail.com> parents: 2748 diff changeset	558 if session.destroyed then return; end
169 92768120b717 Little tweak for more useful logging of closed s2s sessions Matthew Wild <mwild1@gmail.com> parents: 167 diff changeset	559 (session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host));
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	560
164 8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	561 if session.direction == "outgoing" then
260 182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15 Matthew Wild <mwild1@gmail.com> parents: 259 diff changeset	562 hosts[session.from_host].s2sout[session.to_host] = nil;
2781 4b5881b6bbfc s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas Matthew Wild <mwild1@gmail.com> parents: 2780 diff changeset	563 bounce_sendq(session, reason);
621 cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	564 elseif session.direction == "incoming" then
cd2cab5400fc Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :) Matthew Wild <mwild1@gmail.com> parents: 615 diff changeset	565 incoming_s2s[session] = nil;
164 8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	566 end
331 830fd67f9378 Quite some changes, to: Matthew Wild <mwild1@gmail.com> parents: 327 diff changeset	567
2746 3b9547fc0bed sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks Matthew Wild <mwild1@gmail.com> parents: 2714 diff changeset	568 retire_session(session); -- Clean session until it is GC'd
164 8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	569 end
8dc1faa5b1df other half of previous commit Matthew Wild <mwild1@gmail.com> parents: 162 diff changeset	570
225 bbbd169b326b Just committing this warning, because I want to know if the problem really affects us Matthew Wild <mwild1@gmail.com> parents: 199 diff changeset	571 return _M;

prosody

c7acddf80583

core/s2smanager.lua

Software / code / prosody

Annotate

core/s2smanager.lua @ 3383:c7acddf80583

Software `/` code `/` prosody