aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-12-28 05:28:15 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-12-28 05:28:15 +0500
commit1a6f60183cef9c22e89656f3880d8ae0abcc7c90 (patch)
tree153d722d96c697e495e5c15bb1ea8084e6a43cc5
parent55357a4891877c8d19fd6116721f771d4096f414 (diff)
downloadprosody-1a6f60183cef9c22e89656f3880d8ae0abcc7c90.tar.gz
prosody-1a6f60183cef9c22e89656f3880d8ae0abcc7c90.zip
mod_saslauth: Remove special handling for SASL ANONYMOUS, and let mod_auth_anonymous handle it.
-rw-r--r--plugins/mod_saslauth.lua31
1 files changed, 2 insertions, 29 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 03ea6c8a..1c0d0673 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -18,11 +18,9 @@ local cert_verify_identity = require "util.x509".verify_identity;
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;
@@ -31,14 +29,6 @@ local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl';
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
@@ -217,22 +207,9 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:auth", function(event)
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;
@@ -268,11 +245,7 @@ module:hook("stream-features", function(event)
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