mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_dialback, mod_saslauth: Remove broken fallback to dialback on SASL EXTERNAL failure

Browse source
This commit is contained in:
Kim Alvefur 2014-09-23 14:23:01 +02:00
parent b58d3248b7
commit d33c824d1f
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_dialback.lua
View file

@ -176,14 +176,6 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
end
end);
module:hook_stanza("urn:ietf:params:xml:ns:xmpp-sasl", "failure", function (origin, stanza)
if origin.external_auth == "failed" then
module:log("debug", "SASL EXTERNAL failed, falling back to dialback");
initiate_dialback(origin);
return true;
end
end, 100);
module:hook_stanza(xmlns_stream, "features", function (origin, stanza)
if not origin.external_auth or origin.external_auth == "failed" then
module:log("debug", "Initiating dialback...");

6
plugins/mod_saslauth.lua
View file

@ -99,12 +99,10 @@ module:hook_stanza(xmlns_sasl, "failure", function (session, stanza)
module:log("info", "SASL EXTERNAL with %s failed", session.to_host)
-- TODO: Log the failure reason
session.external_auth = "failed"
session:close();
return true;
end, 500)
module:hook_stanza(xmlns_sasl, "failure", function (session, stanza)
-- TODO: Dialback wasn't loaded. Do something useful.
end, 90)
module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza)
if session.type ~= "s2sout_unauthed" or not session.secure then return; end