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

[prosody.git] / core / s2smanager.lua

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index b42662f3671108f01db9ce2cf94e37e923874337..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;
@@ -126,8 +128,19 @@ function new_incoming(conn)
        end
        open_sessions = open_sessions + 1;
        local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
+       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
 
@@ -240,9 +253,22 @@ function try_connect(host_session, connect_host, connect_port)
        handle = adns.lookup(function (reply)
                handle = nil;
                host_session.connecting = nil;
-               if reply and reply[1] and reply[1].a then
-                       log("debug", "DNS reply for %s gives us %s", connect_host, reply[1].a);
-                       return make_connect(host_session, reply[1].a, connect_port);
+               
+               -- 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
@@ -290,6 +316,17 @@ function make_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