X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fs2smanager.lua;h=b14f0e96c29824d7165061dec47ac3e6fb114ca3;hb=34215744d79b2fcf146b69a59007d104085dff4a;hp=19b7f047ed0223d7c32e82ca0a3f38c8126e24b5;hpb=740d4f647339acbc871004de3970c46aeeeab759;p=prosody.git diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 19b7f047..b14f0e96 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -15,8 +15,8 @@ local socket = require "socket"; local format = string.format; local t_insert, t_sort = table.insert, table.sort; local get_traceback = debug.traceback; -local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber - = tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber; +local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber + = tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber; local idna_to_ascii = require "util.encodings".idna.to_ascii; local connlisteners_get = require "net.connlisteners".get; @@ -24,6 +24,7 @@ local wrapclient = require "net.server".wrapclient; local modulemanager = require "core.modulemanager"; local st = require "stanza"; local stanza = st.stanza; +local nameprep = require "util.encodings".stringprep.nameprep; local uuid_gen = require "util.uuid".generate; @@ -35,7 +36,7 @@ local sha256_hash = require "util.hashes".sha256; local dialback_secret = sha256_hash(tostring{} .. math.random() .. socket.gettime(), true); -local dns = require "net.dns"; +local adns = require "net.adns"; incoming_s2s = {}; local incoming_s2s = incoming_s2s; @@ -47,7 +48,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) @@ -76,7 +77,7 @@ function send_to_host(from_host, to_host, data) -- We have a connection to this host already if host.type == "s2sout_unauthed" and data.name ~= "db:verify" and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host); - if not host.notopen and not host.dialback_key then + if not host.notopen and not host.dialback_key and host.sends2s then host.log("debug", "dialback had not been initiated"); initiate_dialback(host); end @@ -104,7 +105,11 @@ function send_to_host(from_host, to_host, data) local host_session = new_outgoing(from_host, to_host); -- Store in buffer host_session.sendq = { {tostring(data), st.reply(data)} }; - if not host_session.conn then destroy_session(host_session); end + log("debug", "stanza [%s] queued until connection complete", tostring(data.name)); + if (not host_session.connecting) and (not host_session.conn) then + log("warn", "Connection to %s failed already, destroying session...", to_host); + destroy_session(host_session); + end end end @@ -136,47 +141,88 @@ 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 function attempt_connection(host_session, err) local from_host, to_host = host_session.from_host, host_session.to_host; - local conn, handler = socket.tcp() - local connect_host, connect_port = idna_to_ascii(to_host), 5269; if not err then -- This is our first attempt - local answer = dns.lookup("_xmpp-server._tcp."..connect_host..".", "SRV"); - - if answer then - log("debug", to_host.." has SRV records, handling..."); - local srv_hosts = {}; - host_session.srv_hosts = srv_hosts; - for _, record in ipairs(answer) do - t_insert(srv_hosts, record.srv); - end - t_sort(srv_hosts, compare_srv_priorities); - - local srv_choice = srv_hosts[1]; - host_session.srv_choice = 1; - if srv_choice then - connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port; - log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port); + log("debug", "First attempt to connect to %s, starting with SRV lookup...", to_host); + host_session.connecting = true; + local answer = + adns.lookup(function (answer) + host_session.connecting = nil; + if answer then + log("debug", to_host.." has SRV records, handling..."); + local srv_hosts = {}; + host_session.srv_hosts = srv_hosts; + for _, record in ipairs(answer) do + t_insert(srv_hosts, record.srv); + end + t_sort(srv_hosts, compare_srv_priorities); + + local srv_choice = srv_hosts[1]; + host_session.srv_choice = 1; + if srv_choice then + connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port; + log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port); + end + else + log("debug", to_host.." has no SRV records, falling back to A"); end - end + -- 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"); + 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 + if not (connect_host and connect_port) then + -- Likely we couldn't resolve DNS + 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)); + return false; + end + + return try_connect(host_session, connect_host, connect_port); +end + +function try_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 + + local from_host, to_host = host_session.from_host, host_session.to_host; + + local conn, handler = socket.tcp() + conn:settimeout(0); local success, err = conn:connect(connect_host, connect_port); if not success and err ~= "timeout" then @@ -196,6 +242,7 @@ function attempt_connection(host_session, err) host_session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end conn.write(format([[]], from_host, to_host)); + log("debug", "Connection attempt in progress..."); return true; end @@ -211,8 +258,8 @@ function streamopened(session, attr) if session.direction == "incoming" then -- Send a reply stream header - session.to_host = attr.to; - session.from_host = attr.from; + session.to_host = attr.to and nameprep(attr.to); + session.from_host = attr.from and nameprep(attr.from); session.streamid = uuid_gen(); (session.log or log)("debug", "incoming s2s received "); @@ -233,6 +280,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 @@ -243,6 +304,12 @@ function streamopened(session, attr) session.notopen = nil; end +function streamclosed(session) + (session.log or log)("debug", ""); + session.sends2s(""); + session.notopen = true; +end + function initiate_dialback(session) -- generate dialback key session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host); @@ -271,7 +338,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); @@ -283,7 +350,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 @@ -304,7 +371,6 @@ end function destroy_session(session) (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);