aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_saslauth.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-02-15 23:05:03 +0100
committerKim Alvefur <zash@zash.se>2017-02-15 23:05:03 +0100
commitf21bbbab6037681ce1496c47213661ad6465a775 (patch)
tree67fd147c7eafbef789d8a5f9ab9d1fb0dd81bee6 /plugins/mod_saslauth.lua
parentbd92525bf197b524edd4716f5c0a2773d54c5aa7 (diff)
parent7a2ed1a9edb96cc8c53cbc1428968b70cfe64f2c (diff)
downloadprosody-f21bbbab6037681ce1496c47213661ad6465a775.tar.gz
prosody-f21bbbab6037681ce1496c47213661ad6465a775.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_saslauth.lua')
-rw-r--r--plugins/mod_saslauth.lua17
1 files changed, 13 insertions, 4 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 9917c303..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";
@@ -223,8 +223,10 @@ 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
+ log("debug", "Not offering authentication on insecure connection");
return;
end
local sasl_handler = usermanager_get_sasl_handler(module.host, origin)
@@ -243,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
- (origin.log or 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();