Merge 0.6->0.7

[prosody.git] / plugins / mod_saslauth.lua

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 2c92e974df87cc14df9fe7eaea8a66d99f3659a3..d407e5da8588ff5bc8787e05fb5232c34326b03e 100644 (file)
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -28,6 +28,12 @@ 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";
 
+-- 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;
 
 local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl';
@@ -45,7 +51,11 @@ elseif sasl_backend == "cyrus" then
        if ok then
                local cyrus_new = cyrus.new;
                new_sasl = function(realm)
-                       return cyrus_new(module:get_option("cyrus_service_realm") or realm, module:get_option("cyrus_service_name") or "xmpp");
+                       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);
@@ -99,15 +109,22 @@ 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;
+
+               if not(require_provisioning) or usermanager_user_exists(username, session.host) then
+                       local aret, err = sm_make_authenticated(session, session.sasl_handler.username);
+                       if aret 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();
+                       return "failure", "not-authorized", "User authenticated successfully, but not provisioned for XMPP";
                end
-               sm_make_authenticated(session, session.sasl_handler.username);
-               session.sasl_handler = nil;
-               session:reset_stream();
        end
        return status, ret, err_msg;
 end