mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_saslauth: Use the power of Set Theory to mange sets of SASL mechanisms

Browse source 
This makes sets of excluded mechanisms easily available for use later.
This commit is contained in:
Kim Alvefur 2019-10-15 21:58:10 +02:00
parent a375a34332
commit 668089d57c
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
plugins/mod_saslauth.lua
View file

@ -12,6 +12,7 @@ local st = require "util.stanza";
local sm_bind_resource = require "core.sessionmanager".bind_resource;
local sm_make_authenticated = require "core.sessionmanager".make_authenticated;
local base64 = require "util.encodings".base64;
local set = require "util.set";
local usermanager_get_sasl_handler = require "core.usermanager".get_sasl_handler;
@ -264,15 +265,32 @@ module:hook("stream-features", function(event)
end
local mechanisms = st.stanza("mechanisms", mechanisms_attr);
local sasl_mechanisms = sasl_handler:mechanisms()
local available_mechanisms = set.new();
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
log("debug", "Offering mechanism %s", mechanism);
available_mechanisms:add(mechanism);
end
log("debug", "SASL mechanisms supported by handler: %s", available_mechanisms);
local usable_mechanisms = available_mechanisms - disabled_mechanisms;
local available_disabled = set.intersection(available_mechanisms, disabled_mechanisms);
if not available_disabled:empty() then
log("debug", "Not offering disabled mechanisms: %s", available_disabled);
end
local available_insecure = set.intersection(available_mechanisms, insecure_mechanisms);
if not origin.secure and not available_insecure:empty() then
log("debug", "Session is not secure, not offering insecure mechanisms: %s", available_insecure);
usable_mechanisms = usable_mechanisms - insecure_mechanisms;
end
if not usable_mechanisms:empty() then
log("debug", "Offering usable mechanisms: %s", usable_mechanisms);
for mechanism in available_mechanisms do
mechanisms:tag("mechanism"):text(mechanism):up();
end
features:add_child(mechanisms);
return;
end
if mechanisms[1] then
features:add_child(mechanisms);