Merge 0.6->0.7
[prosody.git] / plugins / mod_saslauth.lua
index 784202128ae23f2ed21f29280ad01c3e499c0d2b..d407e5da8588ff5bc8787e05fb5232c34326b03e 100644 (file)
@@ -14,17 +14,25 @@ local sm_make_authenticated = require "core.sessionmanager".make_authenticated;
 local base64 = require "util.encodings".base64;
 
 local nodeprep = require "util.encodings".stringprep.nodeprep;
-local usermanager_get_sasl_handler = require "core.usermanager".get_sasl_handler;
+local datamanager_load = require "util.datamanager".load;
+local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
+local usermanager_get_supported_methods = require "core.usermanager".get_supported_methods;
 local usermanager_user_exists = require "core.usermanager".user_exists;
+local usermanager_get_password = require "core.usermanager".get_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 anonymous_login = module:get_option("anonymous_login");
-local allow_unencrypted_plain_auth = module:get_option("allow_unencrypted_plain_auth")
+local sasl_backend = module:get_option("sasl_backend") or "builtin";
 
 -- Cyrus config options
 local require_provisioning = module:get_option("cyrus_require_provisioning") or false;
+local cyrus_service_realm = module:get_option("cyrus_service_realm");
+local cyrus_service_name = module:get_option("cyrus_service_name");
+local cyrus_application_name = module:get_option("cyrus_application_name");
 
 local log = module._log;
 
@@ -32,7 +40,46 @@ 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 new_sasl;
+if sasl_backend == "builtin" then
+       new_sasl = require "util.sasl".new;
+elseif sasl_backend == "cyrus" then
+       prosody.unlock_globals(); --FIXME: Figure out why this is needed and
+                                 -- why cyrussasl isn't caught by the sandbox
+       local ok, cyrus = pcall(require, "util.sasl_cyrus");
+       prosody.lock_globals();
+       if ok then
+               local cyrus_new = cyrus.new;
+               new_sasl = function(realm)
+                       return cyrus_new(
+                               cyrus_service_realm or realm,
+                               cyrus_service_name or "xmpp",
+                               cyrus_application_name or "prosody"
+                       );
+               end
+       else
+               module:log("error", "Failed to load Cyrus SASL because: %s", cyrus);
+               error("Failed to load Cyrus SASL");
+       end
+else
+       module:log("error", "Unknown SASL backend: %s", sasl_backend);
+       error("Unknown SASL backend");
+end
+
+local default_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 anonymous_authentication_profile = {
        anonymous = function(username, realm)
@@ -64,8 +111,8 @@ local function handle_status(session, status, ret, err_msg)
                local username = nodeprep(session.sasl_handler.username);
 
                if not(require_provisioning) or usermanager_user_exists(username, session.host) then
-                       local ok, err = sm_make_authenticated(session, session.sasl_handler.username);
-                       if ok then
+                       local aret, err = sm_make_authenticated(session, session.sasl_handler.username);
+                       if aret then
                                session.sasl_handler = nil;
                                session:reset_stream();
                        else
@@ -85,21 +132,20 @@ end
 local function sasl_handler(session, stanza)
        if stanza.name == "auth" then
                -- FIXME ignoring duplicates because ejabberd does
-               local mechanism = stanza.attr.mechanism;
-               if anonymous_login then
-                       if mechanism ~= "ANONYMOUS" then
+               if config.get(session.host or "*", "core", "anonymous_login") then
+                       if stanza.attr.mechanism ~= "ANONYMOUS" then
                                return session.send(build_reply("failure", "invalid-mechanism"));
                        end
-               elseif mechanism == "ANONYMOUS" then
+               elseif stanza.attr.mechanism == "ANONYMOUS" then
                        return session.send(build_reply("failure", "mechanism-too-weak"));
                end
-               if not session.secure and (secure_auth_only or (mechanism == "PLAIN" and not allow_unencrypted_plain_auth)) then
-                       return session.send(build_reply("failure", "encryption-required"));
-               end
-               local valid_mechanism = session.sasl_handler:select(mechanism);
+               local valid_mechanism = session.sasl_handler:select(stanza.attr.mechanism);
                if not valid_mechanism then
                        return session.send(build_reply("failure", "invalid-mechanism"));
                end
+               if secure_auth_only and not session.secure then
+                       return session.send(build_reply("failure", "encryption-required"));
+               end
        elseif not session.sasl_handler then
                return; -- FIXME ignoring out of order stanzas because ejabberd does
        end
@@ -133,16 +179,18 @@ 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);
+               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);
                else
-                       origin.sasl_handler = usermanager_get_sasl_handler(module.host);
+                       origin.sasl_handler = new_sasl(realm, default_authentication_profile);
+                       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 mechanism in pairs(origin.sasl_handler:mechanisms()) do
-                       if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then
-                               features:tag("mechanism"):text(mechanism):up();
-                       end
+               for k, v in pairs(origin.sasl_handler:mechanisms()) do
+                       features:tag("mechanism"):text(v):up();
                end
                features:up();
        else