From 96acef217098a0c0e7acebd6b162647167d11e25 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 23 Feb 2023 14:34:10 +0100 Subject: mod_auth_internal_hashed: Implement is_enabled() method Uses 'disabled' property already introduced in aed38948791f --- plugins/mod_auth_internal_hashed.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'plugins/mod_auth_internal_hashed.lua') diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua index 56f7d5d6..d5fa8e12 100644 --- a/plugins/mod_auth_internal_hashed.lua +++ b/plugins/mod_auth_internal_hashed.lua @@ -98,6 +98,7 @@ function provider.get_account_info(username) return { created = account.created; password_updated = account.updated; + enabled = not account.disabled; }; end @@ -111,8 +112,9 @@ function provider.user_exists(username) end function provider.is_enabled(username) -- luacheck: ignore 212 - -- TODO look up somewhere and allow disabling - return true; + local info, err = provider.get_account_info(username); + if not info then return nil, err; end + return info.enabled; end function provider.enable(username) -- luacheck: ignore 212 @@ -170,7 +172,7 @@ function provider.get_sasl_handler() local iteration_count, salt = credentials.iteration_count, credentials.salt; stored_key = stored_key and from_hex(stored_key); server_key = server_key and from_hex(server_key); - return stored_key, server_key, iteration_count, salt, provider.is_enabled(username); + return stored_key, server_key, iteration_count, salt, not credentials.disabled; end }; return new_sasl(host, testpass_authentication_profile); -- cgit v1.2.3