diff options
Diffstat (limited to 'plugins/google-authenticator/google-authenticator.php')
| -rw-r--r-- | plugins/google-authenticator/google-authenticator.php | 591 |
1 files changed, 523 insertions, 68 deletions
diff --git a/plugins/google-authenticator/google-authenticator.php b/plugins/google-authenticator/google-authenticator.php index a2c46d85..6c19c17c 100644 --- a/plugins/google-authenticator/google-authenticator.php +++ b/plugins/google-authenticator/google-authenticator.php @@ -1,19 +1,21 @@ <?php /* Plugin Name: Google Authenticator -Plugin URI: http://henrik.schack.dk/google-authenticator-for-wordpress +Plugin URI: https://github.com/ivankruchkoff/google-authenticator Description: Two-Factor Authentication for WordPress using the Android/iPhone/Blackberry app as One Time Password generator. -Author: Henrik Schack -Version: 0.48 -Author URI: http://henrik.schack.dk/ -Compatibility: WordPress 4.5 +Author: Ivan Kruchkoff +Version: 0.51 +Author URI: https://github.com/ivankruchkoff +Compatibility: WordPress 5.1 Text Domain: google-authenticator Domain Path: /lang ---------------------------------------------------------------------------- + Thanks to Henrik Schack for creating / maintaining versions 0.20 to 0.48 + Thanks to Ivan Kruchkoff for his UX improvements in user signup. Thanks to Bryan Ruiz for his Base32 encode/decode class, found at php.net. - Thanks to Tobias Bäthge for his major code rewrite and German translation. + Thanks to Tobias Bäthge for his major code rewrite and German translation. Thanks to Pascal de Bruijn for his relaxed mode idea. Thanks to Daniel Werl for his usability tips. Thanks to Dion Hulse for his bugfixes. @@ -22,30 +24,36 @@ Domain Path: /lang Thanks to Ian Dunn for fixing some depricated function calls. Thanks to Kimmo Suominen for fixing the iPhone description issue. Thanks to Alex Concha for some security tips. - Thanks to Sébastien Prunier for his Spanish and French translations. + Thanks to Sébastien Prunier for his Spanish and French translations. ---------------------------------------------------------------------------- - Copyright 2013 Henrik Schack (email : henrik@schack.dk) + Versions from 0.49 onwards + Copyright 2019 Ivan Kruchkoff - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + Versions up to and including 0.48 + Copyright 2013 Henrik Schack (email : henrik@schack.dk) - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ class GoogleAuthenticator { static $instance; // to store a reference to the plugin, allows other plugins to remove actions +const SETUP_PAGE = 'google_authenticator_user_page'; +protected $error_message = null; /** * Constructor, entry point of the plugin @@ -59,10 +67,15 @@ function __construct() { * Initialization, Hooks, and localization */ function init() { - require_once( 'base32.php' ); - - add_action( 'login_form', array( $this, 'loginform' ) ); - add_action( 'login_footer', array( $this, 'loginfooter' ) ); + if ( ! class_exists( 'Base32' ) ) { + require_once( 'base32.php' ); + } + + if ( ! $this->is_two_screen_signin_enabled() ) { + add_action( 'login_form', array( $this, 'loginform' ) ); + add_action( 'login_footer', array( $this, 'loginfooter' ) ); + } + add_filter( 'authenticate', array( $this, 'check_otp' ), 50, 3 ); if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { @@ -74,36 +87,51 @@ function init() { add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) ); add_action( 'edit_user_profile_update', array( $this, 'edit_user_profile_update' ) ); - add_action('admin_enqueue_scripts', array($this, 'add_qrcode_script')); + add_action( 'admin_enqueue_scripts', array( $this, 'add_qrcode_script' ) ); + add_action( 'admin_menu', array ( $this, 'add_pages' ) ); + add_action( 'network_admin_menu', array ( $this, 'add_pages' ) ); + add_action( 'current_screen', array ( $this, 'redirect_if_setup_required' ) ); + add_action( 'admin_notices', array ( $this, 'successful_signup_message' ) ); + add_action( 'load-admin_page_google_authenticator_user_page', array( $this, 'save_submitted_setup_page' ) ); load_plugin_textdomain( 'google-authenticator', false, basename( dirname( __FILE__ ) ) . '/lang' ); } +/** + * Whether we show Google Auth code on the login screen, or after the user has entered their username and password. + * + * If it's on a separate screen, it means username / passwords can still be bruteforced, but logins can't occur without 2fa + * + * @return bool + */ +function is_two_screen_signin_enabled() { + $two_screen_mfa = is_multisite() ? get_site_option( 'googleauthenticator_two_screen_signin' ) : get_option( 'googleauthenticator_two_screen_signin' ); + return !! $two_screen_mfa; +} /** * Check the verification code entered by the user. */ -function verify( $secretkey, $thistry, $relaxedmode, $lasttimeslot ) { +function verify( $secretkey, $thistry, $relaxedmode, $lasttimeslot ) { // Did the user enter 6 digits ? if ( strlen( $thistry ) != 6) { return false; } else { $thistry = intval ( $thistry ); } - // If user is running in relaxed mode, we allow more time drifting - // ±4 min, as opposed to ± 30 seconds in normal mode. + // ±4 min, as opposed to ± 30 seconds in normal mode. if ( $relaxedmode == 'enabled' ) { $firstcount = -8; - $lastcount = 8; + $lastcount = 8; } else { $firstcount = -1; - $lastcount = 1; + $lastcount = 1; } - + $tm = floor( time() / 30 ); - + $secretkey=Base32::decode($secretkey); // Keys from 30 seconds before and after are valid aswell. for ($i=$firstcount; $i<=$lastcount; $i++) { @@ -161,12 +189,358 @@ function add_qrcode_script() { } /** + * Add 2fa pages to menus + */ +function add_pages() { + // No menu entry for this page + add_submenu_page( null, esc_html__( 'Google Authenticator', 'google-authenticator' ), null, 'read', self::SETUP_PAGE, array( $this, 'user_setup_page' ) ); + + // Site admin screen + add_submenu_page( 'options-general.php', esc_html__( 'Google Authenticator', 'google-authenticator' ), esc_html__( 'Google Authenticator', 'google-authenticator' ), 'manage_options', 'google_authenticator', array( $this, 'admin_setup_page' ) ); + + // Network admin screen + add_submenu_page( 'settings.php', esc_html__( 'Google Authenticator', 'google-authenticator' ), esc_html__( 'Google Authenticator', 'google-authenticator' ), 'manage_network_options', 'google_authenticator', array( $this, 'network_admin_setup_page' ) ); +} + +/** + * Determine if a user needs to setup authy 2fa + * @return bool + */ +function user_needs_to_setup_google_authenticator() { + $user = wp_get_current_user(); + $enabled = trim(get_user_option( 'googleauthenticator_enabled', $user->ID ) ) === 'enabled'; + if ( $enabled ) { + return false; + } + + $must_signup = false; + $user_role = $user->roles[0]; + $check_single_site_admin_options = true; + + if ( is_multisite() ) { + $roles = get_site_option( 'googleauthenticator_mandatory_mfa_roles', array() ); + if ( in_array( $user_role, $roles ) ) { + $must_signup = true; + } + $check_single_site_admin_options = '1' !== get_site_option( 'googleauthenticator_network_only' ) ; + } + + if ( ! $must_signup && $check_single_site_admin_options ) { + $roles = get_option( 'googleauthenticator_mandatory_mfa_roles', array() ); + if ( in_array( $user_role, $roles ) ) { + $must_signup = true; + } + + } + + return apply_filters( 'google_authenticator_needs_setup', $must_signup, $user ); +} + +/** + * Send users to the signup page if they must signup. + */ +function redirect_if_setup_required() { + if ( $this->user_needs_to_setup_google_authenticator() ) { + $screen = get_current_screen(); + $pagename = 'admin_page_' . self::SETUP_PAGE; + if ( is_a( $screen, 'WP_Screen') && in_array( $screen->id, array( $pagename, 'profile' ) ) ) { + return; + } + + // Some check against super admin so they can enable/disable the plugin. + $location = admin_url( 'admin.php?page=' . self::SETUP_PAGE ); + wp_redirect( $location); + exit; + } +} + +/** + * Save the GA secret if valid totp is provided + * @return void + */ +function save_submitted_setup_page() { + $this->error_message = null; // Reset a previous error message if it was set + $user = wp_get_current_user(); + $secret = empty( $_POST['GA_secret'] ) ? false : sanitize_text_field( $_POST['GA_secret']); + $otp = empty( $_POST['GA_otp_code'] ) ? false : sanitize_text_field( $_POST['GA_otp_code']); + if ( ! strlen( $secret ) || ! strlen( $otp ) ) { + return; + } + $relaxed_mode = trim( get_user_option( 'googleauthenticator_relaxedmode', $user->ID ) ); + $relaxed_mode = 'enabled' === $relaxed_mode ? 'enabled' : 'disabled'; + if ( $timeslot = $this->verify( $secret, $otp, $relaxed_mode, '' ) ) { + update_user_option( $user->ID, 'googleauthenticator_lasttimeslot', $timeslot, true ); + update_user_option( $user->ID, 'googleauthenticator_secret', $secret, true ); + update_user_option( $user->ID, 'googleauthenticator_enabled', 'enabled', true ); + $location = admin_url( 'index.php?googleauthenticator=enabled' ); + wp_redirect( $location ); + exit; + }; + + $this->error_message = new WP_Error( 'invalid-otp', esc_html__( "OTP code doesn't match supplied secret, please check you've configured Authenticator correctly.", 'google-authenticator' ) ); +} + +/** + * Show the user a success message after we redirect them following successful google authenticator setup + */ +function successful_signup_message() { + if ( ! empty( $_GET['googleauthenticator'] ) && 'enabled' === $_GET['googleauthenticator'] ) : ?> + <div class="updated notice"> + <p><?php esc_html_e( 'Congratulations, you have successfully enabled Google Authenticator for your account', 'google-authenticator' ); ?></p> + </div> + + <?php endif; +} + +/** + * Callback function to render the google authenticator setup page + */ +function user_setup_page() { + $user = wp_get_current_user(); + $enabled = trim(get_user_option( 'googleauthenticator_enabled', $user->ID ) ) === 'enabled'; + if ( $enabled ) { + $location = admin_url( 'index.php' ); + wp_redirect( $location ); + exit; + } + $error = $this->error_message; + + $app_links = array( + array( + 'text' => __( 'iOS: Authy', 'google-authenticator' ), + 'link' => 'https://itunes.apple.com/app/authy/id494168017', + ), + array( + 'text' => __( 'iOS: Google Authenticator', 'google-authenticator' ), + 'link' => 'https://itunes.apple.com/app/authy/id494168017', + ), + array( + 'text' => __( 'Android: Authy', 'google-authenticator' ), + 'link' => 'https://itunes.apple.com/app/authy/id494168017', + ), + array( + 'text' => __( 'Android: Google Authenticator', 'google-authenticator' ), + 'link' => 'https://itunes.apple.com/app/authy/id494168017', + ), + array( + 'text' => __( 'Windows Phone', 'google-authenticator' ), + 'link' => 'https://www.microsoft.com/store/p/authenticator/9nblggh08h54', + ), + array( + 'text' => __( 'Chrome Browser', 'google-authenticator' ), + 'link' => 'https://chrome.google.com/webstore/detail/authy-chrome-extension/fhgenkpocbhhddlgkjnfghpjanffonno', + ), + array( + 'text' => __( 'Desktop', 'google-authenticator' ), + 'link' => 'https://authy.com/download/', + ), + + ); + + ?> + <div class="wrap"> + <h1><?php esc_html_e( 'Google Authenticator Settings', 'google-authenticator' ); ?></h1> + <?php if (is_wp_error( $error ) ): ?> + <div class="error notice"><p><?php esc_html_e( $error->get_error_message() ); ?></p></div> + <?php endif; ?> + <p><?php echo esc_html__( "If you haven't already done so, please install the Authy or Google Authenticator app on your mobile device from the App Store:", 'google-authenticator' ); ?></p> + <ul> + <?php foreach( $app_links as $app_link ): ?> + <li><a href="<?php echo esc_url( $app_link[ 'link' ] ); ?>"><?php echo esc_html( $app_link[ 'text' ] ); ?></a></li> + <?php endforeach; ?> + </ul> + <p><?php echo esc_html__( 'The easiest way to enable your account is to add an account by scanning the QR code using the app.', 'google-authenticator' ); ?></p> + <p> + <?php echo esc_html__( "An account can also be added by typing in the secret. After you've added your account to the App, please type the code you see on the screen into the Authenticator Code field and press the Verify Authenticator Code button.", 'google-authenticator' ); ?> + </p> + <p> + <?php echo esc_html__( 'If the account setup was successful, you will be logged out, and will need to login again using your Username, Password and Authenticator code generated using the App on your mobile device.', 'google-authenticator' ); ?> + </p> + <form method="post"> + <?php $this->profile_personal_options( array( + 'show_active' => false, + 'show_relaxed_mode' => false, + 'show_description' => false, + 'show_secret_qr' => true, + 'show_secret_buttons' => false, + 'show_authenticator_code' => true, + 'show_app_password' => false, + )); ?> + </form> + </div> + <?php +} + +/** + * Save site / network wide settings + * @param $is_network + */ +function save_submitted_admin_setup_page( $is_network ) { + $nonce = filter_input( INPUT_POST, 'googleauthenticator', FILTER_SANITIZE_STRING ); + if ( wp_verify_nonce( $nonce, 'googleauthenticator' ) ) { + if ( $is_network ) { + $network_settings_only = array_key_exists( 'network_settings_only', $_POST ); + if ( current_user_can( 'manage_network_options' ) ) { + update_site_option( 'googleauthenticator_network_only', $network_settings_only ); + } + } + $two_screen_mfa = array_key_exists( 'two_screen_approach', $_POST ) && 'true' === $_POST[ 'two_screen_approach' ]; + if ( is_multisite() && $is_network ) { + if ( current_user_can( 'manage_network_options' ) ) { + update_site_option( 'googleauthenticator_two_screen_signin', $two_screen_mfa ); + } + } elseif ( ! $is_network ) { + if ( current_user_can( 'manage_options' ) ) { + update_option( 'googleauthenticator_two_screen_signin', $two_screen_mfa ); + } + } + $roles = isset( $_POST['roles'] ) ? (array) $_POST['roles'] : array(); + $roles = array_map( 'sanitize_text_field', $roles ); + + if ( $is_network ) { + if ( current_user_can( 'manage_network_options' ) ) { + update_site_option( 'googleauthenticator_mandatory_mfa_roles', $roles ); + } + } else { + if ( current_user_can( 'manage_options' ) ) { + update_option( 'googleauthenticator_mandatory_mfa_roles', $roles ); + } + } + return true; + } +} + +/** + * Callback function to render the google authenticator setup page + */ +function common_admin_setup_page( $is_network = false ) { + if ( $is_network ) { + $site_ids = get_sites( 'fields=ids' ); + $roles = get_editable_roles(); + foreach( $site_ids as $site_id ) { + switch_to_blog( $site_id ); + $roles = array_merge( $roles, get_editable_roles() ); + restore_current_blog(); + } + $edit_enabled = true; + } else { + $roles = get_editable_roles(); + $edit_enabled = is_multisite() ? boolval( get_site_option( 'googleauthenticator_network_only') ) : true; + } + $is_updated = $this->save_submitted_admin_setup_page( $is_network ); + ?> + <div class="wrap"> + <h1><?php esc_html_e( 'Google Authenticator Settings', 'google-authenticator' ); ?></h1> + <?php if ( $is_updated ): ?> + <?php if ( $is_network ): ?> + <div class="notice notice-success is-dismissible"><p><?php esc_html_e( 'Successfullly saved your settings for the network', 'google-authenticator' ); ?></p></div> + <?php else: ?> + <div class="notice notice-success is-dismissible"><p><?php esc_html_e( 'Successfullly saved your settings for the site', 'google-authenticator' ); ?></p></div> + <?php endif; ?> + <?php endif; ?> + <form method="post"> + <?php if ( $is_network ): ?> + <h2><?php esc_html_e( 'Network Settings', 'google-authenticator' ); ?></h2> + <p> + <label> + <input name="network_settings_only" type="checkbox" value="true" <?php checked( get_site_option( 'googleauthenticator_network_only' ) ); ?>> + <?php esc_html_e( 'Only use network-wide settings, ignoring site settings.', 'google-authenticator' ); ?> + </label> + </p> + <?php endif; ?> + <?php if ( is_multisite() && $is_network || ! is_multisite() ): ?> + <?php $two_screen_mfa = is_multisite() ? get_site_option( 'googleauthenticator_two_screen_signin' ) : get_option( 'googleauthenticator_two_screen_signin' ); ?> + <h2><?php esc_html_e( 'Two Screen Signin', 'google-authenticator' ); ?></h2> + <p> + <label> + <input name="two_screen_approach" type="checkbox" value="true" <?php checked( $two_screen_mfa ); ?>> + <?php esc_html_e( 'Ask for authenticator code on secondary login screen', 'google-authenticator' ); ?> + </label> + </p> + <?php endif; ?> + <h2><?php esc_html_e( 'Roles requiring Google Authenticator Enabled', 'google-authenticator' ); ?></h2> + <?php foreach ($roles as $role_key => $role) { + $this->show_role_checkbox( $role_key, $role, $is_network ); + } + if ( $edit_enabled ) { + wp_nonce_field( 'googleauthenticator', 'googleauthenticator' ); + submit_button(); + } else { + esc_html_e( 'Network-wide settings in effect, only a super admin can modify them.', 'google-authenticator' ); + if ( current_user_can( 'manage_network' ) ) :?> + <a href="<?php echo network_admin_url( 'settings.php?page=google_authenticator' ) ?>"><?php esc_html_e( 'Change network wide Google Authenticator settings', 'google-authenticator' ); ?></a> + <?php endif; + } + ?> + + </form> + </div> + <?php +} + +/** + * Render a checkbox for a role + * @param $role_key + * @param $role + * @param $is_network + */ +function show_role_checkbox( $role_key, $role, $is_network ) { + $network_roles = get_site_option( 'googleauthenticator_mandatory_mfa_roles', array() ); + $network_only = is_multisite() && boolval( get_site_option( 'googleauthenticator_network_only' ) ); + $roles = get_option( 'googleauthenticator_mandatory_mfa_roles', array() ); + if ( $network_only ) { + $checked = in_array( $role_key, $network_roles ); + } else { + $checked = in_array( $role_key, array_merge( $roles, $network_roles ) ); + } + + /** + * Criteria under which permission field can be readonly. + * 1. Site must be a multisite AND + * Either + * a. googleauthenticator_network_only network option is set via /wp-admin/network/settings.php?page=google_authenticator + * + * OR + * b. the network option for this role is set via /wp-admin/network/settings.php?page=google_authenticator + */ + $readonly = is_multisite() && ( ( ! $is_network && $network_only ) || ( ! $is_network && in_array( $role_key, $network_roles ) && ! in_array( $role_key, $roles ) ) ); + $readonly_label = ''; + + if ( $readonly ) { + if ( current_user_can( 'manage_network' ) ) { + $readonly_label = __( "Sorry, you can't disable checks for this role as it's enabled at the network level.", 'google-authenticator' ); + } else { + $readonly_label = sprintf( __( 'Sorry, this role is enabled at the network level and can only be disabled via the <a href="%s">network settings</a>', 'google-authenticator' ), network_admin_url( 'settings.php?page=google_authenticator' ) ); + } + } + + $readonly = $readonly ? ' readonly="readonly"' : ''; + ?> + <p><label><input name="roles[]" type="checkbox"<?php echo esc_html( $readonly ) . checked( $checked, true, false ); ?>value="<?php esc_attr_e( $role_key ); ?>"><strong><?php esc_html_e( $role[ 'name' ] ); ?></strong></label> <?php echo $readonly_label; ?></p> + <?php +} + +/** + * Admin setup screen + */ +function admin_setup_page() { + $this->common_admin_setup_page(); + +} + +/** + * Network admin setup screen + */ +function network_admin_setup_page() { + $this->common_admin_setup_page( true ); +} +/** * Add verification code field to login form. */ function loginform() { echo "\t<p>\n"; echo "\t\t<label title=\"".__('If you don\'t have Google Authenticator enabled for your WordPress account, leave this field empty.','google-authenticator')."\">".__('Google Authenticator code','google-authenticator')."<span id=\"google-auth-info\"></span><br />\n"; - echo "\t\t<input type=\"text\" name=\"googleotp\" id=\"user_email\" class=\"input\" value=\"\" size=\"20\" style=\"ime-mode: inactive;\" /></label>\n"; + echo "\t\t<input type=\"text\" name=\"googleotp\" id=\"googleotp\" class=\"input\" value=\"\" size=\"20\" style=\"ime-mode: inactive;\" /></label>\n"; echo "\t</p>\n"; } @@ -184,7 +558,7 @@ function loginfooter() { /** * Login form handling. * Check Google Authenticator verification code, if user has been setup to do so. - * @param wordpressuser + * @param wordpressuser / WP_Error * @return user/loginstatus */ function check_otp( $user, $username = '', $password = '' ) { @@ -237,8 +611,14 @@ function check_otp( $user, $username = '', $password = '' ) { return new WP_Error( 'invalid_google_authenticator_password', __( '<strong>ERROR</strong>: The Google Authenticator password is incorrect.', 'google-authenticator' ) ); } } else { - return new WP_Error( 'invalid_google_authenticator_token', __( '<strong>ERROR</strong>: The Google Authenticator code is incorrect or has expired.', 'google-authenticator' ) ); - } + if ( ! $this->is_two_screen_signin_enabled() ) { + return new WP_Error( 'invalid_google_authenticator_token', __( '<strong>ERROR</strong>: The Google Authenticator code is incorrect or has expired.', 'google-authenticator' ) ); + } else { + wp_logout(); + $this->secondary_login_screen(); + exit; + } + } } } // Google Authenticator isn't enabled for this account, @@ -246,12 +626,55 @@ function check_otp( $user, $username = '', $password = '' ) { return $userstate; } +function secondary_login_screen() { + $redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : admin_url(); + login_header( esc_html__('Secondary Login Screen', 'google-authenticator' ) ); + if ( array_key_exists( 'googleotp', $_REQUEST ) ) { + if ( 0 === strlen( $_REQUEST[ 'googleotp'] ) ) { + $error_message = __( '<strong>ERROR</strong>: The Google Authenticator code is missing.', 'google-authenticator' ); + } else { + $error_message = __( '<strong>ERROR</strong>: The Google Authenticator code is incorrect or has expired.', 'google-authenticator' ); + } + echo '<div id="login_error">' . $error_message . '</div>'; + }?> + <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post"> + <input type="hidden" name="log" value="<?php echo esc_attr( $_REQUEST['log'] ); ?>" /> + <input type="hidden" name="pwd" value="<?php echo esc_attr( $_REQUEST['pwd'] ); ?>" /> + <input type="hidden" name="wp-submit" value="<?php echo esc_attr( $_REQUEST['wp-submit'] ); ?>" /> + <?php if ( array_key_exists( 'rememberme', $_REQUEST ) && 'forever' === $_REQUEST[ 'rememberme']): ?> + <input name="rememberme" type="hidden" id="rememberme" value="forever" /> + <?php endif; ?> + <?php $this->loginform(); ?> + <p><?php esc_html_e( 'Please enter the Google Authenticator code using the app on your device.', 'google-authenticator' ); ?></p> + <p class="submit"> + <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Log In'); ?>" /> + <input type="hidden" name="redirect_to" value="<?php echo esc_attr($redirect_to); ?>" /> + <input type="hidden" name="testcookie" value="1" /> + </p> + </form> + <?php + login_footer(); +} + /** * Extend personal profile page with Google Authenticator settings. */ -function profile_personal_options() { - global $user_id, $is_profile_page; +function profile_personal_options( $args = array() ) { + $defaults = array( + 'show_active' => true, + 'show_relaxed_mode' => true, + 'show_description' => true, + 'show_secret_qr' => false, + 'show_secret_buttons' => true, + 'show_authenticator_code' => false, + 'show_app_password' => true, + ); + + $args = wp_parse_args( $args, $defaults ); + + $user = wp_get_current_user(); + $user_id = $user->ID; // If editing of Google Authenticator settings has been disabled, just return $GA_hidefromuser = trim( get_user_option( 'googleauthenticator_hidefromuser', $user_id ) ); @@ -270,65 +693,86 @@ function profile_personal_options() { $GA_password = "XXXX XXXX XXXX XXXX"; } - // In case the user has no secret ready (new install), we create one. + // In case the user has no secret ready (new install), we create one. or use the one they just posted if ( '' == $GA_secret ) { - $GA_secret = $this->create_secret(); + $GA_secret = array_key_exists( 'GA_secret', $_REQUEST ) ? sanitize_text_field( $_REQUEST[ 'GA_secret' ] ) : $this->create_secret(); } - // Use "WordPress Blog" as default description if ( '' == $GA_description ) { - $GA_description = __( 'WordPressBlog', 'google-authenticator' ); + // Super admins and users with accounts on more than one site get the network name as the helpful name, + // everyone else gets the site that they're on + if ( is_multisite() && ( 1 < count( get_blogs_of_user( $user_id ) || is_super_admin() ) ) ) { + $GA_description = sanitize_text_field( get_blog_details( get_network()->id )->blogname ); + } else { + $GA_description = sanitize_text_field( get_bloginfo( 'name' ) ); + } } echo "<h3>".__( 'Google Authenticator Settings', 'google-authenticator' )."</h3>\n"; echo "<table class=\"form-table\">\n"; echo "<tbody>\n"; - echo "<tr>\n"; - echo "<th scope=\"row\">".__( 'Active', 'google-authenticator' )."</th>\n"; - echo "<td>\n"; - echo "<input name=\"GA_enabled\" id=\"GA_enabled\" class=\"tog\" type=\"checkbox\"" . checked( $GA_enabled, 'enabled', false ) . "/>\n"; - echo "</td>\n"; - echo "</tr>\n"; - if ( $is_profile_page || IS_PROFILE_PAGE ) { + if ( $args['show_active'] ) { echo "<tr>\n"; - echo "<th scope=\"row\">".__( 'Relaxed mode', 'google-authenticator' )."</th>\n"; + echo "<th scope=\"row\">".__( 'Active', 'google-authenticator' )."</th>\n"; echo "<td>\n"; - echo "<input name=\"GA_relaxedmode\" id=\"GA_relaxedmode\" class=\"tog\" type=\"checkbox\"" . checked( $GA_relaxedmode, 'enabled', false ) . "/><span class=\"description\">".__(' Relaxed mode allows for more time drifting on your phone clock (±4 min).','google-authenticator')."</span>\n"; + echo "<input name=\"GA_enabled\" id=\"GA_enabled\" class=\"tog\" type=\"checkbox\"" . checked( $GA_enabled, 'enabled', false ) . "/>\n"; echo "</td>\n"; echo "</tr>\n"; - - echo "<tr>\n"; - echo "<th><label for=\"GA_description\">".__('Description','google-authenticator')."</label></th>\n"; - echo "<td><input name=\"GA_description\" id=\"GA_description\" value=\"{$GA_description}\" type=\"text\" size=\"25\" /><span class=\"description\">".__(' Description that you\'ll see in the Google Authenticator app on your phone.','google-authenticator')."</span><br /></td>\n"; - echo "</tr>\n"; + } + if ( $args['show_relaxed_mode'] ) { echo "<tr>\n"; - echo "<th><label for=\"GA_secret\">".__('Secret','google-authenticator')."</label></th>\n"; + echo "<th scope=\"row\">" . __( 'Relaxed mode', 'google-authenticator' ) . "</th>\n"; echo "<td>\n"; - echo "<input name=\"GA_secret\" id=\"GA_secret\" value=\"{$GA_secret}\" readonly=\"readonly\" type=\"text\" size=\"25\" />"; - echo "<input name=\"GA_newsecret\" id=\"GA_newsecret\" value=\"".__("Create new secret",'google-authenticator')."\" type=\"button\" class=\"button\" />"; - echo "<input name=\"show_qr\" id=\"show_qr\" value=\"".__("Show/Hide QR code",'google-authenticator')."\" type=\"button\" class=\"button\" onclick=\"ShowOrHideQRCode();\" />"; + echo "<input name=\"GA_relaxedmode\" id=\"GA_relaxedmode\" class=\"tog\" type=\"checkbox\"" . checked( $GA_relaxedmode, 'enabled', false ) . "/><span class=\"description\">" . __( ' Relaxed mode allows for more time drifting on your phone clock (±4 min).', 'google-authenticator' ) . "</span>\n"; echo "</td>\n"; echo "</tr>\n"; + } - echo "<tr>\n"; - echo "<th></th>\n"; - echo "<td><div id=\"GA_QR_INFO\" style=\"display: none\" >"; - echo "<div id=\"GA_QRCODE\"/></div>"; + $show_description_style = $args['show_description'] ? '' : 'display:none'; + echo "<tr style=\"{$show_description_style}\">\n"; + echo "<th><label for=\"GA_description\">" . esc_html__( 'Description', 'google-authenticator' ) . "</label></th>\n"; + echo "<td><input name=\"GA_description\" id=\"GA_description\" value=\"{$GA_description}\" type=\"text\" size=\"25\" /><span class=\"description\">" . __( ' Description that you\'ll see in the Google Authenticator app on your phone.', 'google-authenticator' ) . "</span><br /></td>\n"; + echo "</tr>\n"; - echo '<span class="description"><br/> ' . __( 'Scan this with the Google Authenticator app.', 'google-authenticator' ) . '</span>'; - echo "</div></td>\n"; - echo "</tr>\n"; + echo "<tr>\n"; + echo "<th><label for=\"GA_secret\">".__('Secret','google-authenticator')."</label></th>\n"; + echo "<td>\n"; + echo "<input name=\"GA_secret\" id=\"GA_secret\" value=\"" . esc_attr( $GA_secret) . "\" readonly=\"readonly\" type=\"text\" size=\"25\" />"; + if ( $args['show_secret_buttons']) { + echo "<input name=\"GA_newsecret\" id=\"GA_newsecret\" value=\"".__("Create new secret",'google-authenticator')."\" type=\"button\" class=\"button\" />"; + echo "<input name=\"show_qr\" id=\"show_qr\" value=\"".__("Show/Hide QR code",'google-authenticator')."\" type=\"button\" class=\"button\" onclick=\"ShowOrHideQRCode();\" />"; + } + echo "</td>\n"; + echo "</tr>\n"; + echo "<tr>\n"; + echo "<th></th>\n"; + + $qr_style = $args['show_secret_qr'] ? '' : 'display: none'; + echo "<td><div id=\"GA_QR_INFO\" style=\"{$qr_style}\" >"; + echo "<div id=\"GA_QRCODE\"/></div>"; + + echo '<span class="description"><br/> ' . __( 'Scan this with the Google Authenticator app.', 'google-authenticator' ) . '</span>'; + echo "</div></td>\n"; + echo "</tr>\n"; + if ( $args['show_secret_qr']) : ?> + <script> + var qrcode="otpauth://totp/WordPress:"+escape(jQuery('#GA_description').val())+"?secret="+jQuery('#GA_secret').val()+"&issuer=WordPress"; + jQuery('#GA_QRCODE').qrcode(qrcode); + </script> + <?php endif; + + if ( $args['show_app_password']) { echo "<tr>\n"; echo "<th scope=\"row\">".__( 'Enable App password', 'google-authenticator' )."</th>\n"; echo "<td>\n"; echo "<input name=\"GA_pwdenabled\" id=\"GA_pwdenabled\" class=\"tog\" type=\"checkbox\"" . checked( $GA_pwdenabled, 'enabled', false ) . "/><span class=\"description\">".__(' Enabling an App password will decrease your overall login security.','google-authenticator')."</span>\n"; echo "</td>\n"; echo "</tr>\n"; - + echo "<tr>\n"; echo "<th></th>\n"; echo "<td>\n"; @@ -339,7 +783,18 @@ function profile_personal_options() { echo "</tr>\n"; } + + if ( $args['show_authenticator_code']) { + echo "<tr>\n"; + echo "<th><label for=\"GA_otp_code\">" . __( 'Authenticator Code', 'google-authenticator' ) . "</label></th>\n"; + echo "<td><input name=\"GA_otp_code\" id=\"GA_otp_code\" type=\"text\" size=\"25\" /><span class=\"description\">" . __( 'After adding the site to your google authy account, add your authenticator code here.', 'google-authenticator' ) . "</span><br /></td>\n"; + echo "</tr>\n"; + } + echo "</tbody></table>\n"; + if ( $args['show_authenticator_code']) { + submit_button( esc_html__( 'Verify Authenticator Code', 'google-authenticator' ) ); + } echo "<script type=\"text/javascript\">\n"; echo "var GAnonce='".wp_create_nonce('GoogleAuthenticatoraction')."';\n"; @@ -546,4 +1001,4 @@ function ajax_callback() { } // end class $google_authenticator = new GoogleAuthenticator; -?> + |