Merge 0.7->trunk

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 158d59c7bc1bcd64a526edd4f907e1d3a8fd7faf..8d7270c2e59ee797341b87f0839931de88bbf162 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -1,15 +1,12 @@
--- Prosody IM v0.4
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
--- 
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
-
-
-require "util.datamanager"
-local datamanager = datamanager;
+local datamanager = require "util.datamanager";
 local log = require "util.logger".init("usermanager");
 local type = type;
 local error = error;
@@ -17,12 +14,17 @@ local ipairs = ipairs;
 local hashes = require "util.hashes";
 local jid_bare = require "util.jid".bare;
 local config = require "core.configmanager";
+local hosts = hosts;
 
 module "usermanager"
 
+local function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
+
 function validate_credentials(host, username, password, method)
        log("debug", "User '%s' is being validated", username);
+       if is_cyrus(host) then return nil, "Legacy auth not supported with Cyrus SASL."; end
        local credentials = datamanager.load(username, host, "accounts") or {};
+
        if method == nil then method = "PLAIN"; end
        if method == "PLAIN" and credentials.password then -- PLAIN, do directly
                if password == credentials.password then
@@ -30,7 +32,7 @@ function validate_credentials(host, username, password, method)
                else
                        return nil, "Auth failed. Invalid username or password.";
                end
-       end
+  end
        -- must do md5
        -- make credentials md5
        local pwd = credentials.password;
@@ -49,28 +51,46 @@ function validate_credentials(host, username, password, method)
        end
 end
 
+function get_password(username, host)
+       if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
+       return (datamanager.load(username, host, "accounts") or {}).password
+end
+function set_password(username, host, password)
+       if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
+       local account = datamanager.load(username, host, "accounts");
+       if account then
+               account.password = password;
+               return datamanager.store(username, host, "accounts", account);
+       end
+       return nil, "Account not available.";
+end
+
 function user_exists(username, host)
+       if is_cyrus(host) then return true; end
        return datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials
 end
 
 function create_user(username, password, host)
+       if is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end
        return datamanager.store(username, host, "accounts", {password = password});
 end
 
 function get_supported_methods(host)
-       local methods = {["PLAIN"] = true}; -- TODO this should be taken from the config
-       methods["DIGEST-MD5"] = true;
-       return methods;
+       return {["PLAIN"] = true, ["DIGEST-MD5"] = true}; -- TODO this should be taken from the config
 end
 
-function is_admin(jid)
-       local admins = config.get("*", "core", "admins") or {};
+function is_admin(jid, host)
+       host = host or "*";
+       local admins = config.get(host, "core", "admins");
+       if host ~= "*" and admins == config.get("*", "core", "admins") then
+               return nil;
+       end
        if type(admins) == "table" then
                jid = jid_bare(jid);
                for _,admin in ipairs(admins) do
                        if admin == jid then return true; end
                end
-       else log("debug", "Option core.admins is not a table"); end
+       elseif admins then log("warn", "Option 'admins' for host '%s' is not a table", host); end
        return nil;
 end