<!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>[6761] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers: 2FA: Have `WPORG_Two_Factor_Email` be it's own provider in it's own right.</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/6761">6761</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/6761","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-26 12:26:40 +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: Have `WPORG_Two_Factor_Email` be it's own provider in it's own right.
By extending `WPORG_Two_Factor_Email` for `WPORG_Two_Factor_Slack` it was found that `Two_Factor_Email` uses `self::` a bunch causing the usermeta token override not to take effect.
See <a href="http://meta.trac.wordpress.org/ticket/77">#77</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorprovidersclasswporgtwofactoremailphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers/class-wporg-two-factor-email.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorprovidersclasswporgtwofactorslackphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers/class-wporg-two-factor-slack.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorprovidersclasswporgtwofactoremailphp"></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/providers/class-wporg-two-factor-email.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/providers/class-wporg-two-factor-email.php 2018-02-26 07:07:39 UTC (rev 6760)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers/class-wporg-two-factor-email.php 2018-02-26 12:26:40 UTC (rev 6761)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,24 +1,62 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once TWO_FACTOR_DIR . 'providers/class.two-factor-email.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WPORG_Two_Factor_Email extends Two_Factor_Provider {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class WPORG_Two_Factor_Email extends Two_Factor_Email {
- /**
- * Ensures only one instance of this class exists in memory at any one time.
- *
- * @since 0.1-dev
- */
- static function get_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const TOKEN_META_KEY = '_two_factor_email_token';
+
+ public static function get_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> static $instance;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = __CLASS__;
- if ( ! is_a( $instance, $class ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $instance ) {
+ $class = __CLASS__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance = new $class;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $instance;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_label() {
+ return 'Email'; // Not marked for translation as this shouldn't be called/displayed.
+ }
+
+ public function generate_token( $user_id ) {
+ $token = $this->get_code();
+ update_user_meta( $user_id, static::TOKEN_META_KEY, wp_hash( $token ) );
+ return $token;
+ }
+
+ public function user_has_token( $user_id ) {
+ return (bool) $this->get_user_token( $user_id );
+ }
+
+ public function get_user_token( $user_id ) {
+ $hashed_token = get_user_meta( $user_id, static::TOKEN_META_KEY, true );
+
+ if ( ! empty( $hashed_token ) && is_string( $hashed_token ) ) {
+ return $hashed_token;
+ }
+
+ return false;
+ }
+
+ public function validate_token( $user_id, $token ) {
+ $hashed_token = $this->get_user_token( $user_id );
+
+ // Bail if token is empty or it doesn't match.
+ if ( empty( $hashed_token ) || ( wp_hash( $token ) !== $hashed_token ) ) {
+ return false;
+ }
+
+ // Ensure that the token can't be re-used.
+ $this->delete_token( $user_id );
+
+ return true;
+ }
+
+ public function delete_token( $user_id ) {
+ delete_user_meta( $user_id, static::TOKEN_META_KEY );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function validate_authentication( $user, $code = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $user->ID ) || ! $code ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $user->ID ) || ! $code ) {
</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">@@ -36,11 +74,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $token = $this->generate_token( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: site name */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = wp_strip_all_tags( sprintf( __( 'Your login confirmation code for %s', 'wporg' ), get_bloginfo( 'name' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = __( 'Your login confirmation code for WordPress.org', 'wporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: token */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = wp_strip_all_tags( sprintf( __( 'Enter %s to log in.', 'wporg' ), $token ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'Please enter the following verification code on WordPress.org to complete your login:', 'wporg' );
+ $message .= "\n" . $token;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_mail( $user->user_email, $subject, $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function authentication_page( $user ) {
+ // N/A
+ }
+
+ public function pre_process_authentication( $user ) {
+ // N/A
+ return false;
+ }
+
+ public function is_available_for_user( $user ) {
+ return true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtwofactorprovidersclasswporgtwofactorslackphp"></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/providers/class-wporg-two-factor-slack.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/providers/class-wporg-two-factor-slack.php 2018-02-26 07:07:39 UTC (rev 6760)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers/class-wporg-two-factor-slack.php 2018-02-26 12:26:40 UTC (rev 6761)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,22 +4,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class WPORG_Two_Factor_Slack extends WPORG_Two_Factor_Email {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * The user meta token key.
- *
- * @type string
- */
</del><span class="cx" style="display: block; padding: 0 10px"> const TOKEN_META_KEY = '_two_factor_slack_token';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Ensures only one instance of this class exists in memory at any one time.
- *
- * @since 0.1-dev
- */
- static function get_instance() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_instance() {
</ins><span class="cx" style="display: block; padding: 0 10px"> static $instance;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = __CLASS__;
- if ( ! is_a( $instance, $class ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $instance ) {
+ $class = __CLASS__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance = new $class;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $instance;
</span></span></pre>
</div>
</div>
</body>
</html>