From 39639a7c38e9c7fe02e4bbfb649f2664eda06dd9 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 15 Feb 2017 22:59:19 +0100 Subject: mod_saslauth: Cache logger in local for less typing --- plugins/mod_saslauth.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/mod_saslauth.lua') diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 9917c303..f7803bc9 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -223,6 +223,7 @@ local bind_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-bind' }; local xmpp_session_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-session' }; module:hook("stream-features", function(event) local origin, features = event.origin, event.features; + local log = origin.log or log; if not origin.username then if secure_auth_only and not origin.secure then return; @@ -251,7 +252,7 @@ module:hook("stream-features", function(event) if mechanisms[1] then features:add_child(mechanisms); else - (origin.log or log)("warn", "No SASL mechanisms to offer"); + log("warn", "No SASL mechanisms to offer"); end else features:tag("bind", bind_attr):tag("required"):up():up(); -- cgit v1.2.3 From bb3a3dfe978926a6d918598c903b5163ab6a20e9 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 15 Feb 2017 23:00:03 +0100 Subject: mod_saslauth: Improve logging as to why when SASL is not offered --- plugins/mod_saslauth.lua | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'plugins/mod_saslauth.lua') diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index f7803bc9..b9ce6d60 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -226,6 +226,7 @@ module:hook("stream-features", function(event) local log = origin.log or log; if not origin.username then if secure_auth_only and not origin.secure then + log("debug", "Not offering authentication on insecure connection"); return; end local sasl_handler = usermanager_get_sasl_handler(module.host, origin) @@ -244,15 +245,22 @@ module:hook("stream-features", function(event) end end local mechanisms = st.stanza("mechanisms", mechanisms_attr); - for mechanism in pairs(sasl_handler:mechanisms()) do - if (not disabled_mechanisms:contains(mechanism)) and (origin.secure or not insecure_mechanisms:contains(mechanism)) then + local sasl_mechanisms = sasl_handler:mechanisms() + for mechanism in pairs(sasl_mechanisms) do + if disabled_mechanisms:contains(mechanism) then + log("debug", "Not offering disabled mechanism %s", mechanism); + elseif not origin.secure and insecure_mechanisms:contains(mechanism) then + log("debug", "Not offering mechanism %s on insecure connection", mechanism); + else mechanisms:tag("mechanism"):text(mechanism):up(); end end if mechanisms[1] then features:add_child(mechanisms); + elseif not next(sasl_mechanisms) then + log("warn", "No available SASL mechanisms, verify that the configured authentication module is working"); else - log("warn", "No SASL mechanisms to offer"); + log("warn", "All available authentication mechanisms are either disabled or not suitable for an insecure connection"); end else features:tag("bind", bind_attr):tag("required"):up():up(); -- cgit v1.2.3 From 7a2ed1a9edb96cc8c53cbc1428968b70cfe64f2c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 15 Feb 2017 23:04:44 +0100 Subject: mod_saslauth: Ignore shadowing of logger [luacheck] --- plugins/mod_saslauth.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_saslauth.lua') diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index b9ce6d60..68c4fe64 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -5,7 +5,7 @@ -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- - +-- luacheck: ignore 431/log local st = require "util.stanza"; -- cgit v1.2.3