util.pposix: Compatibility with Solaris systems (thanks Filip)

[prosody.git] / core / s2smanager.lua

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index ab2e4a5c83d2bd27d09eccbf63bce22d64a9c4d6..daf2c871f8da6e7deb7008c735db625eea9cb72c 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -37,9 +37,11 @@ local sha256_hash = require "util.hashes".sha256;
 
 local dialback_secret = uuid_gen();
 
-local adns = require "net.adns";
+local adns, dns = require "net.adns", require "net.dns";
 
+local connect_timeout = config.get("*", "core", "s2s_timeout") or 60;
 local dns_timeout = config.get("*", "core", "dns_timeout") or 60;
+local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3;
 
 incoming_s2s = {};
 local incoming_s2s = incoming_s2s;
@@ -129,6 +131,16 @@ function new_incoming(conn)
        session.log = log;
        session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end
        incoming_s2s[session] = true;
+       add_task(connect_timeout, function ()
+               if session.conn ~= conn or
+                  session.type == "s2sin" then
+                       return; -- Ok, we're connect[ed|ing]
+               end
+               -- Not connected, need to close session and clean up
+               (session.log or log)("warn", "Destroying incomplete session %s->%s due to inactivity", 
+                   session.from_host or "(unknown)", session.to_host or "(unknown)");
+               session:close("connection-timeout");
+       end);
        return session;
 end
 
@@ -174,7 +186,7 @@ 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, handle;
+               local handle;
                handle = adns.lookup(function (answer)
                        handle = nil;
                        host_session.connecting = nil;
@@ -236,6 +248,47 @@ function attempt_connection(host_session, err)
 end
 
 function try_connect(host_session, connect_host, connect_port)
+       host_session.connecting = true;
+       local handle;
+       handle = adns.lookup(function (reply)
+               handle = nil;
+               host_session.connecting = nil;
+               
+               -- COMPAT: This is a compromise for all you CNAME-(ab)users :)
+               if not (reply and reply[#reply] and reply[#reply].a) then
+                       local count = max_dns_depth;
+                       reply = dns.peek(connect_host, "CNAME", "IN");
+                       while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do
+                               log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count);
+                               reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN");
+                               count = count - 1;
+                       end
+               end
+               -- end of CNAME resolving
+               
+               if reply and reply[#reply] and reply[#reply].a then
+                       log("debug", "DNS reply for %s gives us %s", connect_host, reply[#reply].a);
+                       return make_connect(host_session, reply[#reply].a, connect_port);
+               else
+                       log("debug", "DNS lookup failed to get a response for %s", connect_host);
+                       if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can
+                               log("debug", "No other records to try for %s - destroying", host_session.to_host);
+                               destroy_session(host_session); -- End of the line, we can't
+                       end
+               end
+       end, connect_host, "A", "IN");
+
+       -- Set handler for DNS timeout
+       add_task(dns_timeout, function ()
+               if handle then
+                       adns.cancel(handle, true);
+               end
+       end);
+               
+       return true;
+end
+
+function make_connect(host_session, 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
        
@@ -263,6 +316,17 @@ function try_connect(host_session, connect_host, connect_port)
        
        conn.write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0' xml:lang='en'>]], from_host, to_host));
        log("debug", "Connection attempt in progress...");
+       add_task(connect_timeout, function ()
+               if host_session.conn ~= conn or
+                  host_session.type == "s2sout" or
+                  host_session.connecting then
+                       return; -- Ok, we're connect[ed|ing]
+               end
+               -- Not connected, need to close session and clean up
+               (host_session.log or log)("warn", "Destroying incomplete session %s->%s due to inactivity", 
+                   host_session.from_host or "(unknown)", host_session.to_host or "(unknown)");
+               host_session:close("connection-timeout");
+       end);
        return true;
 end