usermanager, mod_auth_internal_hashed, mod_legacyauth: New order of parameters for...

[prosody.git] / plugins / mod_saslauth.lua

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 77040448d7b3c331981b5c37d80173f3071322ff..a02c1ec4223af7174ba22257e4793d7a7af12778 100644 (file)
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -14,20 +14,14 @@ local sm_make_authenticated = require "core.sessionmanager".make_authenticated;
 local base64 = require "util.encodings".base64;
 
 local nodeprep = require "util.encodings".stringprep.nodeprep;
-local datamanager_load = require "util.datamanager".load;
-local usermanager_get_provider = require "core.usermanager".get_provider;
 local usermanager_get_sasl_handler = require "core.usermanager".get_sasl_handler;
 local usermanager_user_exists = require "core.usermanager".user_exists;
-local usermanager_get_password = require "core.usermanager".get_password;
-local usermanager_test_password = require "core.usermanager".test_password;
 local t_concat, t_insert = table.concat, table.insert;
 local tostring = tostring;
-local jid_split = require "util.jid".split;
-local md5 = require "util.hashes".md5;
-local config = require "core.configmanager";
 
 local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
 local sasl_backend = module:get_option("sasl_backend") or "builtin";
+local anonymous_login = module:get_option("anonymous_login");
 
 -- Cyrus config options
 local require_provisioning = module:get_option("cyrus_require_provisioning") or false;
@@ -118,7 +112,7 @@ end
 local function sasl_handler(session, stanza)
        if stanza.name == "auth" then
                -- FIXME ignoring duplicates because ejabberd does
-               if config.get(session.host or "*", "core", "anonymous_login") then
+               if anonymous_login then
                        if stanza.attr.mechanism ~= "ANONYMOUS" then
                                return session.send(build_reply("failure", "invalid-mechanism"));
                        end
@@ -165,9 +159,8 @@ module:hook("stream-features", function(event)
                if secure_auth_only and not origin.secure then
                        return;
                end
-               local realm = module:get_option("sasl_realm") or origin.host;
-               if module:get_option("anonymous_login") then
-                       origin.sasl_handler = new_sasl(realm, anonymous_authentication_profile);
+               if anonymous_login then
+                       origin.sasl_handler = new_sasl(module.host, anonymous_authentication_profile);
                else
                        origin.sasl_handler = usermanager_get_sasl_handler(module.host);
                        if not (module:get_option("allow_unencrypted_plain_auth")) and not origin.secure then
@@ -175,8 +168,8 @@ module:hook("stream-features", function(event)
                        end
                end
                features:tag("mechanisms", mechanisms_attr);
-               for k, v in pairs(origin.sasl_handler:mechanisms()) do
-                       features:tag("mechanism"):text(v):up();
+               for k in pairs(origin.sasl_handler:mechanisms()) do
+                       features:tag("mechanism"):text(k):up();
                end
                features:up();
        else