Ensure that doesn't 'fail open' if existing providers poof. #586
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This also ensures if a user only had U2F enabled, and it's deprecated and removed, that it won't "fail open" for lack of any available methods. If Email is available, shove it in. If not, return an error.
class-two-factor-core.php
Outdated
| @@ -413,15 +413,37 @@ public static function get_enabled_providers_for_user( $user = null ) { | |||
| if ( empty( $enabled_providers ) ) { | |||
| $enabled_providers = array(); | |||
| } | |||
| $enabled_providers = array_intersect( $enabled_providers, array_keys( $providers ) ); | |||
| $enabled_existing_providers = array_intersect( $enabled_providers, array_keys( $providers ) ); | |||
There was a problem hiding this comment.
Suggested change
| $enabled_existing_providers = array_intersect( $enabled_providers, array_keys( $providers ) ); | |
| $enabled_registered_providers = array_intersect( $enabled_providers, array_keys( $providers ) ); |
Would this be more clear that we are talking about enabled providers that are registered?
|
Possible chance with bad input this changes some test results -- I need to add a test for the use case anyway. |
The return value uses the class as keys, and the object as the value.
TOTP being unconfigured stripped it out otherwise.
Co-authored-by: Timothy Jacobs <timothy@ironbounddesigns.com>
|
Once this is in, purging u2f from the plugin won't leave users who only had that enabled wide open with no two-factor protection. |
This was referenced Aug 28, 2023
iandunn
approved these changes
Aug 28, 2023
| @@ -505,6 +530,9 @@ public static function get_primary_provider_for_user( $user = null ) { | |||
| // If there's only one available provider, force that to be the primary. | |||
| if ( empty( $available_providers ) ) { | |||
| return null; | |||
| } elseif ( is_wp_error( $available_providers ) ) { | |||
| // If it returned an error, the configured methods don't exist, and it couldn't swap in a replacement. | |||
| wp_die( $available_providers ); | |||
There was a problem hiding this comment.
TIL _wp_die_process_input will automatically output the messages. Nice!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This also ensures if a user only had U2F enabled, and it's deprecated and removed, that it won't "fail open" for lack of any available methods.
If Email is available, shove it in. If not, return an error.