Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revalidation: Don't prompt on non-2fa sessions #168

Merged
merged 1 commit into from
May 19, 2023
Merged

Revalidation: Don't prompt on non-2fa sessions #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions settings/rest-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,21 @@ function register_user_fields(): void {
'user',
'2fa_revalidation',
[
'get_callback' => function( $user ) {
'get_callback' => function() {
/*
* Note: This field is always about the authenticated user, NOT the user being requested.
* This should likely be it's own endpoint, but it's here for now, to ensure that
* when an admin is editing other users, they get prompted to update their 2FA as well.
*/

$last_validated = Two_Factor_Core::is_current_user_session_two_factor();
if ( ! $last_validated ) {
return false;
}

$revalidate_url = Two_Factor_Core::get_user_two_factor_revalidate_url( true );
$expiry = apply_filters( 'two_factor_revalidate_time', 10 * MINUTE_IN_SECONDS, $user['id'], '' );
$expires_at = Two_Factor_Core::is_current_user_session_two_factor() + $expiry;
$expiry = apply_filters( 'two_factor_revalidate_time', 10 * MINUTE_IN_SECONDS, get_current_user_id(), '' );
$expires_at = $last_validated + $expiry;

return compact( 'revalidate_url', 'expires_at' );
},
Expand Down