From 9df44146a6b13f05b978168d1607d80841d8da2c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 20 May 2010 11:32:24 +0100 Subject: usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required) --- core/usermanager.lua | 6 ++++-- plugins/mod_saslauth.lua | 14 +++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/core/usermanager.lua b/core/usermanager.lua index 8d7270c2..42e49d38 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -16,6 +16,8 @@ local jid_bare = require "util.jid".bare; local config = require "core.configmanager"; local hosts = hosts; +local require_provisioning = config.get("*", "core", "cyrus_require_provisioning") or false; + module "usermanager" local function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end @@ -66,12 +68,12 @@ function set_password(username, host, password) end function user_exists(username, host) - if is_cyrus(host) then return true; end + if not(require_provisioning) and 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 + if not(require_provisioning) and is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end return datamanager.store(username, host, "accounts", {password = password}); end diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 2c92e974..773a44a1 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -27,6 +27,7 @@ local config = require "core.configmanager"; local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption"); local sasl_backend = module:get_option("sasl_backend") or "builtin"; +local require_provisioning = module:get_option("cyrus_require_provisioning") or false; local log = module._log; @@ -105,9 +106,16 @@ local function handle_status(session, status, ret, err_msg) session:reset_stream(); return status, ret, err_msg; end - sm_make_authenticated(session, session.sasl_handler.username); - session.sasl_handler = nil; - session:reset_stream(); + + if not(require_provisioning) or usermanager_user_exists(username, session.host) then + sm_make_authenticated(session, session.sasl_handler.username); + session.sasl_handler = nil; + session:reset_stream(); + else + module:log("warn", "SASL succeeded but we don't have an account provisioned for %s", username); + session.sasl_handler = session.sasl_handler:clean_clone(); + return "failure", "not-authorized", "User authenticated successfully, but not provisioned for XMPP"; + end end return status, ret, err_msg; end -- cgit v1.2.3