util.datetime: Added implementation for function parse().

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index bb8cd962d3c3a70f56b96408071a4f823658df76..62bbaee5bef2b7c64d2a470e7378225bccc18f38 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -16,6 +16,7 @@ local hashes = require "util.hashes";
 local jid_bare = require "util.jid".bare;
 local config = require "core.configmanager";
 local hosts = hosts;
+local sasl_new = require "util.sasl".new;
 
 local require_provisioning = config.get("*", "core", "cyrus_require_provisioning") or false;
 
@@ -23,16 +24,17 @@ local prosody = _G.prosody;
 
 local setmetatable = setmetatable;
 
-local default_provider = "internal";
+local default_provider = "internal_plain";
 
 module "usermanager"
 
 function new_null_provider()
        local function dummy() end;
-       return setmetatable({name = "null"}, { __index = function() return dummy; end });
+       local function dummy_get_sasl_handler() return sasl_new(nil, {}); end
+       return setmetatable({name = "null", get_sasl_handler = dummy_get_sasl_handler}, { __index = function() return dummy; end });
 end
 
-local function host_handler(host)
+function initialize_host(host)
        local host_session = hosts[host];
        host_session.events.add_handler("item-added/auth-provider", function (event)
                local provider = event.item;
@@ -56,12 +58,12 @@ local function host_handler(host)
                modulemanager.load(host, "auth_"..auth_provider);
        end
 end;
-prosody.events.add_handler("host-activated", host_handler, 100);
-prosody.events.add_handler("component-activated", host_handler, 100);
+prosody.events.add_handler("host-activated", initialize_host, 100);
+prosody.events.add_handler("component-activated", initialize_host, 100);
 
 function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
 
-function test_password(username, password, host)
+function test_password(username, host, password)
        return hosts[host].users.test_password(username, password);
 end
 
@@ -91,24 +93,43 @@ end
 
 function is_admin(jid, host)
        local is_admin;
-       if host and host ~= "*" then
-               is_admin = hosts[host].users.is_admin(jid);
+       jid = jid_bare(jid);
+       host = host or "*";
+       
+       local host_admins = config.get(host, "core", "admins");
+       local global_admins = config.get("*", "core", "admins");
+       
+       if host_admins and host_admins ~= global_admins then
+               if type(host_admins) == "table" then
+                       for _,admin in ipairs(host_admins) do
+                               if admin == jid then
+                                       is_admin = true;
+                                       break;
+                               end
+                       end
+               elseif host_admins then
+                       log("error", "Option 'admins' for host '%s' is not a list", host);
+               end
        end
-       if not is_admin then -- Test only whether this JID is a global admin
-               local admins = config.get("*", "core", "admins");
-               if type(admins) == "table" then
-                       jid = jid_bare(jid);
-                       for _,admin in ipairs(admins) do
+       
+       if not is_admin and global_admins then
+               if type(global_admins) == "table" then
+                       for _,admin in ipairs(global_admins) do
                                if admin == jid then
                                        is_admin = true;
                                        break;
                                end
                        end
-               elseif admins then
-                       log("error", "Option 'admins' for host '%s' is not a table", host);
+               elseif global_admins then
+                       log("error", "Global option 'admins' is not a list");
                end
        end
-       return is_admin;
+       
+       -- Still not an admin, check with auth provider
+       if not is_admin and host ~= "*" and hosts[host].users.is_admin then
+               is_admin = hosts[host].users.is_admin(jid);
+       end
+       return is_admin or false;
 end
 
 return _M;