<!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>[6739] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor: 2FA: use late static binding in our copy of Two_Factor_Core so we can extend and override static functions in Two_Factor_Wporg.</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/6739">6739</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/6739","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-25 05:56:27 +0000 (Sun, 25 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: use late static binding in our copy of Two_Factor_Core so we can extend and override static functions in Two_Factor_Wporg.</pre>
<h3>Modified 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>
</ul>
<h3>Added Paths</h3>
<ul>
<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="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: 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-25 04:52:46 UTC (rev 6738)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-core.php 2018-02-25 05:56:27 UTC (rev 6739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,8 +125,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $providers = self::get_providers();
- $enabled_providers = get_user_meta( $user->ID, self::ENABLED_PROVIDERS_USER_META_KEY, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $providers = static::get_providers();
+ $enabled_providers = get_user_meta( $user->ID, static::ENABLED_PROVIDERS_USER_META_KEY, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $enabled_providers ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $enabled_providers = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,8 +146,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $providers = self::get_providers();
- $enabled_providers = self::get_enabled_providers_for_user( $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $providers = static::get_providers();
+ $enabled_providers = static::get_enabled_providers_for_user( $user );
</ins><span class="cx" style="display: block; padding: 0 10px"> $configured_providers = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $providers as $classname => $provider ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,8 +172,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $providers = self::get_providers();
- $available_providers = self::get_available_providers_for_user( get_userdata( $user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $providers = static::get_providers();
+ $available_providers = static::get_available_providers_for_user( get_userdata( $user_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there's only one available provider, force that to be the primary.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $available_providers ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 1 === count( $available_providers ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $provider = key( $available_providers );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $provider = get_user_meta( $user_id, self::PROVIDER_USER_META_KEY, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $provider = get_user_meta( $user_id, static::PROVIDER_USER_META_KEY, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the provider specified isn't enabled, just grab the first one that is.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $available_providers[ $provider ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id Optional. User ID. Default is 'null'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function is_user_using_two_factor( $user_id = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $provider = self::get_primary_provider_for_user( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $provider = static::get_primary_provider_for_user( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> return ! empty( $provider );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,13 +225,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User $user WP_User object of the logged-in user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wp_login( $user_login, $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! self::is_user_using_two_factor( $user->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! static::is_user_using_two_factor( $user->ID ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clear_auth_cookie();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::show_two_factor_login( $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static::show_two_factor_login( $user );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,14 +247,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $login_nonce = self::create_login_nonce( $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $login_nonce = static::create_login_nonce( $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $login_nonce ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( esc_html__( 'Failed to create a login nonce.', 'two-factor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : $_SERVER['REQUEST_URI'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::login_html( $user, $login_nonce['key'], $redirect_to );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static::login_html( $user, $login_nonce['key'], $redirect_to );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,19 +273,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = $_GET['wp-auth-nonce'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( true !== self::verify_login_nonce( $user->ID, $nonce ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true !== static::verify_login_nonce( $user->ID, $nonce ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( get_bloginfo( 'url' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $providers = self::get_available_providers_for_user( $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $providers = static::get_available_providers_for_user( $user );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $providers[ $_GET['provider'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $provider = $providers[ $_GET['provider'] ];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( esc_html__( 'Cheatin’ uh?' ), 403 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::login_html( $user, $_GET['wp-auth-nonce'], $_GET['redirect_to'], '', $provider );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static::login_html( $user, $_GET['wp-auth-nonce'], $_GET['redirect_to'], '', $provider );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,14 +303,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function login_html( $user, $login_nonce, $redirect_to, $error_msg = '', $provider = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $provider ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $provider = self::get_primary_provider_for_user( $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $provider = static::get_primary_provider_for_user( $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_string( $provider ) && method_exists( $provider, 'get_instance' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $provider = call_user_func( array( $provider, 'get_instance' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $provider_class = get_class( $provider );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $available_providers = self::get_available_providers_for_user( $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $available_providers = static::get_available_providers_for_user( $user );
</ins><span class="cx" style="display: block; padding: 0 10px"> $backup_providers = array_diff_key( $available_providers, array( $provider_class => null ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $interim_login = isset( $_REQUEST['interim-login'] ); // WPCS: override ok.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_login_url = wp_login_url();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $login_nonce['expiration'] = time() + HOUR_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! update_user_meta( $user_id, self::USER_META_NONCE_KEY, $login_nonce ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! update_user_meta( $user_id, static::USER_META_NONCE_KEY, $login_nonce ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,7 +443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id User ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function delete_login_nonce( $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return delete_user_meta( $user_id, self::USER_META_NONCE_KEY );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return delete_user_meta( $user_id, static::USER_META_NONCE_KEY );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,13 +455,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $nonce Login nonce.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function verify_login_nonce( $user_id, $nonce ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $login_nonce = get_user_meta( $user_id, self::USER_META_NONCE_KEY, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $login_nonce = get_user_meta( $user_id, static::USER_META_NONCE_KEY, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $login_nonce ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $nonce !== $login_nonce['key'] || time() > $login_nonce['expiration'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::delete_login_nonce( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static::delete_login_nonce( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,30 +484,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = $_POST['wp-auth-nonce'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( true !== self::verify_login_nonce( $user->ID, $nonce ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true !== static::verify_login_nonce( $user->ID, $nonce ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( get_bloginfo( 'url' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['provider'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $providers = self::get_available_providers_for_user( $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $providers = static::get_available_providers_for_user( $user );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $providers[ $_POST['provider'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $provider = $providers[ $_POST['provider'] ];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( esc_html__( 'Cheatin’ uh?' ), 403 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $provider = self::get_primary_provider_for_user( $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $provider = static::get_primary_provider_for_user( $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow the provider to re-send codes, etc.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $provider->pre_process_authentication( $user ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $login_nonce = self::create_login_nonce( $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $login_nonce = static::create_login_nonce( $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $login_nonce ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( esc_html__( 'Failed to create a login nonce.', 'two-factor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::login_html( $user, $login_nonce['key'], $_REQUEST['redirect_to'], '', $provider );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static::login_html( $user, $login_nonce['key'], $_REQUEST['redirect_to'], '', $provider );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,16 +515,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true !== $provider->validate_authentication( $user ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_login_failed', $user->user_login );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $login_nonce = self::create_login_nonce( $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $login_nonce = static::create_login_nonce( $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $login_nonce ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( esc_html__( 'Failed to create a login nonce.', 'two-factor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::login_html( $user, $login_nonce['key'], $_REQUEST['redirect_to'], esc_html__( 'ERROR: Invalid verification code.', 'two-factor' ), $provider );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static::login_html( $user, $login_nonce['key'], $_REQUEST['redirect_to'], esc_html__( 'ERROR: Invalid verification code.', 'two-factor' ), $provider );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::delete_login_nonce( $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static::delete_login_nonce( $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $rememberme = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['rememberme'] ) && $_REQUEST['rememberme'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,10 +587,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! self::is_user_using_two_factor( $user_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! static::is_user_using_two_factor( $user_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( '<span class="dashicons-before dashicons-no-alt">%s</span>', esc_html__( 'Disabled' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $provider = self::get_primary_provider_for_user( $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $provider = static::get_primary_provider_for_user( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> return esc_html( $provider->get_label() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,8 +608,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function user_two_factor_options( $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'user-edit-2fa', plugins_url( 'user-edit.css', __FILE__ ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $enabled_providers = array_keys( self::get_available_providers_for_user( $user->ID ) );
- $primary_provider = self::get_primary_provider_for_user( $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $enabled_providers = array_keys( static::get_available_providers_for_user( $user->ID ) );
+ $primary_provider = static::get_primary_provider_for_user( $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $primary_provider ) && is_object( $primary_provider ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $primary_provider_key = get_class( $primary_provider );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +620,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'user_two_factor_options', '_nonce_user_two_factor_options', false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="<?php echo esc_attr( self::ENABLED_PROVIDERS_USER_META_KEY ); ?>[]" value="<?php /* Dummy input so $_POST value is passed when no providers are enabled. */ ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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. */ ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,10 +636,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach ( self::get_providers() as $class => $object ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( static::get_providers() as $class => $object ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><input type="checkbox" name="<?php echo esc_attr( self::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( self::PROVIDER_USER_META_KEY ); ?>" value="<?php echo esc_attr( $class ); ?>" <?php checked( $class, $primary_provider_key ); ?> /></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $object->print_label(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'two-factor-user-options-' . $class, $user ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,23 +675,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['_nonce_user_two_factor_options'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'user_two_factor_options', '_nonce_user_two_factor_options' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $_POST[ self::ENABLED_PROVIDERS_USER_META_KEY ] ) ||
- ! is_array( $_POST[ self::ENABLED_PROVIDERS_USER_META_KEY ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_POST[ static::ENABLED_PROVIDERS_USER_META_KEY ] ) ||
+ ! is_array( $_POST[ static::ENABLED_PROVIDERS_USER_META_KEY ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $providers = self::get_providers();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $providers = static::get_providers();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $enabled_providers = $_POST[ self::ENABLED_PROVIDERS_USER_META_KEY ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $enabled_providers = $_POST[ static::ENABLED_PROVIDERS_USER_META_KEY ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Enable only the available providers.
</span><span class="cx" style="display: block; padding: 0 10px"> $enabled_providers = array_intersect( $enabled_providers, array_keys( $providers ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_meta( $user_id, self::ENABLED_PROVIDERS_USER_META_KEY, $enabled_providers );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( $user_id, static::ENABLED_PROVIDERS_USER_META_KEY, $enabled_providers );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Primary provider must be enabled.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_provider = isset( $_POST[ self::PROVIDER_USER_META_KEY ] ) ? $_POST[ self::PROVIDER_USER_META_KEY ] : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_provider = isset( $_POST[ static::PROVIDER_USER_META_KEY ] ) ? $_POST[ static::PROVIDER_USER_META_KEY ] : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $new_provider ) && in_array( $new_provider, $enabled_providers, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_meta( $user_id, self::PROVIDER_USER_META_KEY, $new_provider );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( $user_id, static::PROVIDER_USER_META_KEY, $new_provider );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorclasstwofactorwporgphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: 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 (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-wporg.php 2018-02-25 05:56:27 UTC (rev 6739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,13 @@
</span><ins style="background-color: #dfd; 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 {
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/class.two-factor-wporg.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>