moparisthebest/xmpp-proxy
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Complete bi-directional SASL EXTERNAL support, no more dialback needed

Browse Source
This commit is contained in:
Travis Burtrum 2022-02-23 00:20:54 -05:00
parent db2739a474
commit 28c5bb27e8
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -101,7 +101,7 @@ which also works for s2s.
Add this config: Add this config:
``` ```
-- trust connections coming from these IPs -- trust connections coming to these IPs
secure_interfaces = { "127.0.0.1", "::1" } secure_interfaces = { "127.0.0.1", "::1" }
-- handle PROXY protocol on these ports -- handle PROXY protocol on these ports

14
contrib/prosody-modules/mod_s2s_outgoing_proxy.lua
View File

@ -28,10 +28,22 @@ module:hook("route/remote", function(event)
return true; return true;
end, -2); end, -2);
-- is this the best place to do this? -- todo: is this the best place to do these hooks?
-- this hook marks outgoing s2s as secure so we accept SASL EXTERNAL on it
module:hook_tag("http://etherx.jabber.org/streams", "features", function (session, stanza) module:hook_tag("http://etherx.jabber.org/streams", "features", function (session, stanza)
if session.type == "s2sout_unauthed" then if session.type == "s2sout_unauthed" then
module:log("debug", "marking hook session.type '%s' secure!", session.type); module:log("debug", "marking hook session.type '%s' secure!", session.type);
session.secure = true; session.secure = true;
end end
end, 3000); end, 3000);
-- 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);

1
integration/25-s2s-sasl-external/tests
View File

@ -1 +0,0 @@
juliet_presence.scs romeo_messages_juliet.scs romeo_presence.scs