Skip to content

fix: ensure execution stops after redirects #786

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

Merged
kasparsd merged 2 commits into from
Feb 13, 2026
+6 −5
Merged

fix: ensure execution stops after redirects #786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1be422d
fix: ensure execution stops after redirects.
sjinks Feb 9, 2026
f5c2619
style: use `exit;` to stay aligned with WP coding standards
sjinks Feb 9, 2026
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
11 changes: 6 additions & 5 deletions class-two-factor-core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Two Factore Core Class.
* Two Factor Core Class.
*
* @package Two_Factor
*/
Expand Down Expand Up @@ -1479,7 +1479,7 @@ public static function _login_form_validate_2fa( $user, $nonce = '', $provider =
// Validate the request.
if ( true !== self::verify_login_nonce( $user->ID, $nonce ) ) {
wp_safe_redirect( home_url() );
return;
exit;
}

$provider = self::get_provider_for_user( $user, $provider );
Expand Down Expand Up @@ -1567,6 +1567,7 @@ public static function _login_form_validate_2fa( $user, $nonce = '', $provider =

$redirect_to = apply_filters( 'login_redirect', $redirect_to, $redirect_to, $user ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- Core WordPress filter.
wp_safe_redirect( $redirect_to );
exit;
}


Expand Down Expand Up @@ -1602,15 +1603,15 @@ public static function login_form_revalidate_2fa() {
public static function _login_form_revalidate_2fa( $nonce = '', $provider = '', $redirect_to = '', $is_post_request = false ) {
if ( ! is_user_logged_in() ) {
wp_safe_redirect( home_url() );
return;
exit;
}

$user = wp_get_current_user();

// Validate the nonce for POST requests. GET requests do not perform actions, and such do not require the nonce (such as the initial request).
if ( $is_post_request && ! wp_verify_nonce( $nonce, 'two_factor_revalidate_' . $user->ID ) ) {
wp_safe_redirect( home_url() );
return;
exit;
}

$provider = self::get_provider_for_user( $user, $provider );
Expand Down Expand Up @@ -1665,7 +1666,7 @@ public static function _login_form_revalidate_2fa( $nonce = '', $provider = '',

$redirect_to = apply_filters( 'login_redirect', $redirect_to, $redirect_to, $user ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- Core WordPress filter.
wp_safe_redirect( $redirect_to );
return;
exit;
}

/**
Expand Down