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

Backed out changeset 89c42aff8510: The problem in ejabberd has reportedly been resolved and this change causes more problems than it solves (fixes #1006)

Browse source
This commit is contained in:
Kim Alvefur 2018-02-04 01:13:27 +01:00
parent 38060a5ccf
commit 5a07b39c7f
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_dialback.lua
View file

@ -189,6 +189,14 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
end end
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) module:hook_stanza(xmlns_stream, "features", function (origin, stanza)
if not origin.external_auth or origin.external_auth == "failed" then if not origin.external_auth or origin.external_auth == "failed" then
module:log("debug", "Initiating dialback..."); module:log("debug", "Initiating dialback...");

6
plugins/mod_saslauth.lua
View file

@ -110,10 +110,12 @@ module:hook_tag(xmlns_sasl, "failure", function (session, stanza)
module:log("info", "SASL EXTERNAL with %s failed: %s", session.to_host, condition); module:log("info", "SASL EXTERNAL with %s failed: %s", session.to_host, condition);
session.external_auth = "failed" session.external_auth = "failed"
session:close();
return true;
end, 500) end, 500)
module:hook_stanza(xmlns_sasl, "failure", function (session, stanza)
-- TODO: Dialback wasn't loaded. Do something useful.
end, 90)
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" or not session.secure then return; end if session.type ~= "s2sout_unauthed" or not session.secure then return; end