Changeset 6753

Timestamp:

02/26/2018 03:56:52 AM (7 years ago)

Author:

dd32

Message:

2FA: Add a single method to enable/disable 2FA for a user.

This introduces a abstract Primary and Secondary provider class to allow us to alter how these providers handle generation behind the scenes.

See #77.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor

Files:

• providers/class-wporg-two-factor-primary.php (added)
• providers/class-wporg-two-factor-secondary.php (added)
• providers/class-wporg-two-factor-totp.php (modified) (1 diff)
• wporg-two-factor.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers/class-wporg-two-factor-totp.php

@@ -17 +17 @@
         return $instance;
     }
-
-    public function __construct() {
-        // Ensure that the Two_Factor_Totp-specific code is added.
-        add_action( 'two-factor-user-options-' . __CLASS__, array( $this, 'user_two_factor_options' ) );
-
-        return parent::__construct();
-    }
-
-    /**
-     * Returns the name of the provider.
-     */
-    public function get_label() {
-        return _x( 'Time Based One-Time Password (Google Authenticator, Authy, etc)', 'Provider Label', 'wporg' );
-    }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/wporg-two-factor.php

@@ -187 +187 @@
     public function two_factor_providers( $providers) {
         $wporg_providers = array(
-            'WPORG_Two_Factor_Email'        => __DIR__ . '/providers/class-wporg-two-factor-email.php',
-            'WPORG_Two_Factor_Totp'         => __DIR__ . '/providers/class-wporg-two-factor-totp.php',
-            'WPORG_Two_Factor_Backup_Codes' => __DIR__ . '/providers/class-wporg-two-factor-backup-codes.php',
-            'WPORG_Two_Factor_Slack'        => __DIR__ . '/providers/class-wporg-two-factor-slack.php'
+            'WPORG_Two_Factor_Primary'   => __DIR__ . '/providers/class-wporg-two-factor-primary.php',
+            'WPORG_Two_Factor_Secondary' => __DIR__ . '/providers/class-wporg-two-factor-secondary.php',
         );
 
         return $wporg_providers;
+    }
+
+    /**
+     * Simple handler to enable Two factor for a given user.
+     * NOTE: It's assumed that the Two Factor details have been setup correctly previously.
+     */
+    public static function enable_two_factor( $user_id ) {
+        // True if at least one provider method was set.
+        return (
+            update_user_meta( $user_id, self::PROVIDER_USER_META_KEY,          'WPORG_Two_Factor_Primary' ) ||
+            update_user_meta( $user_id, self::ENABLED_PROVIDERS_USER_META_KEY, [ 'WPORG_Two_Factor_Primary', 'WPORG_Two_Factor_Secondary' ] )
+        );
+    }
+
+    /**
+     * Simple handler to disable Two factor for a given user.
+     */
+    public static function disable_two_factor( $user_id ) {
+        delete_user_meta( $user_id, self::PROVIDER_USER_META_KEY );
+        delete_user_meta( $user_id, self::ENABLED_PROVIDERS_USER_META_KEY );
+        delete_user_meta( $user_id, Two_Factor_Totp::SECRET_META_KEY );
+        return true;
     }
 
@@ -205 +225 @@
 
         $key       = get_user_meta( $user->ID, Two_Factor_Totp::SECRET_META_KEY, true );
-        $is_active = !! $key;
+        $is_active = self::is_user_using_two_factor( $user->ID );
         ?>
 
@@ -377 +397 @@
             }
 
+            if ( ! self::enable_two_factor( $user_id ) ) {
+                wp_send_json_error( __( 'Unable to save Two Factor Authentication code. Please try again.', 'wporg' ) );
+            }
+
             wp_send_json_success();
         }
@@ -392 +416 @@
         if ( ! current_user_can( 'edit_user', $user_id ) ) {
             wp_send_json_error( __( 'You do not have permission to edit this user.' ) );
-        };
-
-        if ( ! delete_user_meta( $user_id, Two_Factor_Totp::SECRET_META_KEY ) ) {
-            wp_send_json_error( __( 'Unable to remove Two Factor Authentication code. Please try again.', 'wporg' ) );
-        }
-
-        if ( ! update_user_meta( $user_id, Two_Factor_Core::ENABLED_PROVIDERS_USER_META_KEY, [] ) ) {
+        }
+
+        if ( ! self::disable_two_factor( $user_id ) ) {
             wp_send_json_error( __( 'Unable to remove Two Factor Authentication code. Please try again.', 'wporg' ) );
         }