diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-23 14:23:01 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-23 14:23:01 +0200 |
| commit | 9f3cbaeefad81b8b4f936b6ec72e1b8df150f6f7 (patch) | |
| tree | 40ebfd90e266ffea9a1c57486c54efc306b782e7 | |
| parent | ad7e3d7233cff3e34c11323ff5ec64aacb8f678c (diff) | |
| download | prosody-9f3cbaeefad81b8b4f936b6ec72e1b8df150f6f7.tar.gz prosody-9f3cbaeefad81b8b4f936b6ec72e1b8df150f6f7.zip | |
mod_dialback, mod_saslauth: Remove broken fallback to dialback on SASL EXTERNAL failure
| -rw-r--r-- | plugins/mod_dialback.lua | 8 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 6 |
2 files changed, 2 insertions, 12 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 4c5e3e44..5dfd9839 100644 --- 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 a07c5fd2..407a561f 100644 --- 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 |