mod_bosh: Store time to destroy session in inactive_sessions, removing dependency...

[prosody.git] / plugins / mod_auth_cyrus.lua

diff --git a/plugins/mod_auth_cyrus.lua b/plugins/mod_auth_cyrus.lua
index 7c23ea21578ea85d13241b57623f9afe3c7e69cb..447fae517c19440b6af16e5599dca6d42eb2d2d7 100644 (file)
--- a/plugins/mod_auth_cyrus.lua
+++ b/plugins/mod_auth_cyrus.lua
@@ -1,7 +1,6 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- Copyright (C) 2010 Jeff Mitchell
 --
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -9,9 +8,12 @@
 
 local log = require "util.logger".init("auth_cyrus");
 
+local usermanager_user_exists = require "core.usermanager".user_exists;
+
 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 require_provisioning = module:get_option("cyrus_require_provisioning") or false;
 
 prosody.unlock_globals(); --FIXME: Figure out why this is needed and
                                                  -- why cyrussasl isn't caught by the sandbox
@@ -25,6 +27,18 @@ local new_sasl = function(realm)
        );
 end
 
+do -- diagnostic
+       local list;
+       for mechanism in pairs(new_sasl(module.host):mechanisms()) do
+               list = (not(list) and mechanism) or (list..", "..mechanism);
+       end
+       if not list then
+               module:log("error", "No Cyrus SASL mechanisms available");
+       else
+               module:log("debug", "Available Cyrus SASL mechanisms: %s", list);
+       end
+end
+
 function new_default_provider(host)
        local provider = { name = "cyrus" };
        log("debug", "initializing default authentication provider for host '%s'", host);
@@ -42,6 +56,9 @@ function new_default_provider(host)
        end
 
        function provider.user_exists(username)
+               if require_provisioning then
+                       return usermanager_user_exists(username, module.host);
+               end
                return true;
        end
 
@@ -50,8 +67,13 @@ function new_default_provider(host)
        end
 
        function provider.get_sasl_handler()
-               local realm = module:get_option("sasl_realm") or module.host;
-               return new_sasl(realm);
+               local handler = new_sasl(module.host);
+               if require_provisioning then
+                       function handler.require_provisioning(username)
+                               return usermanager_user_exists(username, module.host);
+                       end
+               end
+               return handler;
        end
 
        return provider;