From 5a07b39c7fb46f93b4af1288d8c4dfaba9cedbb3 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 4 Feb 2018 01:13:27 +0100 Subject: Backed out changeset 89c42aff8510: The problem in ejabberd has reportedly been resolved and this change causes more problems than it solves (fixes #1006) --- plugins/mod_dialback.lua | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'plugins/mod_dialback.lua') diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index dcbf9448..cc1615cf 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -189,6 +189,14 @@ 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..."); -- cgit v1.2.3 From c1362a6093aaab90d4e0de43ca58c95e6f40fa79 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 4 Feb 2018 01:06:40 +0100 Subject: mod_dialback: Use renamed API for hooking non-stanza tags --- plugins/mod_dialback.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/mod_dialback.lua') diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index cc1615cf..9afde365 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -189,7 +189,7 @@ 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) +module:hook_tag("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); @@ -197,7 +197,7 @@ module:hook_stanza("urn:ietf:params:xml:ns:xmpp-sasl", "failure", function (orig end end, 100); -module:hook_stanza(xmlns_stream, "features", function (origin, stanza) +module:hook_tag(xmlns_stream, "features", function (origin, stanza) if not origin.external_auth or origin.external_auth == "failed" then module:log("debug", "Initiating dialback..."); initiate_dialback(origin); -- cgit v1.2.3 From a15eb17b9cf66050e263b607b1a5bb3946ba6734 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 4 Feb 2018 01:16:28 +0100 Subject: mod_dialback: Split long line [luacheck] --- plugins/mod_dialback.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/mod_dialback.lua') diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 9afde365..736d0f5d 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -153,7 +153,8 @@ module:hook("stanza/jabber:server:dialback:verify", function(event) valid = "invalid"; end if dialback_verifying.destroyed then - log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the db result", tostring(dialback_verifying):match("%w+$")); + log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the db result", + tostring(dialback_verifying):match("%w+$")); else dialback_verifying.sends2s( st.stanza("db:result", { from = attr.to, to = attr.from, id = attr.id, type = valid }) -- cgit v1.2.3 From e8ff8bf60614fc6b058518242599052c4411126f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 4 Feb 2018 01:16:43 +0100 Subject: mod_dialback: Expand abbrevation --- plugins/mod_dialback.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_dialback.lua') diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 736d0f5d..6a915576 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -153,7 +153,7 @@ module:hook("stanza/jabber:server:dialback:verify", function(event) valid = "invalid"; end if dialback_verifying.destroyed then - log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the db result", + log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the dialback result", tostring(dialback_verifying):match("%w+$")); else dialback_verifying.sends2s( -- cgit v1.2.3 From cf7486984a083cbe6653063814aa893dcae20054 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 4 Feb 2018 01:17:22 +0100 Subject: mod_dialback: Ignore unused arguments [luacheck] --- plugins/mod_dialback.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/mod_dialback.lua') diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 6a915576..eddc3209 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -190,7 +190,7 @@ module:hook("stanza/jabber:server:dialback:result", function(event) end end); -module:hook_tag("urn:ietf:params:xml:ns:xmpp-sasl", "failure", function (origin, stanza) +module:hook_tag("urn:ietf:params:xml:ns:xmpp-sasl", "failure", function (origin, stanza) -- luacheck: ignore 212/stanza if origin.external_auth == "failed" then module:log("debug", "SASL EXTERNAL failed, falling back to dialback"); initiate_dialback(origin); @@ -198,7 +198,7 @@ module:hook_tag("urn:ietf:params:xml:ns:xmpp-sasl", "failure", function (origin, end end, 100); -module:hook_tag(xmlns_stream, "features", function (origin, stanza) +module:hook_tag(xmlns_stream, "features", function (origin, stanza) -- luacheck: ignore 212/stanza if not origin.external_auth or origin.external_auth == "failed" then module:log("debug", "Initiating dialback..."); initiate_dialback(origin); -- cgit v1.2.3