core/s2smanager.lua
author Matthew Wild <mwild1@gmail.com>
Fri, 09 Mar 2012 18:46:19 +0000
changeset 4518 f2d695d2e31e
parent 4512 eb97612bf42b
parent 4513 23b540ab346a
child 4684 dc70c4ffb66d
permissions -rw-r--r--
Merge 0.9->trunk
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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;
4461
a81d045e7d16 s2smanager: Fix missing import of 'type' (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 4458
diff changeset
    19
local tostring, pairs, ipairs, getmetatable, newproxy, type, error, tonumber, setmetatable
a81d045e7d16 s2smanager: Fix missing import of 'type' (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 4458
diff changeset
    20
    = tostring, pairs, ipairs, getmetatable, newproxy, type, error, tonumber, setmetatable;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    21
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
    22
local idna_to_ascii = require "util.encodings".idna.to_ascii;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    23
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
    24
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
    25
local wrapclient = require "net.server".wrapclient;
244
0e3bda34f958 Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents: 243
diff changeset
    26
local st = require "stanza";
0e3bda34f958 Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents: 243
diff changeset
    27
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
    28
local nameprep = require "util.encodings".stringprep.nameprep;
3733
26571a99f6e6 core.s2smanager, mod_console, mod_saslauth, util.certverification: rename util.certverification to util.x509
Kim Alvefur <zash@zash.se>
parents: 3663
diff changeset
    29
local cert_verify_identity = require "util.x509".verify_identity;
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
    30
local new_ip = require "util.ip".new_ip;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
    31
local rfc3484_dest = require "util.rfc3484".destination;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    32
3436
9c454c029c26 s2smanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 3432
diff changeset
    33
local fire_event = prosody.events.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;
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
    47
local sources;
1204
dea89234e545 s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents: 1199
diff changeset
    48
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
    49
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
    50
3476
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
    51
local prosody = _G.prosody;
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
incoming_s2s = {};
3476
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
    53
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
    54
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
    55
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    56
module "s2smanager"
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    57
2711
5d97fb043141 s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2165
diff changeset
    58
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
    59
	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
    60
end
337
4a1dd1c2c219 We have SRV resolving \o/
Matthew Wild <mwild1@gmail.com>
parents: 333
diff changeset
    61
3431
c499f4752cd8 s2smanager: Only bounce real stanzas on s2s failure, not dialback and friends (thanks elghinn)
Matthew Wild <mwild1@gmail.com>
parents: 3383
diff changeset
    62
local bouncy_stanzas = { message = true, presence = true, iq = true };
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
    63
local function bounce_sendq(session, reason)
631
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    64
	local sendq = session.sendq;
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    65
	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
    66
		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
    67
		local dummy = {
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    68
			type = "s2sin";
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    69
			send = function(s)
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    70
				(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
    71
			end;
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    72
			dummy = true;
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    73
		};
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    74
		for i, data in ipairs(sendq) do
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    75
			local reply = data[2];
4106
e19fc274e182 s2smanager: Don't bounce error replies for error and result stanzas.
Waqas Hussain <waqas20@gmail.com>
parents: 4028
diff changeset
    76
			if reply and not(reply.attr.xmlns) and bouncy_stanzas[reply.name] then
631
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    77
				reply.attr.type = "error";
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    78
				reply:tag("error", {type = "cancel"})
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    79
					: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
    80
				if reason then
4127
f80b7a92da67 s2smanager: Change 'Connection failed' error message text to 'Server-to-server connection failed' (thanks Paul)
Matthew Wild <mwild1@gmail.com>
parents: 4106
diff changeset
    81
					reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"})
f80b7a92da67 s2smanager: Change 'Connection failed' error message text to 'Server-to-server connection failed' (thanks Paul)
Matthew Wild <mwild1@gmail.com>
parents: 4106
diff changeset
    82
						:text("Server-to-server connection failed: "..reason):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
    83
				end
631
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    84
				core_process_stanza(dummy, reply);
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    85
			end
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    86
			sendq[i] = nil;
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
		session.sendq = nil;
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    89
	end
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    90
end
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
    91
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
    92
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
    93
	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
    94
		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
    95
		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
    96
	end
260
182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents: 259
diff changeset
    97
	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
    98
	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
    99
		-- 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
   100
		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
   101
			(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
   102
			
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
   103
			-- Queue stanza until we are able to send it
4106
e19fc274e182 s2smanager: Don't bounce error replies for error and result stanzas.
Waqas Hussain <waqas20@gmail.com>
parents: 4028
diff changeset
   104
			if host.sendq then t_insert(host.sendq, {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and st.reply(data)});
e19fc274e182 s2smanager: Don't bounce error replies for error and result stanzas.
Waqas Hussain <waqas20@gmail.com>
parents: 4028
diff changeset
   105
			else host.sendq = { {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and 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
   106
			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
   107
		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
   108
			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
   109
			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
   110
			log("error", "Stanza: %s", tostring(data));
4016
0e927d4644c3 s2smanager: send_to_host(): Return false on failure, and true otherwise
Matthew Wild <mwild1@gmail.com>
parents: 3650
diff changeset
   111
			return false;
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
   112
		else
253
f2869ded1d37 Another small fix, for logging in s2smanager
Matthew Wild <mwild1@gmail.com>
parents: 252
diff changeset
   113
			(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
   114
			-- FIXME
260
182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents: 259
diff changeset
   115
			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
   116
				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
   117
				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
   118
			end
260
182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents: 259
diff changeset
   119
			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
   120
			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
   121
		end
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   122
	else
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   123
		log("debug", "opening a new outgoing connection for this stanza");
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   124
		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
   125
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   126
		-- Store in buffer
4106
e19fc274e182 s2smanager: Don't bounce error replies for error and result stanzas.
Waqas Hussain <waqas20@gmail.com>
parents: 4028
diff changeset
   127
		host_session.sendq = { {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and st.reply(data)} };
1006
9166d7a8c3c0 core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents: 995
diff changeset
   128
		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
   129
		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
   130
			log("warn", "Connection to %s failed already, destroying session...", to_host);
4026
21edd42768b5 s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
Matthew Wild <mwild1@gmail.com>
parents: 4025
diff changeset
   131
			if not destroy_session(host_session, "Connection failed") then
21edd42768b5 s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
Matthew Wild <mwild1@gmail.com>
parents: 4025
diff changeset
   132
				-- Already destroyed, we need to bounce our stanza
21edd42768b5 s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
Matthew Wild <mwild1@gmail.com>
parents: 4025
diff changeset
   133
				bounce_sendq(host_session, host_session.destruction_reason);
21edd42768b5 s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
Matthew Wild <mwild1@gmail.com>
parents: 4025
diff changeset
   134
			end
4016
0e927d4644c3 s2smanager: send_to_host(): Return false on failure, and true otherwise
Matthew Wild <mwild1@gmail.com>
parents: 3650
diff changeset
   135
			return false;
1006
9166d7a8c3c0 core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents: 995
diff changeset
   136
		end
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   137
	end
4016
0e927d4644c3 s2smanager: send_to_host(): Return false on failure, and true otherwise
Matthew Wild <mwild1@gmail.com>
parents: 3650
diff changeset
   138
	return true;
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
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   141
local open_sessions = 0;
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   142
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   143
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
   144
	local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} };
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   145
	if true then
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   146
		session.trace = newproxy(true);
583
5821eaa80baa Remove print()s from sessionmanager and s2smanager
Matthew Wild <mwild1@gmail.com>
parents: 559
diff changeset
   147
		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
   148
	end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   149
	open_sessions = open_sessions + 1;
343
cae2178b5623 Log sent s2s stanzas
Matthew Wild <mwild1@gmail.com>
parents: 337
diff changeset
   150
	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
   151
	session.log = log;
3146
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   152
	local filter = initialize_filters(session);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   153
	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
   154
		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
   155
		if t.name then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   156
			t = filter("stanzas/out", t);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   157
		end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   158
		if t then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   159
			t = filter("bytes/out", tostring(t));
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   160
			if t then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   161
				return w(conn, t);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   162
			end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   163
		end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   164
	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
   165
	incoming_s2s[session] = true;
1796
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   166
	add_task(connect_timeout, function ()
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   167
		if session.conn ~= conn or
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   168
		   session.type == "s2sin" then
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   169
			return; -- Ok, we're connect[ed|ing]
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   170
		end
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   171
		-- Not connected, need to close session and clean up
4187
1cad1c3495dd s2smanager: Drop some log messages to debug level from info/warn
Matthew Wild <mwild1@gmail.com>
parents: 4127
diff changeset
   172
		(session.log or log)("debug", "Destroying incomplete session %s->%s due to inactivity",
1796
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   173
		    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
   174
		session:close("connection-timeout");
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   175
	end);
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   176
	return session;
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   177
end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   178
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
   179
function new_outgoing(from_host, to_host, connect)
2419
00d985639a06 s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2382
diff changeset
   180
		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
   181
		                       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
   182
		                       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
   183
		
260
182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents: 259
diff changeset
   184
		hosts[from_host].s2sout[to_host] = host_session;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   185
		
4021
5af5fdaaa940 s2smanager: Give all new outgoing s2s sessions a close method by default (destroy_session)
Matthew Wild <mwild1@gmail.com>
parents: 4020
diff changeset
   186
		host_session.close = destroy_session; -- This gets replaced by xmppserver_listener later
5af5fdaaa940 s2smanager: Give all new outgoing s2s sessions a close method by default (destroy_session)
Matthew Wild <mwild1@gmail.com>
parents: 4020
diff changeset
   187
		
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   188
		local log;
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   189
		do
543
cf6e19ea1cbc Fix logger ids for c2s and s2sout
Matthew Wild <mwild1@gmail.com>
parents: 519
diff changeset
   190
			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
   191
			log = logger_init(conn_name);
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   192
			host_session.log = log;
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   193
		end
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   194
		
3146
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   195
		initialize_filters(host_session);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   196
		
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
   197
		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
   198
			-- Kick the connection attempting machine into life
4025
cc2e75e49cfb s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents: 4021
diff changeset
   199
			if not attempt_connection(host_session) then
cc2e75e49cfb s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents: 4021
diff changeset
   200
				-- Intentionally not returning here, the
cc2e75e49cfb s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents: 4021
diff changeset
   201
				-- session is needed, connected or not
cc2e75e49cfb s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents: 4021
diff changeset
   202
				destroy_session(host_session);
cc2e75e49cfb s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents: 4021
diff changeset
   203
			end
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
   204
		end
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   205
		
2419
00d985639a06 s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2382
diff changeset
   206
		if not host_session.sends2s then
1007
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   207
			-- 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
   208
			-- 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
   209
			-- 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
   210
			local buffer;
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   211
			function host_session.sends2s(data)
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   212
				if not buffer then
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   213
					buffer = {};
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   214
					host_session.send_buffer = buffer;
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   215
				end
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   216
				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
   217
				buffer[#buffer+1] = data;
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   218
				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
   219
			end
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   220
		end
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   221
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   222
		return host_session;
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   223
end
353
e7d776b5ebb9 Remove an old FIXME comment
Matthew Wild <mwild1@gmail.com>
parents: 351
diff changeset
   224
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   225
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   226
function attempt_connection(host_session, err)
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   227
	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
   228
	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
   229
	
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
   230
	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
   231
		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
   232
	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
   233
	
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   234
	if not err then -- This is our first attempt
1006
9166d7a8c3c0 core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents: 995
diff changeset
   235
		log("debug", "First attempt to connect to %s, starting with SRV lookup...", to_host);
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   236
		host_session.connecting = true;
1791
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   237
		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
   238
		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
   239
			handle = nil;
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   240
			host_session.connecting = nil;
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   241
			if answer then
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   242
				log("debug", to_host.." has SRV records, handling...");
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   243
				local srv_hosts = {};
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   244
				host_session.srv_hosts = srv_hosts;
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   245
				for _, record in ipairs(answer) do
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   246
					t_insert(srv_hosts, record.srv);
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   247
				end
4425
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   248
				if #srv_hosts == 1 and srv_hosts[1].target == "." then
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   249
					log("debug", to_host.." does not provide a XMPP service");
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   250
					destroy_session(host_session, err); -- Nothing to see here
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   251
					return;
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   252
				end
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   253
				t_sort(srv_hosts, compare_srv_priorities);
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   254
				
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   255
				local srv_choice = srv_hosts[1];
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   256
				host_session.srv_choice = 1;
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   257
				if srv_choice then
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   258
					connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   259
					log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port);
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   260
				end
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   261
			else
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   262
				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
   263
			end
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   264
			-- 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
   265
			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
   266
			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
   267
				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
   268
					-- 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
   269
					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
   270
				end
aaeccebad0f3 s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents: 1468
diff changeset
   271
			end
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   272
		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
   273
		
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   274
		return true; -- Attempt in progress
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   275
	elseif host_session.ip_hosts then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   276
		return try_connect(host_session, connect_host, connect_port, err);
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   277
	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
   278
		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
   279
		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
   280
		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
   281
		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
   282
	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
   283
		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
   284
		-- We're out of options
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   285
		return false;
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   286
	end
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   287
	
960
6bc16062da6c core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents: 959
diff changeset
   288
	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
   289
		-- Likely we couldn't resolve DNS
1006
9166d7a8c3c0 core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents: 995
diff changeset
   290
		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
   291
		return false;
6bc16062da6c core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents: 959
diff changeset
   292
	end
6bc16062da6c core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents: 959
diff changeset
   293
	
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   294
	return try_connect(host_session, connect_host, connect_port);
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   295
end
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   296
4443
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   297
function try_next_ip(host_session)
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   298
	host_session.connecting = nil;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   299
	host_session.ip_choice = host_session.ip_choice + 1;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   300
	local ip = host_session.ip_hosts[host_session.ip_choice];
4443
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   301
	local ok, err= make_connect(host_session, ip.ip, ip.port);
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   302
	if not ok then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   303
		if not attempt_connection(host_session, err or "closed") then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   304
			err = err and (": "..err) or "";
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   305
			destroy_session(host_session, "Connection failed"..err);
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   306
		end
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   307
	end
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   308
end
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   309
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   310
function try_connect(host_session, connect_host, connect_port, err)
1791
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   311
	host_session.connecting = true;
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   312
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   313
	if not err then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   314
		local IPs = {};
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   315
		host_session.ip_hosts = IPs;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   316
		local handle4, handle6;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   317
		local has_other = false;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   318
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   319
		if not sources then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   320
			sources =  {};
4431
bbede0141f7e s2smanager: Use config over xmppserver's default interface
Matthew Wild <mwild1@gmail.com>
parents: 4425
diff changeset
   321
			local cfg_sources = config.get("*", "core", "interface") or connlisteners_get("xmppserver").default_interface;
4458
9f6c68cb3fbd s2smanager: Don't throw an error when the "interface" config option is a string (which it is by default).
Waqas Hussain <waqas20@gmail.com>
parents: 4455
diff changeset
   322
			if type(cfg_sources) == "string" then
9f6c68cb3fbd s2smanager: Don't throw an error when the "interface" config option is a string (which it is by default).
Waqas Hussain <waqas20@gmail.com>
parents: 4455
diff changeset
   323
				cfg_sources = { cfg_sources };
9f6c68cb3fbd s2smanager: Don't throw an error when the "interface" config option is a string (which it is by default).
Waqas Hussain <waqas20@gmail.com>
parents: 4455
diff changeset
   324
			end
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   325
			for i, source in ipairs(cfg_sources) do
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   326
				if source == "*" then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   327
					sources[i] = new_ip("0.0.0.0", "IPv4");
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   328
				else
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   329
					sources[i] = new_ip(source, (source:find(":") and "IPv6") or "IPv4");
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   330
				end
1793
1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents: 1791
diff changeset
   331
			end
1fc6c2822e6b s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents: 1791
diff changeset
   332
		end
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   333
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   334
		handle4 = adns.lookup(function (reply, err)
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   335
			handle4 = nil;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   336
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   337
			-- COMPAT: This is a compromise for all you CNAME-(ab)users :)
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   338
			if not (reply and reply[#reply] and reply[#reply].a) then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   339
				local count = max_dns_depth;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   340
				reply = dns.peek(connect_host, "CNAME", "IN");
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   341
				while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   342
					log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count);
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   343
					reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN");
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   344
					count = count - 1;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   345
				end
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   346
			end
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   347
			-- end of CNAME resolving
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   348
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   349
			if reply and reply[#reply] and reply[#reply].a then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   350
				for _, ip in ipairs(reply) do
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   351
					log("debug", "DNS reply for %s gives us %s", connect_host, ip.a);
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   352
					IPs[#IPs+1] = new_ip(ip.a, "IPv4");
4028
f596e1a5e88a s2smanager: Destroy session on immediate failure of a connection attempt (e.g. inability to create sockets)
Matthew Wild <mwild1@gmail.com>
parents: 4027
diff changeset
   353
				end
f596e1a5e88a s2smanager: Destroy session on immediate failure of a connection attempt (e.g. inability to create sockets)
Matthew Wild <mwild1@gmail.com>
parents: 4027
diff changeset
   354
			end
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   355
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   356
			if has_other then
4425
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   357
				if #IPs > 0 then
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   358
					rfc3484_dest(host_session.ip_hosts, sources);
4443
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   359
					for i = 1, #IPs do
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   360
						IPs[i] = {ip = IPs[i], port = connect_port};
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   361
					end
4425
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   362
					host_session.ip_choice = 0;
4443
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   363
					try_next_ip(host_session);
4425
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   364
				else
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   365
					log("debug", "DNS lookup failed to get a response for %s", connect_host);
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   366
					host_session.ip_hosts = nil;
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   367
					if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   368
						log("debug", "No other records to try for %s - destroying", host_session.to_host);
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   369
						err = err and (": "..err) or "";
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   370
						destroy_session(host_session, "DNS resolution failed"..err); -- End of the line, we can't
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   371
					end
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   372
				end
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   373
			else
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   374
				has_other = true;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   375
			end
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   376
		end, connect_host, "A", "IN");
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   377
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   378
		handle6 = adns.lookup(function (reply, err)
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   379
			handle6 = nil;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   380
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   381
			if reply and reply[#reply] and reply[#reply].aaaa then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   382
				for _, ip in ipairs(reply) do
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   383
					log("debug", "DNS reply for %s gives us %s", connect_host, ip.aaaa);
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   384
					IPs[#IPs+1] = new_ip(ip.aaaa, "IPv6");
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   385
				end
1791
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   386
			end
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   387
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   388
			if has_other then
4425
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   389
				if #IPs > 0 then
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   390
					rfc3484_dest(host_session.ip_hosts, sources);
4443
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   391
					for i = 1, #IPs do
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   392
						IPs[i] = {ip = IPs[i], port = connect_port};
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   393
					end
4425
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   394
					host_session.ip_choice = 0;
4443
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   395
					try_next_ip(host_session);
4425
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   396
				else
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   397
					log("debug", "DNS lookup failed to get a response for %s", connect_host);
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   398
					host_session.ip_hosts = nil;
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   399
					if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   400
						log("debug", "No other records to try for %s - destroying", host_session.to_host);
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   401
						err = err and (": "..err) or "";
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   402
						destroy_session(host_session, "DNS resolution failed"..err); -- End of the line, we can't
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   403
					end
c25dee24623f s2smanager, net.dns: Fix handling for NXNAME and SRV target of "."
Florian Zeitz <florob@babelmonkeys.de>
parents: 4424
diff changeset
   404
				end
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   405
			else
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   406
				has_other = true;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   407
			end
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   408
		end, connect_host, "AAAA", "IN");
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   409
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   410
		return true;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   411
	elseif host_session.ip_hosts and #host_session.ip_hosts > host_session.ip_choice then -- Not our first attempt, and we also have IPs left to try
4443
7456ddcc0b14 s2smanager: Store port specified by SRV records
Florian Zeitz <florob@babelmonkeys.de>
parents: 4431
diff changeset
   412
		try_next_ip(host_session);
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   413
	else
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   414
		host_session.ip_hosts = nil;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   415
		if not attempt_connection(host_session, "out of IP addresses") then -- Retry if we can
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   416
			log("debug", "No other records to try for %s - destroying", host_session.to_host);
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   417
			err = err and (": "..err) or "";
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   418
			destroy_session(host_session, "Connecting failed"..err); -- End of the line, we can't
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   419
			return false;
1791
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   420
		end
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   421
	end
1791
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   422
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   423
	return true;
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   424
end
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   425
42d0b68a1efd s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
   426
function make_connect(host_session, connect_host, connect_port)
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   427
	(host_session.log or log)("info", "Beginning new connection attempt to %s ([%s]:%d)", host_session.to_host, connect_host.addr, connect_port);
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   428
	-- Ok, we're going to try to connect
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   429
	
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   430
	local from_host, to_host = host_session.from_host, host_session.to_host;
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   431
	
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   432
	local conn, handler;
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   433
	if connect_host.proto == "IPv4" then
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   434
		conn, handler = socket.tcp();
4510
b827401581c5 s2smanager: Fix traceback when socket.tcp6 isn't available
Matthew Wild <mwild1@gmail.com>
parents: 4494
diff changeset
   435
	elseif socket.tcp6 then
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   436
		conn, handler = socket.tcp6();
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   437
	end
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
   438
	
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
   439
	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
   440
		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
   441
		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
   442
	end
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   443
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   444
	conn:settimeout(0);
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   445
	local success, err = conn:connect(connect_host.addr, connect_port);
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   446
	if not success and err ~= "timeout" then
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   447
		log("warn", "s2s connect() to %s (%s:%d) failed: %s", host_session.to_host, connect_host.addr, 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
   448
		return false, err;
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   449
	end
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   450
	
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   451
	local cl = connlisteners_get("xmppserver");
4424
971a66627f7a s2smanager, xmppserver_listener: Support for connecting to other servers via IPv6
Florian Zeitz <florob@babelmonkeys.de>
parents: 4329
diff changeset
   452
	conn = wrapclient(conn, connect_host.addr, 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
   453
	host_session.conn = conn;
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   454
	
3146
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   455
	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
   456
	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
   457
	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
   458
		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
   459
		if t.name then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   460
			t = filter("stanzas/out", t);
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   461
		end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   462
		if t then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   463
			t = filter("bytes/out", tostring(t));
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   464
			if t then
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   465
				return w(conn, tostring(t));
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   466
			end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   467
		end
aaaea4cdbf10 s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents: 2951
diff changeset
   468
	end
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   469
	
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   470
	-- 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
   471
	-- 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
   472
	cl.register_outgoing(conn, host_session);
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   473
	
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
   474
	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
   475
	
974
Matthew Wild <mwild1@gmail.com>
parents: 963
diff changeset
   476
	log("debug", "Connection attempt in progress...");
1796
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   477
	add_task(connect_timeout, function ()
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   478
		if host_session.conn ~= conn or
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   479
		   host_session.type == "s2sout" or
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   480
		   host_session.connecting then
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   481
			return; -- Ok, we're connect[ed|ing]
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   482
		end
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   483
		-- Not connected, need to close session and clean up
2419
00d985639a06 s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2382
diff changeset
   484
		(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
   485
		    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
   486
		host_session:close("connection-timeout");
5f7b2f940816 s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 1793
diff changeset
   487
	end);
434
0d7ba3742f7a (Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents: 360
diff changeset
   488
	return true;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   489
end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   490
2426
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents: 2422
diff changeset
   491
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
   492
	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
   493
		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
   494
		["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
   495
		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
   496
end
4cef9808662a s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents: 2422
diff changeset
   497
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   498
local function check_cert_status(session)
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   499
	local conn = session.conn:socket()
3663
300ae72fd692 s2smanager: Check for getpeercertificate availability (for old LuaSecs)
Matthew Wild <mwild1@gmail.com>
parents: 3651
diff changeset
   500
	local cert
300ae72fd692 s2smanager: Check for getpeercertificate availability (for old LuaSecs)
Matthew Wild <mwild1@gmail.com>
parents: 3651
diff changeset
   501
	if conn.getpeercertificate then
300ae72fd692 s2smanager: Check for getpeercertificate availability (for old LuaSecs)
Matthew Wild <mwild1@gmail.com>
parents: 3651
diff changeset
   502
		cert = conn:getpeercertificate()
300ae72fd692 s2smanager: Check for getpeercertificate availability (for old LuaSecs)
Matthew Wild <mwild1@gmail.com>
parents: 3651
diff changeset
   503
	end
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   504
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   505
	if cert then
4329
d8b2c97ae6ed s2smanager: Update to newer luasec
Paul Aurich <paul@darkrain42.org>
parents: 4307
diff changeset
   506
		local chain_valid, errors = conn:getpeerverification()
d8b2c97ae6ed s2smanager: Update to newer luasec
Paul Aurich <paul@darkrain42.org>
parents: 4307
diff changeset
   507
		-- Is there any interest in printing out all/the number of errors here?
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   508
		if not chain_valid then
4329
d8b2c97ae6ed s2smanager: Update to newer luasec
Paul Aurich <paul@darkrain42.org>
parents: 4307
diff changeset
   509
			(session.log or log)("debug", "certificate chain validation result: invalid");
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   510
			session.cert_chain_status = "invalid";
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   511
		else
4329
d8b2c97ae6ed s2smanager: Update to newer luasec
Paul Aurich <paul@darkrain42.org>
parents: 4307
diff changeset
   512
			(session.log or log)("debug", "certificate chain validation result: valid");
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   513
			session.cert_chain_status = "valid";
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   514
4511
92597f6223de core.s2smanager: Fix check_cert_status() for when the stream has no from attr
Kim Alvefur <zash@zash.se>
parents: 4493
diff changeset
   515
			local host;
92597f6223de core.s2smanager: Fix check_cert_status() for when the stream has no from attr
Kim Alvefur <zash@zash.se>
parents: 4493
diff changeset
   516
			if session.direction == "incoming" then
92597f6223de core.s2smanager: Fix check_cert_status() for when the stream has no from attr
Kim Alvefur <zash@zash.se>
parents: 4493
diff changeset
   517
				host = session.from_host;
92597f6223de core.s2smanager: Fix check_cert_status() for when the stream has no from attr
Kim Alvefur <zash@zash.se>
parents: 4493
diff changeset
   518
			else
92597f6223de core.s2smanager: Fix check_cert_status() for when the stream has no from attr
Kim Alvefur <zash@zash.se>
parents: 4493
diff changeset
   519
				host = session.to_host;
92597f6223de core.s2smanager: Fix check_cert_status() for when the stream has no from attr
Kim Alvefur <zash@zash.se>
parents: 4493
diff changeset
   520
			end
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   521
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   522
			-- We'll go ahead and verify the asserted identity if the
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   523
			-- connecting server specified one.
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   524
			if host then
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   525
				if cert_verify_identity(host, "xmpp-server", cert) then
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   526
					session.cert_identity_status = "valid"
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   527
				else
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   528
					session.cert_identity_status = "invalid"
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   529
				end
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   530
			end
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   531
		end
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   532
	end
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   533
end
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   534
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   535
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
   536
	local send = session.sends2s;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   537
	
544
efde848869c5 Don't send stream:features to incoming s2s connections
Matthew Wild <mwild1@gmail.com>
parents: 543
diff changeset
   538
	-- TODO: #29: SASL/TLS on s2s streams
1894
53f34ba6f6d6 Minor changes; outgoing TLS works.
Paul Aurich <paul@darkrain42.org>
parents: 1891
diff changeset
   539
	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
   540
	
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   541
	-- TODO: Rename session.secure to session.encrypted
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
   542
	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
   543
		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
   544
	end
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   545
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   546
	if session.direction == "incoming" then
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   547
		-- Send a reply stream header
938
663f75dd7b42 Fixed: Some nil access bugs
Waqas Hussain <waqas20@gmail.com>
parents: 931
diff changeset
   548
		session.to_host = attr.to and nameprep(attr.to);
663f75dd7b42 Fixed: Some nil access bugs
Waqas Hussain <waqas20@gmail.com>
parents: 931
diff changeset
   549
		session.from_host = attr.from and nameprep(attr.from);
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   550
	
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   551
		session.streamid = uuid_gen();
4513
23b540ab346a core.s2smanager: Log the entire stream header.
Kim Alvefur <zash@zash.se>
parents: 4511
diff changeset
   552
		(session.log or log)("debug", "Incoming s2s received %s", st.stanza("stream:stream", attr):top_tag());
3383
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   553
		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
   554
			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
   555
				-- 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
   556
				session:close({
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   557
					condition = "host-unknown";
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   558
					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
   559
				});
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   560
				return;
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   561
			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
   562
				-- 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
   563
				session:close({
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   564
					condition = "policy-violation";
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   565
					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
   566
				});
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   567
				return;
c7acddf80583 s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents: 3329
diff changeset
   568
			end
331
830fd67f9378 Quite some changes, to:
Matthew Wild <mwild1@gmail.com>
parents: 327
diff changeset
   569
		end
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   570
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   571
		if session.secure and not session.cert_chain_status then check_cert_status(session); end
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   572
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
   573
		send("<?xml version='1.0'?>");
2419
00d985639a06 s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2382
diff changeset
   574
		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
   575
				["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
   576
		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
   577
			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
   578
			
1936
a6ca0dcc7b83 s2smanager: Make s2s-stream-features a per-host event
Matthew Wild <mwild1@gmail.com>
parents: 1930
diff changeset
   579
			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
   580
				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
   581
			else
a6ca0dcc7b83 s2smanager: Make s2s-stream-features a per-host event
Matthew Wild <mwild1@gmail.com>
parents: 1930
diff changeset
   582
				(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
   583
			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
   584
			
e875833ae08e s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
Matthew Wild <mwild1@gmail.com>
parents: 1888
diff changeset
   585
			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
   586
			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
   587
		end
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   588
	elseif session.direction == "outgoing" then
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   589
		-- 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
   590
		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
   591
		session.streamid = attr.id;
3651
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   592
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   593
		if session.secure and not session.cert_chain_status then check_cert_status(session); end
337391d34b70 s2s: SASL EXTERNAL
Paul Aurich <paul@darkrain42.org>
parents: 3650
diff changeset
   594
1007
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   595
		-- Send unauthed buffer
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   596
		-- (stanzas which are fine to send before dialback)
2419
00d985639a06 s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2382
diff changeset
   597
		-- 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
   598
		-- we can only send if auth succeeds) :)
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   599
		local send_buffer = session.send_buffer;
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   600
		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
   601
			log("debug", "Sending s2s send_buffer now...");
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   602
			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
   603
				session.sends2s(tostring(data));
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   604
				send_buffer[i] = nil;
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   605
			end
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   606
		end
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   607
		session.send_buffer = nil;
c500d4cb7855 core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents: 1006
diff changeset
   608
	
1890
aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents: 1889
diff changeset
   609
		-- 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
   610
		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
   611
			if not session.dialback_verifying then
1894
53f34ba6f6d6 Minor changes; outgoing TLS works.
Paul Aurich <paul@darkrain42.org>
parents: 1891
diff changeset
   612
				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
   613
				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
   614
			else
aed0d8a0cca8 s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents: 1889
diff changeset
   615
				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
   616
			end
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   617
		end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   618
	end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   619
	session.notopen = nil;
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   620
end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   621
959
e3db909065f2 sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents: 938
diff changeset
   622
function streamclosed(session)
2747
168104895051 sessionmanager, s2smanager: Close session on </stream:stream>
Matthew Wild <mwild1@gmail.com>
parents: 2746
diff changeset
   623
	(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
   624
	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
   625
end
e3db909065f2 sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents: 938
diff changeset
   626
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
   627
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
   628
	-- 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
   629
	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
   630
	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
   631
	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
   632
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
   633
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   634
function generate_dialback(id, to, from)
2420
6ccd36a95a81 s2smanager, hostmanager: Make dialback secrets per-host
Matthew Wild <mwild1@gmail.com>
parents: 2419
diff changeset
   635
	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
   636
end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   637
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   638
function verify_dialback(id, to, from, key)
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   639
	return key == generate_dialback(id, to, from);
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   640
end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   641
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
   642
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
   643
	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
   644
		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
   645
		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
   646
			session:close({
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents: 2787
diff changeset
   647
				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
   648
				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
   649
				       ..((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
   650
			});
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents: 2787
diff changeset
   651
		end
0dc7b5ceaf8f s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents: 2787
diff changeset
   652
	end
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   653
	if session.type == "s2sout_unauthed" then
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   654
		session.type = "s2sout";
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   655
	elseif session.type == "s2sin_unauthed" then
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   656
		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
   657
		if host then
3650
2b80450bd7ae s2smanager: Compatibility hack for when not using dialback
Paul Aurich <paul@darkrain42.org>
parents: 3540
diff changeset
   658
			if not session.hosts[host] then session.hosts[host] = {}; 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
   659
			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
   660
		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
   661
	elseif session.type == "s2sin" and host then
3650
2b80450bd7ae s2smanager: Compatibility hack for when not using dialback
Paul Aurich <paul@darkrain42.org>
parents: 3540
diff changeset
   662
		if not session.hosts[host] then session.hosts[host] = {}; 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
   663
		session.hosts[host].authed = true;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   664
	else
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   665
		return false;
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   666
	end
4493
cad62a675b60 s2smanager: Log the host when marking it authenticated
Paul Aurich <paul@darkrain42.org>
parents: 4329
diff changeset
   667
	session.log("debug", "connection %s->%s is now authenticated for %s", session.from_host or "(unknown)", session.to_host or "(unknown)", host);
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   668
	
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   669
	mark_connected(session);
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   670
	
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   671
	return true;
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   672
end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   673
1891
fd725a28141d s2smanager: Small comment
Matthew Wild <mwild1@gmail.com>
parents: 1890
diff changeset
   674
-- Stream is authorised, and ready for normal stanzas
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   675
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
   676
	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
   677
	
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents: 179
diff changeset
   678
	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
   679
	
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
   680
	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
   681
	
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents: 179
diff changeset
   682
	local send_to_host = send_to_host;
4017
2cb5bb26b831 s2smanager: session.send(): Return the result of send_to_host() (and incidentally make this a tail call \o/)
Matthew Wild <mwild1@gmail.com>
parents: 4016
diff changeset
   683
	function session.send(data) return send_to_host(to, from, data); end
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
   684
	
3476
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
   685
	local event_data = { session = session };
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
   686
	if session.type == "s2sout" then
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
   687
		prosody.events.fire_event("s2sout-established", event_data);
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
   688
		hosts[session.from_host].events.fire_event("s2sout-established", event_data);
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
   689
	else
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
   690
		prosody.events.fire_event("s2sin-established", event_data);
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
   691
		hosts[session.to_host].events.fire_event("s2sin-established", event_data);
193bb0936a4e s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents: 3459
diff changeset
   692
	end
186
bfa8a30ea488 sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents: 179
diff changeset
   693
	
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
   694
	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
   695
		if sendq then
269
3cfac0e5e6ca Log how many queued stanzas we send
Waqas Hussain <waqas20@gmail.com>
parents: 266
diff changeset
   696
			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
   697
			for i, data in ipairs(sendq) do
631
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
   698
				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
   699
				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
   700
			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
   701
			session.sendq = nil;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   702
		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
   703
		
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
   704
		session.srv_hosts = nil;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   705
	end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   706
end
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
   707
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
   708
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
   709
		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
   710
		type = "s2s_destroyed";
2748
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents: 2747
diff changeset
   711
		open_stream = function (session)
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents: 2747
diff changeset
   712
			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
   713
		end;
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents: 2747
diff changeset
   714
		close = function (session)
85a242cd1bc4 s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents: 2747
diff changeset
   715
			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
   716
		end;
3459
543f31cdde19 sessionmanager, s2smanager: Give resting sessions a pass-through filter, fixes #202
Matthew Wild <mwild1@gmail.com>
parents: 3436
diff changeset
   717
		filter = function (type, data) return data; 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
   718
	}; 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
   719
4018
5061c8d41d89 s2smanager: retire_session(): Add a 'reason' parameter
Matthew Wild <mwild1@gmail.com>
parents: 4017
diff changeset
   720
function retire_session(session, reason)
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
   721
	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
   722
	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
   723
		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
   724
			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
   725
		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
   726
	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
   727
4018
5061c8d41d89 s2smanager: retire_session(): Add a 'reason' parameter
Matthew Wild <mwild1@gmail.com>
parents: 4017
diff changeset
   728
	session.destruction_reason = reason;
5061c8d41d89 s2smanager: retire_session(): Add a 'reason' parameter
Matthew Wild <mwild1@gmail.com>
parents: 4017
diff changeset
   729
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
   730
	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
   731
	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
   732
	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
   733
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
   734
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
   735
function destroy_session(session, reason)
2749
8dc5f3651501 s2smanager: Don't re-destroy destroyed sessions
Matthew Wild <mwild1@gmail.com>
parents: 2748
diff changeset
   736
	if session.destroyed then return; end
4262
fd4d1cf6d63e s2smanager: Log reason when destroying a session.
Waqas Hussain <waqas20@gmail.com>
parents: 4200
diff changeset
   737
	(session.log or log)("debug", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host)..(reason and (": "..reason) or ""));
331
830fd67f9378 Quite some changes, to:
Matthew Wild <mwild1@gmail.com>
parents: 327
diff changeset
   738
	
164
8dc1faa5b1df other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents: 162
diff changeset
   739
	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
   740
		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
   741
		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
   742
	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
   743
		incoming_s2s[session] = nil;
164
8dc1faa5b1df other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents: 162
diff changeset
   744
	end
331
830fd67f9378 Quite some changes, to:
Matthew Wild <mwild1@gmail.com>
parents: 327
diff changeset
   745
	
3488
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   746
	local event_data = { session = session, reason = reason };
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   747
	if session.type == "s2sout" then
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   748
		prosody.events.fire_event("s2sout-destroyed", event_data);
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   749
		if hosts[session.from_host] then
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   750
			hosts[session.from_host].events.fire_event("s2sout-destroyed", event_data);
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   751
		end
3489
1b76d18e8045 s2smanager: Don't fire s2sin-destroyed for sessions that were never fully established (thanks Thomas)
Matthew Wild <mwild1@gmail.com>
parents: 3488
diff changeset
   752
	elseif session.type == "s2sin" then
3488
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   753
		prosody.events.fire_event("s2sin-destroyed", event_data);
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   754
		if hosts[session.to_host] then
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   755
			hosts[session.to_host].events.fire_event("s2sin-destroyed", event_data);
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   756
		end
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   757
	end
4f3fc5f9d944 s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents: 3476
diff changeset
   758
	
4019
80aa47c009f0 s2smanager: destroy_session(): Pass reason to retire_session() and return true on successful destruction
Matthew Wild <mwild1@gmail.com>
parents: 4018
diff changeset
   759
	retire_session(session, reason); -- Clean session until it is GC'd
80aa47c009f0 s2smanager: destroy_session(): Pass reason to retire_session() and return true on successful destruction
Matthew Wild <mwild1@gmail.com>
parents: 4018
diff changeset
   760
	return true;
164
8dc1faa5b1df other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents: 162
diff changeset
   761
end
8dc1faa5b1df other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents: 162
diff changeset
   762
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
   763
return _M;