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

mod_saslauth: Improve logging of why no SASL mechanisms were offered

Browse source
This commit is contained in:
Kim Alvefur 2019-10-15 22:05:51 +02:00
parent 668089d57c
commit 57a86c0b0c
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/mod_saslauth.lua
View file

@ -292,14 +292,26 @@ module:hook("stream-features", function(event)
features:add_child(mechanisms); features:add_child(mechanisms);
return; return;
end end
if mechanisms[1] then
features:add_child(mechanisms); local authmod = module:get_option_string("authentication", "internal_plain");
elseif not next(sasl_mechanisms) then if available_mechanisms:empty() then
local authmod = module:get_option_string("authentication", "internal_plain");
log("error", "No available SASL mechanisms, verify that the configured authentication module '%s' is loaded and configured correctly", authmod); log("error", "No available SASL mechanisms, verify that the configured authentication module '%s' is loaded and configured correctly", authmod);
else return;
log("warn", "All available authentication mechanisms are either disabled or not suitable for an insecure connection");
end end
if not origin.secure and not available_insecure:empty() then
if not available_disabled:empty() then
log("error", "All SASL mechanisms provided by authentication module '%s' are forbidden on insecure connections (%s) or disabled (%s)",
authmod, available_insecure, available_disabled);
else
log("error", "All SASL mechanisms provided by authentication module '%s' are forbidden on insecure connections (%s)",
authmod, available_insecure);
end
elseif not available_disabled:empty() then
log("error", "All SASL mechanisms provided by authentication module '%s' are disabled (%s)",
authmod, available_disabled);
end
else else
features:tag("bind", bind_attr):tag("required"):up():up(); features:tag("bind", bind_attr):tag("required"):up():up();
features:tag("session", xmpp_session_attr):tag("optional"):up():up(); features:tag("session", xmpp_session_attr):tag("optional"):up():up();