aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-03-23 20:24:56 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-03-23 20:24:56 +0500
commita8a3b65e1f0a7ab9a5aabcc76ea1318f96ab5149 (patch)
tree0b99f621811d87406e0c12911fb6acf43d5c0bcf /core
parent155c4978477d35edbb8e6d76e959200f62ea13f7 (diff)
downloadprosody-a8a3b65e1f0a7ab9a5aabcc76ea1318f96ab5149.tar.gz
prosody-a8a3b65e1f0a7ab9a5aabcc76ea1318f96ab5149.zip
usermanager: Return sane errors/results when Cyrus SASL is in use.
Diffstat (limited to 'core')
-rw-r--r--core/usermanager.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua
index 6b19b651..efb2e750 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,17 @@ 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 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