util.sasl_cyrus: Automatically initialize Cyrus SASL with the first used service...

[prosody.git] / core / s2smanager.lua

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 666022d12d0346e64a079a1510c9681d170c1273..06ea247f63766f4c157863bd7737e08dd9779e1f 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -36,13 +36,12 @@ local log = logger_init("s2smanager");
 
 local sha256_hash = require "util.hashes".sha256;
 
-local dialback_secret = uuid_gen();
-
 local adns, dns = require "net.adns", require "net.dns";
 local config = require "core.configmanager";
 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;
+local dialback_secret = config.get("*", "core", "dialback_secret") or uuid_gen();
 
 incoming_s2s = {};
 _G.prosody.incoming_s2s = incoming_s2s;
@@ -52,7 +51,7 @@ module "s2smanager"
 
 local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end
 
-local function bounce_sendq(session)
+local function bounce_sendq(session, reason)
        local sendq = session.sendq;
        if sendq then
                session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));
@@ -70,6 +69,9 @@ local function bounce_sendq(session)
                                reply.attr.type = "error";
                                reply:tag("error", {type = "cancel"})
                                        :tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
+                               if reason then
+                                       reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):text("Connection failed: "..reason):up();
+                               end
                                core_process_stanza(dummy, reply);
                        end
                        sendq[i] = nil;
@@ -222,7 +224,7 @@ function attempt_connection(host_session, err)
                        if not ok then
                                if not attempt_connection(host_session, err) then
                                        -- No more attempts will be made
-                                       destroy_session(host_session);
+                                       destroy_session(host_session, err);
                                end
                        end
                end, "_xmpp-server._tcp."..connect_host..".", "SRV");
@@ -282,7 +284,7 @@ function try_connect(host_session, connect_host, connect_port)
                        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
+                               destroy_session(host_session, "DNS resolution failed"); -- End of the line, we can't
                        end
                end
        end, connect_host, "A", "IN");
@@ -350,7 +352,6 @@ function streamopened(session, attr)
        end
        
        if session.version >= 1.0 and not (attr.to and attr.from) then
-               
                (session.log or log)("warn", "Remote of stream "..(session.from_host or "(unknown)").."->"..(session.to_host or "(unknown)")
                        .." failed to specify to (%s) and/or from (%s) hostname as per RFC", tostring(attr.to), tostring(attr.from));
        end
@@ -362,17 +363,17 @@ function streamopened(session, attr)
        
                session.streamid = uuid_gen();
                (session.log or log)("debug", "incoming s2s received <stream:stream>");
-               send("<?xml version='1.0'?>");
-               send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', 
-                               ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host, version=(session.version > 0 and "1.0" or nil) }):top_tag());
                if session.to_host and not hosts[session.to_host] then
                        -- Attempting to connect to a host we don't serve
                        session:close({ condition = "host-unknown"; text = "This host does not serve "..session.to_host });
                        return;
                end
+               send("<?xml version='1.0'?>");
+               send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', 
+                               ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host, version=(session.version > 0 and "1.0" or nil) }):top_tag());
                if session.version >= 1.0 then
                        local features = st.stanza("stream:features");
-                                                       
+                       
                        if session.to_host then
                                hosts[session.to_host].events.fire_event("s2s-stream-features", { session = session, features = features });
                        else
@@ -411,7 +412,6 @@ function streamopened(session, attr)
                        end
                end
        end
-
        session.notopen = nil;
 end
 
@@ -484,12 +484,12 @@ function mark_connected(session)
        end
 end
 
-function destroy_session(session)
+function destroy_session(session, reason)
        (session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host));
        
        if session.direction == "outgoing" then
                hosts[session.from_host].s2sout[session.to_host] = nil;
-               bounce_sendq(session);
+               bounce_sendq(session, reason);
        elseif session.direction == "incoming" then
                incoming_s2s[session] = nil;
        end