Merge 0.10->trunk

[prosody.git] / plugins / mod_auth_cyrus.lua

diff --git a/plugins/mod_auth_cyrus.lua b/plugins/mod_auth_cyrus.lua
index 8ffc27e968798d92e95aadba36c39b6c0e574eab..7668f8c407f2b8255e645d0d88c8dae179796090 100644 (file)
--- a/plugins/mod_auth_cyrus.lua
+++ b/plugins/mod_auth_cyrus.lua
@@ -1,21 +1,20 @@
 -- 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.
 --
 
 local log = require "util.logger".init("auth_cyrus");
-local type = type;
-local ipairs = ipairs;
-local jid_bare = require "util.jid".bare;
-local config = require "core.configmanager";
+
+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
@@ -25,53 +24,61 @@ 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
 
-function new_default_provider(host)
-       local provider = { name = "cyrus" };
-       log("debug", "initializing default authentication provider for host '%s'", host);
-
-       function provider.test_password(username, password)
-               return nil, "Legacy auth not supported with Cyrus SASL.";
-       end
-
-       function provider.get_password(username)
-               return nil, "Passwords unavailable for Cyrus SASL.";
+do -- diagnostic
+       local list;
+       for mechanism in pairs(new_sasl(module.host):mechanisms()) do
+               list = (not(list) and mechanism) or (list..", "..mechanism);
        end
-       
-       function provider.set_password(username, password)
-               return nil, "Passwords unavailable for Cyrus SASL.";
+       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 provider.user_exists(username)
-               return true;
-       end
+local host = module.host;
 
-       function provider.create_user(username, password)
-               return nil, "Account creation/modification not available with Cyrus SASL.";
-       end
+-- define auth provider
+local provider = {};
+log("debug", "initializing default authentication provider for host '%s'", host);
+
+function provider.test_password(username, password)
+       return nil, "Legacy auth not supported with Cyrus SASL.";
+end
+
+function provider.get_password(username)
+       return nil, "Passwords unavailable for Cyrus SASL.";
+end
+
+function provider.set_password(username, password)
+       return nil, "Passwords unavailable for Cyrus SASL.";
+end
 
-       function provider.get_sasl_handler()
-               local realm = module:get_option("sasl_realm") or module.host;
-               return new_sasl(realm);
+function provider.user_exists(username)
+       if require_provisioning then
+               return usermanager_user_exists(username, host);
        end
+       return true;
+end
+
+function provider.create_user(username, password)
+       return nil, "Account creation/modification not available with Cyrus SASL.";
+end
 
-       function provider.is_admin(jid)
-               local admins = config.get(host, "core", "admins");
-               if admins ~= config.get("*", "core", "admins") and type(admins) == "table" then
-                       jid = jid_bare(jid);
-                       for _,admin in ipairs(admins) do
-                               if admin == jid then return true; end
-                       end
-               elseif admins then
-                       log("error", "Option 'admins' for host '%s' is not a table", host);
+function provider.get_sasl_handler()
+       local handler = new_sasl(host);
+       if require_provisioning then
+               function handler.require_provisioning(username)
+                       return usermanager_user_exists(username, host);
                end
-               return is_admin(jid); -- Test whether it's a global admin instead
        end
-       return provider;
+       return handler;
 end
 
-module:add_item("auth-provider", new_default_provider(module.host));
+module:provides("auth", provider);