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 6499eafe998bf3237b03de5eb6b2644331629b64..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_supported_methods = require "core.usermanager".get_supported_methods;
+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;
@@ -67,32 +61,6 @@ else
        error("Unknown SASL backend");
 end
 
-local getpass_authentication_profile = {
-       plain = function(username, realm)
-               local prepped_username = nodeprep(username);
-               if not prepped_username then
-                       log("debug", "NODEprep failed on username: %s", username);
-                       return "", nil;
-               end
-               local password = usermanager_get_password(prepped_username, realm);
-               if not password then
-                       return "", nil;
-               end
-               return password, true;
-       end
-};
-
-local testpass_authentication_profile = {
-       plain_test =    function(username, password, realm)
-                       local prepped_username = nodeprep(username);
-                       if not prepped_username then
-                               log("debug", "NODEprep failed on username: %s", username);
-                               return "", nil;
-                       end
-                       return usermanager_test_password(prepped_username, password, realm), true;
-                       end
-};
-
 local anonymous_authentication_profile = {
        anonymous = function(username, realm)
                return true; -- for normal usage you should always return true here
@@ -121,17 +89,17 @@ local function handle_status(session, status, ret, err_msg)
                session.sasl_handler = session.sasl_handler:clean_clone();
        elseif status == "success" then
                local username = nodeprep(session.sasl_handler.username);
-               if not username then -- TODO move this to sessionmanager
-                       module:log("warn", "SASL succeeded but we didn't get a username!");
-                       session.sasl_handler = nil;
-                       session:reset_stream();
-                       return status, ret, err_msg;
-               end
 
                if not(require_provisioning) or usermanager_user_exists(username, session.host) then
-                       sm_make_authenticated(session, session.sasl_handler.username);
-                       session.sasl_handler = nil;
-                       session:reset_stream();
+                       local ok, err = sm_make_authenticated(session, session.sasl_handler.username);
+                       if ok then
+                               session.sasl_handler = nil;
+                               session:reset_stream();
+                       else
+                               module:log("warn", "SASL succeeded but username was invalid");
+                               session.sasl_handler = session.sasl_handler:clean_clone();
+                               return "failure", "not-authorized", "User authenticated successfully, but username was invalid";
+                       end
                else
                        module:log("warn", "SASL succeeded but we don't have an account provisioned for %s", username);
                        session.sasl_handler = session.sasl_handler:clean_clone();
@@ -144,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
@@ -191,24 +159,17 @@ 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
-                       if usermanager_get_provider(realm).get_password then
-                               origin.sasl_handler = new_sasl(realm, getpass_authentication_profile);
-                       elseif usermanager_get_provider(realm).test_password then
-                               origin.sasl_handler = new_sasl(realm, testpass_authentication_profile);
-                       else
-                               log("warning", "AUTH: Could not load an authentication profile for the given provider.");
-                       end
+                       origin.sasl_handler = usermanager_get_sasl_handler(module.host);
                        if not (module:get_option("allow_unencrypted_plain_auth")) and not origin.secure then
                                origin.sasl_handler:forbidden({"PLAIN"});
                        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