diff options
author | Kim Alvefur <zash@zash.se> | 2018-02-04 01:40:11 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-02-04 01:40:11 +0100 |
commit | 42f8b3615eb02e7c823055ce186fdb3424165160 (patch) | |
tree | 661dfb5bfa698d4ee4646df7df94ac8c78a984a0 /plugins/mod_saslauth.lua | |
parent | 36da2e1aabdd130123e43060a3e606361299690f (diff) | |
parent | d8d5861feced162f170d17e845f8617031c2097c (diff) | |
download | prosody-42f8b3615eb02e7c823055ce186fdb3424165160.tar.gz prosody-42f8b3615eb02e7c823055ce186fdb3424165160.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_saslauth.lua')
-rw-r--r-- | plugins/mod_saslauth.lua | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index b5ec4057..fba84ef8 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -110,10 +110,15 @@ module:hook_tag(xmlns_sasl, "failure", function (session, stanza) module:log("info", "SASL EXTERNAL with %s failed: %s", session.to_host, condition); session.external_auth = "failed" - session:close(); - return true; + session.external_auth_failure_reason = condition; end, 500) +module:hook_tag(xmlns_sasl, "failure", function (session, stanza) -- luacheck: ignore 212/stanza + session.log("debug", "No fallback from SASL EXTERNAL failure, giving up"); + session:close(nil, session.external_auth_failure_reason); + return true; +end, 90) + module:hook_tag("http://etherx.jabber.org/streams", "features", function (session, stanza) if session.type ~= "s2sout_unauthed" or not session.secure then return; end |