local sessions = sessions;
local socket = require "socket";
local format = string.format;
+local t_insert = table.insert;
local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber
= tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber;
local dialback_secret = "This is very secret!!! Ha!";
-local srvmap = { ["gmail.com"] = "talk.google.com", ["identi.ca"] = "longlance.controlezvous.ca" };
+local srvmap = { ["gmail.com"] = "talk.google.com", ["identi.ca"] = "longlance.controlezvous.ca", ["cdr.se"] = "jabber.cdr.se" };
module "s2smanager"
end
function send_to_host(from_host, to_host, data)
- if hosts[to_host] then
+ local host = hosts[to_host];
+ if host then
-- Write to connection
- hosts[to_host].send(data);
- log("debug", "stanza sent over s2s");
+ if host.type == "s2sout_unauthed" and not host.notopen and not host.dialback_key then
+ log("debug", "trying to send over unauthed s2sout to "..to_host..", authing it now...");
+ initiate_dialback(host);
+ if not host.sendq then host.sendq = { data };
+ else t_insert(host.sendq, data); end
+ else
+ log("debug", "going to send stanza to "..to_host.." from "..from_host);
+ hosts[to_host].sends2s(data);
+ log("debug", "stanza sent over "..hosts[to_host].type);
+ end
else
log("debug", "opening a new outgoing connection for this stanza");
local host_session = new_outgoing(from_host, to_host);
local open_sessions = 0;
function new_incoming(conn)
- local session = { conn = conn, priority = 0, type = "s2sin_unauthed", direction = "incoming" };
+ local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming" };
if true then
session.trace = newproxy(true);
getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("s2s session got collected, now "..open_sessions.." s2s sessions are allocated") end;
end
open_sessions = open_sessions + 1;
local w = conn.write;
- session.send = function (t) w(tostring(t)); end
+ session.sends2s = function (t) w(tostring(t)); end
return session;
end
function new_outgoing(from_host, to_host)
local host_session = { to_host = to_host, from_host = from_host, notopen = true, type = "s2sout_unauthed", direction = "outgoing" };
hosts[to_host] = host_session;
-
local cl = connlisteners_get("xmppserver");
local conn, handler = socket.tcp()
end
local w = conn.write;
- host_session.send = function (t) w(tostring(t)); end
+ host_session.sends2s = function (t) w(tostring(t)); end
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'>]], from_host, to_host));
function streamopened(session, attr)
session.log("debug", "s2s stream opened");
- local send = session.send;
+ local send = session.sends2s;
session.version = tonumber(attr.version) or 0;
if session.version >= 1.0 and not (attr.to and attr.from) then
send(format("<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s'>", session.streamid, session.to_host));
elseif session.direction == "outgoing" then
-- If we are just using the connection for verifying dialback keys, we won't try and auth it
+ if not attr.id then error("stream response did not give us a streamid!!!"); end
+ session.streamid = attr.id;
+
if not session.dialback_verifying then
- -- generate dialback key
- if not attr.id then error("stream response did not give us a streamid!!!"); end
- session.streamid = attr.id;
- session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host);
- session.send(format("<db:result from='%s' to='%s'>%s</db:result>", session.from_host, session.to_host, session.dialback_key));
- session.log("info", "sent dialback key on outgoing s2s stream");
+ initiate_dialback(session);
else
mark_connected(session);
end
session.notopen = nil;
end
+function initiate_dialback(session)
+ -- generate dialback key
+ session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host);
+ session.sends2s(format("<db:result from='%s' to='%s'>%s</db:result>", session.from_host, session.to_host, session.dialback_key));
+ session.log("info", "sent dialback key on outgoing s2s stream");
+end
+
function generate_dialback(id, to, from)
return md5_hash(id..to..from..dialback_secret); -- FIXME: See XEP-185 and XEP-220
end
end
function mark_connected(session)
- local sendq, send = session.sendq, session.send;
- session.log("debug", session.direction.." s2s connection "..session.from_host.."->"..session.to_host.." is now complete");
- if sendq then
- session.log("debug", "sending queued stanzas across new outgoing connection");
- for i, data in ipairs(sendq) do
- send(data);
- sendq[i] = nil;
+ local sendq, send = session.sendq, session.sends2s;
+
+ local from, to = session.from_host, session.to_host;
+
+ session.log("debug", session.direction.." s2s connection "..from.."->"..to.." is now complete");
+
+ local send_to_host = send_to_host;
+ function session.send(data) send_to_host(to, from, data); end
+
+
+ if session.direction == "outgoing" then
+ if sendq then
+ session.log("debug", "sending queued stanzas across new outgoing connection to "..session.to_host);
+ for i, data in ipairs(sendq) do
+ send(data);
+ sendq[i] = nil;
+ end
+ session.sendq = nil;
end
- session.sendq = nil;
end
end
projects / prosody.git / blobdiff