Software / code / prosody
Changeset
4051:d343a76431cf
mod_saslauth: Remove special handling for SASL ANONYMOUS, and let mod_auth_anonymous handle it.
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Tue, 28 Dec 2010 05:28:15 +0500 |
| parents | 4050:f380c998353b |
| children | 4052:1b9e691d2f47 |
| files | plugins/mod_saslauth.lua |
| diffstat | 1 files changed, 2 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua Mon Dec 27 20:46:01 2010 +0500 +++ b/plugins/mod_saslauth.lua Tue Dec 28 05:28:15 2010 +0500 @@ -15,11 +15,9 @@ local nodeprep = require "util.encodings".stringprep.nodeprep; local usermanager_get_sasl_handler = require "core.usermanager".get_sasl_handler; -local t_concat, t_insert = table.concat, table.insert; local tostring = tostring; local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); -local anonymous_login = module:get_option("anonymous_login"); local allow_unencrypted_plain_auth = module:get_option("allow_unencrypted_plain_auth") local log = module._log; @@ -28,14 +26,6 @@ local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind'; local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas'; -local new_sasl = require "util.sasl".new; - -local anonymous_authentication_profile = { - anonymous = function(sasl, username, realm) - return true; -- for normal usage you should always return true here - end -}; - local function build_reply(status, ret, err_msg) local reply = st.stanza(status, {xmlns = xmlns_sasl}); if status == "challenge" then @@ -99,22 +89,9 @@ session.sasl_handler = nil; -- allow starting a new SASL negotiation before completing an old one end if not session.sasl_handler then - if anonymous_login then - session.sasl_handler = new_sasl(module.host, anonymous_authentication_profile); - else - session.sasl_handler = usermanager_get_sasl_handler(module.host); - end + session.sasl_handler = usermanager_get_sasl_handler(module.host); end local mechanism = stanza.attr.mechanism; - if anonymous_login then - if mechanism ~= "ANONYMOUS" then - session.send(build_reply("failure", "invalid-mechanism")); - return true; - end - elseif mechanism == "ANONYMOUS" then - session.send(build_reply("failure", "mechanism-too-weak")); - return true; - end if not session.secure and (secure_auth_only or (mechanism == "PLAIN" and not allow_unencrypted_plain_auth)) then session.send(build_reply("failure", "encryption-required")); return true; @@ -150,11 +127,7 @@ if secure_auth_only and not origin.secure then return; end - if anonymous_login then - origin.sasl_handler = new_sasl(module.host, anonymous_authentication_profile); - else - origin.sasl_handler = usermanager_get_sasl_handler(module.host); - end + origin.sasl_handler = usermanager_get_sasl_handler(module.host); features:tag("mechanisms", mechanisms_attr); for mechanism in pairs(origin.sasl_handler:mechanisms()) do if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then
