aboutsummaryrefslogtreecommitdiffstats
path: root/core/usermanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-24 22:41:43 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-24 22:41:43 +0000
commit3487bfbd547efbdb6021f24b517c15ba08ee84db (patch)
tree7f56b1cea38c4cc972015bb0cde0d022cd668afe /core/usermanager.lua
parente9210ce2e777ed966cc4e80df96582e84d0d2ae8 (diff)
parent808ba7e691f4fbc36a380204ea4cce1c46d9b69b (diff)
downloadprosody-3487bfbd547efbdb6021f24b517c15ba08ee84db.tar.gz
prosody-3487bfbd547efbdb6021f24b517c15ba08ee84db.zip
Merge 0.7->trunk
Diffstat (limited to 'core/usermanager.lua')
-rw-r--r--core/usermanager.lua18
1 files changed, 17 insertions, 1 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua
index 6b19b651..8d7270c2 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -14,11 +14,15 @@ 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
@@ -48,14 +52,26 @@ function validate_credentials(host, username, password, method)
end
function get_password(username, host)
- return (datamanager.load(username, host, "accounts") or {}).password
+ 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