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

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 4c5e3e4458dfdc9cccfcd8b61ece3f768e57298f..5dfd98394d9f6981542c45cefe5e601ba7240d8e 100644 (file)
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -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...");

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index a07c5fd2a487d27742ca73c3f6ba711d23ffa806..407a561fcd6bd0387963eb62d078aa99b011a258 100644 (file)
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -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