From e0c6bb2b56733117b2290052f266a5e5df7b12d9 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 20 May 2010 11:05:43 +0100 Subject: mod_saslauth: Allow the Cyrus SASL realm to be configurable --- plugins/mod_saslauth.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index c0360553..6e158463 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -45,7 +45,7 @@ elseif sasl_backend == "cyrus" then if ok then local cyrus_new = cyrus.new; new_sasl = function(realm) - return cyrus_new(realm, module:get_option("cyrus_service_name") or "xmpp"); + return cyrus_new(module:get_option("cyrus_service_realm") or realm, module:get_option("cyrus_service_name") or "xmpp"); end else module:log("error", "Failed to load Cyrus SASL because: %s", cyrus); -- cgit v1.2.3 From 06fe337d67c941d8a9e9bb176a42f1e68340518e Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 20 May 2010 11:08:51 +0100 Subject: mod_saslauth: Add return value and error message to the Cyrus SASL handle_status callback --- plugins/mod_saslauth.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 6e158463..2c92e974 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -94,7 +94,7 @@ local function build_reply(status, ret, err_msg) return reply; end -local function handle_status(session, status) +local function handle_status(session, status, ret, err_msg) if status == "failure" then session.sasl_handler = session.sasl_handler:clean_clone(); elseif status == "success" then @@ -103,12 +103,13 @@ local function handle_status(session, status) module:log("warn", "SASL succeeded but we didn't get a username!"); session.sasl_handler = nil; session:reset_stream(); - return; + return status, ret, err_msg; end sm_make_authenticated(session, session.sasl_handler.username); session.sasl_handler = nil; session:reset_stream(); end + return status, ret, err_msg; end local function sasl_handler(session, stanza) @@ -142,7 +143,7 @@ local function sasl_handler(session, stanza) end end local status, ret, err_msg = session.sasl_handler:process(text); - handle_status(session, status); + status, ret, err_msg = handle_status(session, status, ret, err_msg); local s = build_reply(status, ret, err_msg); log("debug", "sasl reply: %s", tostring(s)); session.send(s); -- cgit v1.2.3 From 95f7a472e0b1b9d055179039fc0380d697356be6 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 20 May 2010 11:13:51 +0100 Subject: util.sasl_cyrus: Support for specifying the application name (to pass to Cyrus SASL's init()) --- util/sasl_cyrus.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua index b5b0e08d..b5f505eb 100644 --- a/util/sasl_cyrus.lua +++ b/util/sasl_cyrus.lua @@ -45,10 +45,10 @@ local function init(service_name) end -- create a new SASL object which can be used to authenticate clients -function new(realm, service_name) +function new(realm, service_name, app_name) local sasl_i = {}; - init(service_name); + init(app_name or service_name); sasl_i.realm = realm; sasl_i.service_name = service_name; -- cgit v1.2.3 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