X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fs2smanager.lua;h=879084d86554db54dd19c5dbcac55ff1d59cab83;hb=95a25a5e8c45690e98bfcc1b36bc079c412747a5;hp=5a557daf3fc5039643c9da1c4990a0c93db0f6a4;hpb=2f330312433c473381e77a39dca0058416f72886;p=prosody.git

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 5a557daf..879084d8 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -11,6 +11,7 @@
 local hosts = hosts;
 local sessions = sessions;
 local core_process_stanza = function(a, b) core_process_stanza(a, b); end
+local add_task = require "util.timer".add_task;
 local socket = require "socket";
 local format = string.format;
 local t_insert, t_sort = table.insert, table.sort;
@@ -34,10 +35,12 @@ local log = logger_init("s2smanager");
 
 local sha256_hash = require "util.hashes".sha256;
 
-local dialback_secret = sha256_hash(tostring{} .. math.random() .. socket.gettime(), true);
+local dialback_secret = uuid_gen();
 
 local adns = require "net.adns";
 
+local dns_timeout = config.get("*", "core", "dns_timeout") or 60;
+
 incoming_s2s = {};
 local incoming_s2s = incoming_s2s;
 
@@ -48,7 +51,7 @@ local function compare_srv_priorities(a,b) return a.priority < b.priority or a.w
 local function bounce_sendq(session)
 	local sendq = session.sendq;
 	if sendq then
-		session.log("debug", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
+		session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
 		local dummy = {
 			type = "s2sin";
 			send = function(s)
@@ -141,6 +144,23 @@ function new_outgoing(from_host, to_host)
 		
 		attempt_connection(host_session);
 		
+		if not host_session.sends2s then		
+			-- A sends2s which buffers data (until the stream is opened)
+			-- note that data in this buffer will be sent before the stream is authed
+			-- and will not be ack'd in any way, successful or otherwise
+			local buffer;
+			function host_session.sends2s(data)
+				if not buffer then
+					buffer = {};
+					host_session.send_buffer = buffer;
+				end
+				log("debug", "Buffering data on unconnected s2sout to %s", to_host);
+				buffer[#buffer+1] = data;
+				log("debug", "Buffered item %d: %s", #buffer, tostring(data));
+			end
+			
+		end
+
 		return host_session;
 end
 
@@ -152,8 +172,9 @@ function attempt_connection(host_session, err)
 	if not err then -- This is our first attempt
 		log("debug", "First attempt to connect to %s, starting with SRV lookup...", to_host);
 		host_session.connecting = true;
-		local answer = 
-		adns.lookup(function (answer)
+		local answer, handle;
+		handle = adns.lookup(function (answer)
+			handle = nil;
 			host_session.connecting = nil;
 			if answer then
 				log("debug", to_host.." has SRV records, handling...");
@@ -176,15 +197,23 @@ function attempt_connection(host_session, err)
 			-- Try with SRV, or just the plain hostname if no SRV
 			return try_connect(host_session, connect_host, connect_port);
 		end, "_xmpp-server._tcp."..connect_host..".", "SRV");
+		
+		-- Set handler for DNS timeout
+		add_task(dns_timeout, function ()
+			if handle then
+				adns.cancel(handle, true);
+			end
+		end);
+		
 		log("debug", "DNS lookup for %s sent, waiting for response before we can connect", to_host);
 		return true; -- Attempt in progress
 	elseif host_session.srv_hosts and #host_session.srv_hosts > host_session.srv_choice then -- Not our first attempt, and we also have SRV
 		host_session.srv_choice = host_session.srv_choice + 1;
 		local srv_choice = host_session.srv_hosts[host_session.srv_choice];
 		connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port;
-		host_session.log("debug", "Connection failed (%s). Attempt #%d: This time to %s:%d", tostring(err), host_session.srv_choice, connect_host, connect_port);
+		host_session.log("info", "Connection failed (%s). Attempt #%d: This time to %s:%d", tostring(err), host_session.srv_choice, connect_host, connect_port);
 	else
-		host_session.log("debug", "Out of connection options, can't connect to %s", tostring(host_session.to_host));
+		host_session.log("info", "Out of connection options, can't connect to %s", tostring(host_session.to_host));
 		-- We're out of options
 		return false;
 	end
@@ -199,7 +228,7 @@ function attempt_connection(host_session, err)
 end
 
 function try_connect(host_session, connect_host, connect_port)
-	log("debug", "Beginning new connection attempt to %s (%s:%d)", host_session.to_host, connect_host, connect_port);
+	host_session.log("info", "Beginning new connection attempt to %s (%s:%d)", host_session.to_host, connect_host, connect_port);
 	-- Ok, we're going to try to connect
 	
 	local from_host, to_host = host_session.from_host, host_session.to_host;
@@ -263,6 +292,20 @@ function streamopened(session, attr)
 		if not attr.id then error("stream response did not give us a streamid!!!"); end
 		session.streamid = attr.id;
 	
+		-- Send unauthed buffer
+		-- (stanzas which are fine to send before dialback)
+		-- Note that this is *not* the stanza queue (which 
+		-- we can only send if auth succeeds) :)
+		local send_buffer = session.send_buffer;
+		if send_buffer and #send_buffer > 0 then
+			log("debug", "Sending s2s send_buffer now...");
+			for i, data in ipairs(send_buffer) do
+				session.sends2s(tostring(data));
+				send_buffer[i] = nil;
+			end
+		end
+		session.send_buffer = nil;
+	
 		if not session.dialback_verifying then
 			initiate_dialback(session);
 		else
@@ -275,7 +318,9 @@ end
 
 function streamclosed(session)
 	(session.log or log)("debug", "</stream:stream>");
-	session.sends2s("</stream:stream>");
+	if session.sends2s then
+		session.sends2s("</stream:stream>");
+	end
 	session.notopen = true;
 end
 
@@ -307,7 +352,7 @@ function make_authenticated(session, host)
 	else
 		return false;
 	end
-	session.log("info", "connection is now authenticated");
+	session.log("debug", "connection %s->%s is now authenticated", session.from_host or "(unknown)", session.to_host or "(unknown)");
 	
 	mark_connected(session);
 	
@@ -319,7 +364,7 @@ function mark_connected(session)
 	
 	local from, to = session.from_host, session.to_host;
 	
-	session.log("debug", session.direction.." s2s connection "..from.."->"..to.." is now complete");
+	session.log("info", session.direction.." s2s connection "..from.."->"..to.." complete");
 	
 	local send_to_host = send_to_host;
 	function session.send(data) send_to_host(to, from, data); end
@@ -334,6 +379,8 @@ function mark_connected(session)
 			end
 			session.sendq = nil;
 		end
+		
+		session.srv_hosts = nil;
 	end
 end