# HG changeset patch # User Kim Alvefur # Date 1487196003 -3600 # Node ID 08bde6a6fd56abf95214b638b60c136c211d6d11 # Parent 1a2674123c1c62142826df9f106de09d2d8e5318 mod_saslauth: Improve logging as to why when SASL is not offered diff -r 1a2674123c1c -r 08bde6a6fd56 plugins/mod_saslauth.lua --- a/plugins/mod_saslauth.lua Wed Feb 15 22:59:19 2017 +0100 +++ b/plugins/mod_saslauth.lua Wed Feb 15 23:00:03 2017 +0100 @@ -226,6 +226,7 @@ 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 @@ 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();