<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6750] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor: 2FA: remove modified core classes, no longer needed.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6750">6750</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6750","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-26 03:01:31 +0000 (Mon, 26 Feb 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>2FA: remove modified core classes, no longer needed. Removes <a href="http://meta.trac.wordpress.org/changeset/6739">r6739</a>.</pre>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorclasstwofactorcorephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-core.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorclasstwofactorwporgphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-wporg.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorclasstwofactorcorephp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-core.php 2018-02-26 02:57:48 UTC (rev 6749)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-core.php 2018-02-26 03:01:31 UTC (rev 6750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,698 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Class for creating two factor authorization.
- *
- * @since 0.1-dev
- *
- * @package Two_Factor
- */
-class Two_Factor_Core {
-
- /**
- * The user meta provider key.
- *
- * @type string
- */
- const PROVIDER_USER_META_KEY = '_two_factor_provider';
-
- /**
- * The user meta enabled providers key.
- *
- * @type string
- */
- const ENABLED_PROVIDERS_USER_META_KEY = '_two_factor_enabled_providers';
-
- /**
- * The user meta nonce key.
- *
- * @type string
- */
- const USER_META_NONCE_KEY = '_two_factor_nonce';
-
- /**
- * Set up filters and actions.
- *
- * @since 0.1-dev
- */
- public static function add_hooks() {
- add_action( 'plugins_loaded', array( __CLASS__, 'load_textdomain' ) );
- add_action( 'init', array( __CLASS__, 'get_providers' ) );
- add_action( 'wp_login', array( __CLASS__, 'wp_login' ), 10, 2 );
- add_action( 'login_form_validate_2fa', array( __CLASS__, 'login_form_validate_2fa' ) );
- add_action( 'login_form_backup_2fa', array( __CLASS__, 'backup_2fa' ) );
- add_action( 'show_user_profile', array( __CLASS__, 'user_two_factor_options' ) );
- add_action( 'edit_user_profile', array( __CLASS__, 'user_two_factor_options' ) );
- add_action( 'personal_options_update', array( __CLASS__, 'user_two_factor_options_update' ) );
- add_action( 'edit_user_profile_update', array( __CLASS__, 'user_two_factor_options_update' ) );
- add_filter( 'manage_users_columns', array( __CLASS__, 'filter_manage_users_columns' ) );
- add_filter( 'manage_users_custom_column', array( __CLASS__, 'manage_users_custom_column' ), 10, 3 );
- }
-
- /**
- * Loads the plugin's text domain.
- *
- * Sites on WordPress 4.6+ benefit from just-in-time loading of translations.
- */
- public static function load_textdomain() {
- load_plugin_textdomain( 'two-factor' );
- }
-
- /**
- * For each provider, include it and then instantiate it.
- *
- * @since 0.1-dev
- *
- * @return array
- */
- public static function get_providers() {
- $providers = array(
- 'Two_Factor_Email' => TWO_FACTOR_DIR . 'providers/class.two-factor-email.php',
- 'Two_Factor_Totp' => TWO_FACTOR_DIR . 'providers/class.two-factor-totp.php',
- 'Two_Factor_FIDO_U2F' => TWO_FACTOR_DIR . 'providers/class.two-factor-fido-u2f.php',
- 'Two_Factor_Backup_Codes' => TWO_FACTOR_DIR . 'providers/class.two-factor-backup-codes.php',
- 'Two_Factor_Dummy' => TWO_FACTOR_DIR . 'providers/class.two-factor-dummy.php',
- );
-
- // FIDO U2F is PHP 5.3+ only.
- if ( version_compare( PHP_VERSION, '5.3.0', '<' ) ) {
- unset( $providers['Two_Factor_FIDO_U2F'] );
- trigger_error( sprintf( // WPCS: XSS OK.
- __( 'FIDO U2F is not available because you are using PHP %s. (Requires 5.3 or greater)' ),
- PHP_VERSION
- ) );
- }
-
- /**
- * Filter the supplied providers.
- *
- * This lets third-parties either remove providers (such as Email), or
- * add their own providers (such as text message or Clef).
- *
- * @param array $providers A key-value array where the key is the class name, and
- * the value is the path to the file containing the class.
- */
- $providers = apply_filters( 'two_factor_providers', $providers );
-
- /**
- * For each filtered provider,
- */
- foreach ( $providers as $class => $path ) {
- include_once( $path );
-
- /**
- * Confirm that it's been successfully included before instantiating.
- */
- if ( class_exists( $class ) ) {
- try {
- $providers[ $class ] = call_user_func( array( $class, 'get_instance' ) );
- } catch ( Exception $e ) {
- unset( $providers[ $class ] );
- }
- }
- }
-
- return $providers;
- }
-
- /**
- * Get all Two-Factor Auth providers that are enabled for the specified|current user.
- *
- * @param WP_User $user WP_User object of the logged-in user.
- * @return array
- */
- public static function get_enabled_providers_for_user( $user = null ) {
- if ( empty( $user ) || ! is_a( $user, 'WP_User' ) ) {
- $user = wp_get_current_user();
- }
-
- $providers = static::get_providers();
- $enabled_providers = get_user_meta( $user->ID, static::ENABLED_PROVIDERS_USER_META_KEY, true );
- if ( empty( $enabled_providers ) ) {
- $enabled_providers = array();
- }
- $enabled_providers = array_intersect( $enabled_providers, array_keys( $providers ) );
-
- return $enabled_providers;
- }
-
- /**
- * Get all Two-Factor Auth providers that are both enabled and configured for the specified|current user.
- *
- * @param WP_User $user WP_User object of the logged-in user.
- * @return array
- */
- public static function get_available_providers_for_user( $user = null ) {
- if ( empty( $user ) || ! is_a( $user, 'WP_User' ) ) {
- $user = wp_get_current_user();
- }
-
- $providers = static::get_providers();
- $enabled_providers = static::get_enabled_providers_for_user( $user );
- $configured_providers = array();
-
- foreach ( $providers as $classname => $provider ) {
- if ( in_array( $classname, $enabled_providers ) && $provider->is_available_for_user( $user ) ) {
- $configured_providers[ $classname ] = $provider;
- }
- }
-
- return $configured_providers;
- }
-
- /**
- * Gets the Two-Factor Auth provider for the specified|current user.
- *
- * @since 0.1-dev
- *
- * @param int $user_id Optional. User ID. Default is 'null'.
- * @return object|null
- */
- public static function get_primary_provider_for_user( $user_id = null ) {
- if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
- $user_id = get_current_user_id();
- }
-
- $providers = static::get_providers();
- $available_providers = static::get_available_providers_for_user( get_userdata( $user_id ) );
-
- // If there's only one available provider, force that to be the primary.
- if ( empty( $available_providers ) ) {
- return null;
- } elseif ( 1 === count( $available_providers ) ) {
- $provider = key( $available_providers );
- } else {
- $provider = get_user_meta( $user_id, static::PROVIDER_USER_META_KEY, true );
-
- // If the provider specified isn't enabled, just grab the first one that is.
- if ( ! isset( $available_providers[ $provider ] ) ) {
- $provider = key( $available_providers );
- }
- }
-
- /**
- * Filter the two-factor authentication provider used for this user.
- *
- * @param string $provider The provider currently being used.
- * @param int $user_id The user ID.
- */
- $provider = apply_filters( 'two_factor_primary_provider_for_user', $provider, $user_id );
-
- if ( isset( $providers[ $provider ] ) ) {
- return $providers[ $provider ];
- }
-
- return null;
- }
-
- /**
- * Quick boolean check for whether a given user is using two-step.
- *
- * @since 0.1-dev
- *
- * @param int $user_id Optional. User ID. Default is 'null'.
- */
- public static function is_user_using_two_factor( $user_id = null ) {
- $provider = static::get_primary_provider_for_user( $user_id );
- return ! empty( $provider );
- }
-
- /**
- * Handle the browser-based login.
- *
- * @since 0.1-dev
- *
- * @param string $user_login Username.
- * @param WP_User $user WP_User object of the logged-in user.
- */
- public static function wp_login( $user_login, $user ) {
- if ( ! static::is_user_using_two_factor( $user->ID ) ) {
- return;
- }
-
- wp_clear_auth_cookie();
-
- static::show_two_factor_login( $user );
- exit;
- }
-
- /**
- * Display the login form.
- *
- * @since 0.1-dev
- *
- * @param WP_User $user WP_User object of the logged-in user.
- */
- public static function show_two_factor_login( $user ) {
- if ( ! $user ) {
- $user = wp_get_current_user();
- }
-
- $login_nonce = static::create_login_nonce( $user->ID );
- if ( ! $login_nonce ) {
- wp_die( esc_html__( 'Failed to create a login nonce.', 'two-factor' ) );
- }
-
- $redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : $_SERVER['REQUEST_URI'];
-
- static::login_html( $user, $login_nonce['key'], $redirect_to );
- }
-
- /**
- * Add short description. @todo
- *
- * @since 0.1-dev
- */
- public static function backup_2fa() {
- if ( ! isset( $_GET['wp-auth-id'], $_GET['wp-auth-nonce'], $_GET['provider'] ) ) {
- return;
- }
-
- $user = get_userdata( $_GET['wp-auth-id'] );
- if ( ! $user ) {
- return;
- }
-
- $nonce = $_GET['wp-auth-nonce'];
- if ( true !== static::verify_login_nonce( $user->ID, $nonce ) ) {
- wp_safe_redirect( get_bloginfo( 'url' ) );
- exit;
- }
-
- $providers = static::get_available_providers_for_user( $user );
- if ( isset( $providers[ $_GET['provider'] ] ) ) {
- $provider = $providers[ $_GET['provider'] ];
- } else {
- wp_die( esc_html__( 'Cheatin’ uh?' ), 403 );
- }
-
- static::login_html( $user, $_GET['wp-auth-nonce'], $_GET['redirect_to'], '', $provider );
-
- exit;
- }
-
- /**
- * Generates the html form for the second step of the authentication process.
- *
- * @since 0.1-dev
- *
- * @param WP_User $user WP_User object of the logged-in user.
- * @param string $login_nonce A string nonce stored in usermeta.
- * @param string $redirect_to The URL to which the user would like to be redirected.
- * @param string $error_msg Optional. Login error message.
- * @param string|object $provider An override to the provider.
- */
- public static function login_html( $user, $login_nonce, $redirect_to, $error_msg = '', $provider = null ) {
- if ( empty( $provider ) ) {
- $provider = static::get_primary_provider_for_user( $user->ID );
- } elseif ( is_string( $provider ) && method_exists( $provider, 'get_instance' ) ) {
- $provider = call_user_func( array( $provider, 'get_instance' ) );
- }
-
- $provider_class = get_class( $provider );
-
- $available_providers = static::get_available_providers_for_user( $user );
- $backup_providers = array_diff_key( $available_providers, array( $provider_class => null ) );
- $interim_login = isset( $_REQUEST['interim-login'] ); // WPCS: override ok.
- $wp_login_url = wp_login_url();
-
- $rememberme = 0;
- if ( isset( $_REQUEST['rememberme'] ) && $_REQUEST['rememberme'] ) {
- $rememberme = 1;
- }
-
- if ( ! function_exists( 'login_header' ) ) {
- // We really should migrate login_header() out of `wp-login.php` so it can be called from an includes file.
- include_once( TWO_FACTOR_DIR . 'includes/function.login-header.php' );
- }
-
- login_header();
-
- if ( ! empty( $error_msg ) ) {
- echo '<div id="login_error"><strong>' . esc_html( $error_msg ) . '</strong><br /></div>';
- }
- ?>
-
- <form name="validate_2fa_form" id="loginform" action="<?php echo esc_url( set_url_scheme( add_query_arg( 'action', 'validate_2fa', $wp_login_url ), 'login_post' ) ); ?>" method="post" autocomplete="off">
- <input type="hidden" name="provider" id="provider" value="<?php echo esc_attr( $provider_class ); ?>" />
- <input type="hidden" name="wp-auth-id" id="wp-auth-id" value="<?php echo esc_attr( $user->ID ); ?>" />
- <input type="hidden" name="wp-auth-nonce" id="wp-auth-nonce" value="<?php echo esc_attr( $login_nonce ); ?>" />
- <?php if ( $interim_login ) { ?>
- <input type="hidden" name="interim-login" value="1" />
- <?php } else { ?>
- <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
- <?php } ?>
- <input type="hidden" name="rememberme" id="rememberme" value="<?php echo esc_attr( $rememberme ); ?>" />
-
- <?php $provider->authentication_page( $user ); ?>
- </form>
-
- <?php if ( 1 === count( $backup_providers ) ) :
- $backup_classname = key( $backup_providers );
- $backup_provider = $backup_providers[ $backup_classname ];
- ?>
- <div class="backup-methods-wrap">
- <p class="backup-methods"><a href="<?php echo esc_url( add_query_arg( urlencode_deep( array(
- 'action' => 'backup_2fa',
- 'provider' => $backup_classname,
- 'wp-auth-id' => $user->ID,
- 'wp-auth-nonce' => $login_nonce,
- 'redirect_to' => $redirect_to,
- 'rememberme' => $rememberme,
- ) ), $wp_login_url ) ); ?>"><?php echo esc_html( sprintf( __( 'Or, use your backup method: %s →', 'two-factor' ), $backup_provider->get_label() ) ); ?></a></p>
- </div>
- <?php elseif ( 1 < count( $backup_providers ) ) : ?>
- <div class="backup-methods-wrap">
- <p class="backup-methods"><a href="javascript:;" onclick="document.querySelector('ul.backup-methods').style.display = 'block';"><?php esc_html_e( 'Or, use a backup method…', 'two-factor' ); ?></a></p>
- <ul class="backup-methods">
- <?php foreach ( $backup_providers as $backup_classname => $backup_provider ) : ?>
- <li><a href="<?php echo esc_url( add_query_arg( urlencode_deep( array(
- 'action' => 'backup_2fa',
- 'provider' => $backup_classname,
- 'wp-auth-id' => $user->ID,
- 'wp-auth-nonce' => $login_nonce,
- 'redirect_to' => $redirect_to,
- 'rememberme' => $rememberme,
- ) ), $wp_login_url ) ); ?>"><?php $backup_provider->print_label(); ?></a></li>
- <?php endforeach; ?>
- </ul>
- </div>
- <?php endif; ?>
-
- <p id="backtoblog">
- <a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php esc_attr_e( 'Are you lost?' ); ?>"><?php echo esc_html( sprintf( __( '← Back to %s' ), get_bloginfo( 'title', 'display' ) ) ); ?></a>
- </p>
-
- <style>
- /* @todo: migrate to an external stylesheet. */
- .backup-methods-wrap {
- margin-top: 16px;
- padding: 0 24px;
- }
- .backup-methods-wrap a {
- color: #999;
- text-decoration: none;
- }
- ul.backup-methods {
- display: none;
- padding-left: 1.5em;
- }
- /* Prevent Jetpack from hiding our controls, see https://github.com/Automattic/jetpack/issues/3747 */
- .jetpack-sso-form-display #loginform > p,
- .jetpack-sso-form-display #loginform > div {
- display: block;
- }
- </style>
-
- <?php
- /** This action is documented in wp-login.php */
- do_action( 'login_footer' ); ?>
- <div class="clear"></div>
- </body>
- </html>
- <?php
- }
-
- /**
- * Create the login nonce.
- *
- * @since 0.1-dev
- *
- * @param int $user_id User ID.
- */
- public static function create_login_nonce( $user_id ) {
- $login_nonce = array();
- try {
- $login_nonce['key'] = bin2hex( random_bytes( 32 ) );
- } catch (Exception $ex) {
- $login_nonce['key'] = wp_hash( $user_id . mt_rand() . microtime(), 'nonce' );
- }
- $login_nonce['expiration'] = time() + HOUR_IN_SECONDS;
-
- if ( ! update_user_meta( $user_id, static::USER_META_NONCE_KEY, $login_nonce ) ) {
- return false;
- }
-
- return $login_nonce;
- }
-
- /**
- * Delete the login nonce.
- *
- * @since 0.1-dev
- *
- * @param int $user_id User ID.
- */
- public static function delete_login_nonce( $user_id ) {
- return delete_user_meta( $user_id, static::USER_META_NONCE_KEY );
- }
-
- /**
- * Verify the login nonce.
- *
- * @since 0.1-dev
- *
- * @param int $user_id User ID.
- * @param string $nonce Login nonce.
- */
- public static function verify_login_nonce( $user_id, $nonce ) {
- $login_nonce = get_user_meta( $user_id, static::USER_META_NONCE_KEY, true );
- if ( ! $login_nonce ) {
- return false;
- }
-
- if ( $nonce !== $login_nonce['key'] || time() > $login_nonce['expiration'] ) {
- static::delete_login_nonce( $user_id );
- return false;
- }
-
- return true;
- }
-
- /**
- * Login form validation.
- *
- * @since 0.1-dev
- */
- public static function login_form_validate_2fa() {
- if ( ! isset( $_POST['wp-auth-id'], $_POST['wp-auth-nonce'] ) ) {
- return;
- }
-
- $user = get_userdata( $_POST['wp-auth-id'] );
- if ( ! $user ) {
- return;
- }
-
- $nonce = $_POST['wp-auth-nonce'];
- if ( true !== static::verify_login_nonce( $user->ID, $nonce ) ) {
- wp_safe_redirect( get_bloginfo( 'url' ) );
- exit;
- }
-
- if ( isset( $_POST['provider'] ) ) {
- $providers = static::get_available_providers_for_user( $user );
- if ( isset( $providers[ $_POST['provider'] ] ) ) {
- $provider = $providers[ $_POST['provider'] ];
- } else {
- wp_die( esc_html__( 'Cheatin’ uh?' ), 403 );
- }
- } else {
- $provider = static::get_primary_provider_for_user( $user->ID );
- }
-
- // Allow the provider to re-send codes, etc.
- if ( true === $provider->pre_process_authentication( $user ) ) {
- $login_nonce = static::create_login_nonce( $user->ID );
- if ( ! $login_nonce ) {
- wp_die( esc_html__( 'Failed to create a login nonce.', 'two-factor' ) );
- }
-
- static::login_html( $user, $login_nonce['key'], $_REQUEST['redirect_to'], '', $provider );
- exit;
- }
-
- // Ask the provider to verify the second factor.
- if ( true !== $provider->validate_authentication( $user ) ) {
- do_action( 'wp_login_failed', $user->user_login );
-
- $login_nonce = static::create_login_nonce( $user->ID );
- if ( ! $login_nonce ) {
- wp_die( esc_html__( 'Failed to create a login nonce.', 'two-factor' ) );
- }
-
- static::login_html( $user, $login_nonce['key'], $_REQUEST['redirect_to'], esc_html__( 'ERROR: Invalid verification code.', 'two-factor' ), $provider );
- exit;
- }
-
- static::delete_login_nonce( $user->ID );
-
- $rememberme = false;
- if ( isset( $_REQUEST['rememberme'] ) && $_REQUEST['rememberme'] ) {
- $rememberme = true;
- }
-
- wp_set_auth_cookie( $user->ID, $rememberme );
-
- // Must be global because that's how login_header() uses it.
- global $interim_login;
- $interim_login = isset( $_REQUEST['interim-login'] ); // WPCS: override ok.
-
- if ( $interim_login ) {
- $customize_login = isset( $_REQUEST['customize-login'] );
- if ( $customize_login ) {
- wp_enqueue_script( 'customize-base' );
- }
- $message = '<p class="message">' . __( 'You have logged in successfully.' ) . '</p>';
- $interim_login = 'success'; // WPCS: override ok.
- login_header( '', $message ); ?>
- </div>
- <?php
- /** This action is documented in wp-login.php */
- do_action( 'login_footer' ); ?>
- <?php if ( $customize_login ) : ?>
- <script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); /* WPCS: XSS OK. */ ?>', channel: 'login' }).send('login') }, 1000 );</script>
- <?php endif; ?>
- </body></html>
- <?php
- exit;
- }
- $redirect_to = apply_filters( 'login_redirect', $_REQUEST['redirect_to'], $_REQUEST['redirect_to'], $user );
- wp_safe_redirect( $redirect_to );
-
- exit;
- }
-
- /**
- * Filter the columns on the Users admin screen.
- *
- * @param array $columns Available columns.
- * @return array Updated array of columns.
- */
- public static function filter_manage_users_columns( array $columns ) {
- $columns['two-factor'] = __( 'Two-Factor' );
- return $columns;
- }
-
- /**
- * Output the 2FA column data on the Users screen.
- *
- * @param string $output The column output.
- * @param string $column_name The column ID.
- * @param int $user_id The user ID.
- * @return string The column output.
- */
- public static function manage_users_custom_column( $output, $column_name, $user_id ) {
-
- if ( 'two-factor' !== $column_name ) {
- return $output;
- }
-
- if ( ! static::is_user_using_two_factor( $user_id ) ) {
- return sprintf( '<span class="dashicons-before dashicons-no-alt">%s</span>', esc_html__( 'Disabled' ) );
- } else {
- $provider = static::get_primary_provider_for_user( $user_id );
- return esc_html( $provider->get_label() );
- }
-
- }
-
- /**
- * Add user profile fields.
- *
- * This executes during the `show_user_profile` & `edit_user_profile` actions.
- *
- * @since 0.1-dev
- *
- * @param WP_User $user WP_User object of the logged-in user.
- */
- public static function user_two_factor_options( $user ) {
- wp_enqueue_style( 'user-edit-2fa', plugins_url( 'user-edit.css', __FILE__ ) );
-
- $enabled_providers = array_keys( static::get_available_providers_for_user( $user->ID ) );
- $primary_provider = static::get_primary_provider_for_user( $user->ID );
-
- if ( ! empty( $primary_provider ) && is_object( $primary_provider ) ) {
- $primary_provider_key = get_class( $primary_provider );
- } else {
- $primary_provider_key = null;
- }
-
- wp_nonce_field( 'user_two_factor_options', '_nonce_user_two_factor_options', false );
-
- ?>
- <input type="hidden" name="<?php echo esc_attr( static::ENABLED_PROVIDERS_USER_META_KEY ); ?>[]" value="<?php /* Dummy input so $_POST value is passed when no providers are enabled. */ ?>" />
- <table class="form-table">
- <tr>
- <th>
- <?php esc_html_e( 'Two-Factor Options' ); ?>
- </th>
- <td>
- <table class="two-factor-methods-table">
- <thead>
- <tr>
- <th class="col-enabled" scope="col"><?php esc_html_e( 'Enabled' ); ?></th>
- <th class="col-primary" scope="col"><?php esc_html_e( 'Primary' ); ?></th>
- <th class="col-name" scope="col"><?php esc_html_e( 'Name' ); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ( static::get_providers() as $class => $object ) : ?>
- <tr>
- <th scope="row"><input type="checkbox" name="<?php echo esc_attr( static::ENABLED_PROVIDERS_USER_META_KEY ); ?>[]" value="<?php echo esc_attr( $class ); ?>" <?php checked( in_array( $class, $enabled_providers ) ); ?> /></th>
- <th scope="row"><input type="radio" name="<?php echo esc_attr( static::PROVIDER_USER_META_KEY ); ?>" value="<?php echo esc_attr( $class ); ?>" <?php checked( $class, $primary_provider_key ); ?> /></th>
- <td>
- <?php $object->print_label(); ?>
- <?php do_action( 'two-factor-user-options-' . $class, $user ); ?>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- </td>
- </tr>
- </table>
- <?php
- /**
- * Fires after the Two Factor methods table.
- *
- * To be used by Two Factor methods to add settings UI.
- *
- * @since 0.1-dev
- */
- do_action( 'show_user_security_settings', $user );
- }
-
- /**
- * Update the user meta value.
- *
- * This executes during the `personal_options_update` & `edit_user_profile_update` actions.
- *
- * @since 0.1-dev
- *
- * @param int $user_id User ID.
- */
- public static function user_two_factor_options_update( $user_id ) {
- if ( isset( $_POST['_nonce_user_two_factor_options'] ) ) {
- check_admin_referer( 'user_two_factor_options', '_nonce_user_two_factor_options' );
-
- if ( ! isset( $_POST[ static::ENABLED_PROVIDERS_USER_META_KEY ] ) ||
- ! is_array( $_POST[ static::ENABLED_PROVIDERS_USER_META_KEY ] ) ) {
- return;
- }
-
- $providers = static::get_providers();
-
- $enabled_providers = $_POST[ static::ENABLED_PROVIDERS_USER_META_KEY ];
-
- // Enable only the available providers.
- $enabled_providers = array_intersect( $enabled_providers, array_keys( $providers ) );
- update_user_meta( $user_id, static::ENABLED_PROVIDERS_USER_META_KEY, $enabled_providers );
-
- // Primary provider must be enabled.
- $new_provider = isset( $_POST[ static::PROVIDER_USER_META_KEY ] ) ? $_POST[ static::PROVIDER_USER_META_KEY ] : '';
- if ( ! empty( $new_provider ) && in_array( $new_provider, $enabled_providers, true ) ) {
- update_user_meta( $user_id, static::PROVIDER_USER_META_KEY, $new_provider );
- }
- }
- }
-}
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorclasstwofactorwporgphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-wporg.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-wporg.php 2018-02-26 02:57:48 UTC (rev 6749)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-wporg.php 2018-02-26 03:01:31 UTC (rev 6750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,13 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Class for creating two factor authorization.
- *
- * @since 0.1-dev
- *
- * @package WordPressdotorg\TwoFactor
- */
-
-namespace WordPressdotorg\TwoFactor;
-
-class Two_Factor_Wporg extends \Two_Factor_Core {
-}
</del></span></pre>
</div>
</div>
</body>
</html>