mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_tokenauth: Move grant validation to a reusable function

Browse source
This commit is contained in:
Matthew Wild 2023-03-29 17:14:45 +01:00
parent 89bf5049a1
commit 2ed84fde94
1 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
plugins/mod_tokenauth.lua
View file

@ -139,6 +139,28 @@ local function clear_expired_grant_tokens(grant, now)
return updated; return updated;
end end
local function _get_validated_grant_info(username, grant)
if type(grant) == "string" then
grant = token_store:get_key(username, grant);
end
if not grant or not grant.created then return nil; end
-- Invalidate grants from before last password change
local account_info = usermanager.get_account_info(username, module.host);
local password_updated_at = account_info and account_info.password_updated;
if password_updated_at and grant.created < password_updated_at then
module:log("debug", "Token grant issued before last password change, invalidating it now");
token_store:set_key(username, grant.id, nil);
return nil, "not-authorized";
elseif grant.expires and grant.expires < os.time() then
module:log("debug", "Token grant expired, cleaning up");
token_store:set_key(username, grant.id, nil);
return nil, "expired";
end
return grant;
end
local function _get_validated_token_info(token_id, token_user, token_host, token_secret) local function _get_validated_token_info(token_id, token_user, token_host, token_secret)
if token_host ~= module.host then if token_host ~= module.host then
return nil, "invalid-host"; return nil, "invalid-host";
@ -171,12 +193,9 @@ local function _get_validated_token_info(token_id, token_user, token_host, token
return nil, "not-authorized"; return nil, "not-authorized";
end end
-- Invalidate grants from before last password change -- Verify grant validity (expiry, etc.)
local account_info = usermanager.get_account_info(token_user, module.host); grant = _get_validated_grant_info(token_user, grant);
local password_updated_at = account_info and account_info.password_updated; if not grant then
if password_updated_at and grant.created < password_updated_at then
module:log("debug", "Token grant issued before last password change, invalidating it now");
token_store:set_key(token_user, token_id, nil);
return nil, "not-authorized"; return nil, "not-authorized";
end end