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

mod_saslauth: Never send empty <mechanisms/>, for real this time.

Browse source
This commit is contained in:
Waqas Hussain 2011-10-13 00:24:09 +05:00
parent 4b79571a6f
commit afd972f05b
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/mod_saslauth.lua
View file

@ -248,15 +248,13 @@ module:hook("stream-features", function(event)
return; return;
end end
origin.sasl_handler = usermanager_get_sasl_handler(module.host); origin.sasl_handler = usermanager_get_sasl_handler(module.host);
local mechanisms = origin.sasl_handler:mechanisms(); local mechanisms = st.stanza("mechanisms", mechanisms_attr);
if not next(mechanisms) then return; end for mechanism in pairs(origin.sasl_handler:mechanisms()) do
features:tag("mechanisms", mechanisms_attr);
for mechanism in pairs(mechanisms) do
if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then
features:tag("mechanism"):text(mechanism):up(); mechanisms:tag("mechanism"):text(mechanism):up();
end end
end end
features:up(); if mechanisms[1] then features:add_child(mechanisms); 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();