2022-02-10 01:19:39 -05:00
|
|
|
local st = require"util.stanza";
|
|
|
|
local new_ip = require"util.ip".new_ip;
|
|
|
|
local new_outgoing = require"core.s2smanager".new_outgoing;
|
|
|
|
local bounce_sendq = module:depends"s2s".route_to_new_session.bounce_sendq;
|
2022-04-25 00:57:26 -04:00
|
|
|
local initialize_filters = require "util.filters".initialize;
|
|
|
|
local st = require "util.stanza";
|
|
|
|
|
|
|
|
local portmanager = require "core.portmanager";
|
|
|
|
|
|
|
|
local addclient = require "net.server".addclient;
|
|
|
|
|
|
|
|
module:depends("s2s");
|
|
|
|
|
|
|
|
local sessions = module:shared("sessions");
|
2022-02-10 01:19:39 -05:00
|
|
|
|
|
|
|
local s2s_outgoing_proxy = module:get_option("s2s_outgoing_proxy");
|
|
|
|
|
2022-04-25 00:57:26 -04:00
|
|
|
local host, port = s2s_outgoing_proxy[1] or s2s_outgoing_proxy, tonumber(s2s_outgoing_proxy[2]) or 15270;
|
|
|
|
|
|
|
|
-- The proxy_listener handles connection while still connecting to the proxy,
|
|
|
|
-- then it hands them over to the normal listener (in mod_s2s)
|
|
|
|
local proxy_listener = { default_port = port, default_mode = "*a", default_interface = "*" };
|
|
|
|
|
|
|
|
function proxy_listener.onconnect(conn)
|
|
|
|
local session = sessions[conn];
|
|
|
|
|
|
|
|
-- Now the real s2s listener can take over the connection.
|
|
|
|
local listener = portmanager.get_service("s2s").listener;
|
|
|
|
|
|
|
|
session.proxy_handler = nil;
|
|
|
|
|
|
|
|
local w, log = conn.send, session.log;
|
|
|
|
|
|
|
|
local filter = initialize_filters(session);
|
|
|
|
|
|
|
|
session.version = 1;
|
|
|
|
|
|
|
|
session.sends2s = function (t)
|
|
|
|
log("debug", "sending (s2s over proxy): %s", (t.top_tag and t:top_tag()) or t:match("^[^>]*>?"));
|
|
|
|
if t.name then
|
|
|
|
t = filter("stanzas/out", t);
|
|
|
|
end
|
|
|
|
if t then
|
|
|
|
t = filter("bytes/out", tostring(t));
|
|
|
|
if t then
|
|
|
|
return conn:write(tostring(t));
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
session.open_stream = function ()
|
|
|
|
session.sends2s(st.stanza("stream:stream", {
|
|
|
|
xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback',
|
|
|
|
["xmlns:stream"]='http://etherx.jabber.org/streams',
|
|
|
|
from=session.from_host, to=session.to_host, version='1.0', ["xml:lang"]='en'}):top_tag());
|
|
|
|
end
|
|
|
|
|
|
|
|
conn.setlistener(conn, listener);
|
|
|
|
|
|
|
|
listener.register_outgoing(conn, session);
|
|
|
|
|
|
|
|
listener.onconnect(conn);
|
|
|
|
|
|
|
|
-- this marks outgoing s2s as secure so we accept SASL EXTERNAL on it
|
|
|
|
session.secure = true;
|
|
|
|
end
|
|
|
|
|
|
|
|
function proxy_listener.register_outgoing(conn, session)
|
|
|
|
session.direction = "outgoing";
|
|
|
|
sessions[conn] = session;
|
|
|
|
end
|
|
|
|
|
|
|
|
function proxy_listener.ondisconnect(conn, err)
|
|
|
|
sessions[conn] = nil;
|
|
|
|
end
|
|
|
|
|
2022-02-10 01:19:39 -05:00
|
|
|
module:hook("route/remote", function(event)
|
|
|
|
local from_host, to_host, stanza = event.from_host, event.to_host, event.stanza;
|
|
|
|
log("debug", "opening a new outgoing connection for this stanza");
|
|
|
|
local host_session = new_outgoing(from_host, to_host);
|
|
|
|
|
|
|
|
-- Store in buffer
|
|
|
|
host_session.bounce_sendq = bounce_sendq;
|
|
|
|
host_session.sendq = { {tostring(stanza), stanza.attr.type ~= "error" and stanza.attr.type ~= "result" and st.reply(stanza)} };
|
|
|
|
log("debug", "stanza [%s] queued until connection complete", tostring(stanza.name));
|
2022-04-25 00:57:26 -04:00
|
|
|
|
|
|
|
local conn = addclient(host, port, proxy_listener, "*a");
|
2022-02-10 01:19:39 -05:00
|
|
|
|
2022-04-25 00:57:26 -04:00
|
|
|
proxy_listener.register_outgoing(conn, host_session);
|
2022-02-10 01:19:39 -05:00
|
|
|
|
2022-04-25 00:57:26 -04:00
|
|
|
host_session.conn = conn;
|
2022-02-10 01:19:39 -05:00
|
|
|
return true;
|
|
|
|
end, -2);
|
|
|
|
|
2022-04-25 00:57:26 -04:00
|
|
|
-- todo: is this the best place to do this hook?
|
2022-02-23 00:20:54 -05:00
|
|
|
-- this hook marks incoming s2s as secure so we offer SASL EXTERNAL on it
|
|
|
|
module:hook("s2s-stream-features", function(event)
|
|
|
|
local session, features = event.origin, event.features;
|
|
|
|
if session.type == "s2sin_unauthed" then
|
|
|
|
module:log("debug", "marking hook session.type '%s' secure with validated cert!", session.type);
|
|
|
|
session.secure = true;
|
|
|
|
session.cert_chain_status = "valid";
|
|
|
|
session.cert_identity_status = "valid";
|
|
|
|
end
|
|
|
|
end, 3000);
|