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

Issue-95: force_two_factor_authentication feature causing 502 errors on VIP #100

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Issue-95: force_two_factor_authentication feature causing 502 errors on VIP #100

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fdd911
WIP: issue-95
anubisthejackle Jul 22, 2024
8b616fa
Fix infinite loop in force 2fa logic
anubisthejackle Jul 22, 2024
84504e7
Ready for review
anubisthejackle Jul 22, 2024
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
23 changes: 11 additions & 12 deletions src/alley/wp/alleyvate/features/class-force-two-factor-authentication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ final class Force_Two_Factor_Authentication implements Feature {
*/
public function boot(): void {
if ( self::is_vip_environment() ) {
add_filter( 'wpcom_vip_is_two_factor_forced', [ self::class, 'filter__wpcom_vip_is_two_factor_forced' ], \PHP_INT_MAX );
add_filter( 'wpcom_vip_two_factor_enforcement_cap', [ self::class, 'filter__wpcom_vip_two_factor_enforcement_cap' ], \PHP_INT_MAX );
return;
}

Expand All @@ -36,16 +36,6 @@ public function boot(): void {
add_action( 'admin_notices', [ self::class, 'action__admin_notices' ] );
}

/**
* For VIP environments we can skip all of the functionality, and only focus on returning true if the current user
* can edit posts.
*
* @return bool
*/
public static function filter__wpcom_vip_is_two_factor_forced(): bool {
return self::force_to_enable_2fa();
}

/**
* Filter the user capabilities to restrict them to just those capabilities required to enabled two factor authentication.
*
Expand Down Expand Up @@ -89,6 +79,15 @@ public static function action__admin_notices(): void {
}
}

/**
* Returns the capability level that accounts will be required to use 2fa.
*
* @return string
*/
public static function filter__wpcom_vip_two_factor_enforcement_cap(): string {
return apply_filters( 'alleyvate_force_2fa_capability', 'edit_posts' );
}

/**
* Adds an Admin Notice notifying the end user that they need to enable Two Factor authentication.
*/
Expand Down Expand Up @@ -165,7 +164,7 @@ private static function should_use_two_factor_authentication(): bool {
* @return bool
*/
private static function force_to_enable_2fa(): bool {
$capability_min = apply_filters( 'alleyvate_force_2fa_capability', 'edit_posts' );
$capability_min = self::filter__wpcom_vip_two_factor_enforcement_cap();

// Remove the filter to avoid infinite loops.
$removed = remove_filter( 'map_meta_cap', [ self::class, 'filter__map_meta_cap' ], 0 );
Expand Down
Loading