portmanager: Show a friendly error message when initializing SSL fails (thanks MattJ...

[prosody.git] / plugins / mod_auth_cyrus.lua

diff --git a/plugins/mod_auth_cyrus.lua b/plugins/mod_auth_cyrus.lua
index c1315e7f25b26296ead2e19e7311be7767d0cac1..e4493f0490d5fef4559ce3bacfa207ff7a259e38 100644 (file)
--- a/plugins/mod_auth_cyrus.lua
+++ b/plugins/mod_auth_cyrus.lua
@@ -8,9 +8,13 @@
 
 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;
+local host_fqdn = module:get_option("cyrus_server_fqdn");
 
 prosody.unlock_globals(); --FIXME: Figure out why this is needed and
                                                  -- why cyrussasl isn't caught by the sandbox
@@ -20,10 +24,23 @@ local new_sasl = function(realm)
        return cyrus_new(
                cyrus_service_realm or realm,
                cyrus_service_name or "xmpp",
-               cyrus_application_name or "prosody"
+               cyrus_application_name or "prosody",
+               host_fqdn
        );
 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);
@@ -41,6 +58,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
 
@@ -49,8 +69,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;