<!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>[10288] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login: Login: Don't allow usernames with trailing spaces or other whitespace around it.</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 { white-space: pre-line; 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/10288">10288</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/10288","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>2020-09-26 01:46:31 +0000 (Sat, 26 Sep 2020)</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'>Login: Don't allow usernames with trailing spaces or other whitespace around it.
A handful of new registrations included a space trailing their username which caused the confirmation emails to include invalid activation links.
See https://wordpress.slack.com/archives/C08M59V3P/p1601053672001300</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsregistrationphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginregisterphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsregistrationphp"></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/themes/pub/wporg-login/functions-registration.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/themes/pub/wporg-login/functions-registration.php 2020-09-25 20:36:00 UTC (rev 10287)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php 2020-09-26 01:46:31 UTC (rev 10288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,6 +49,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $wp_hasher;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove any whitespace which might have accidentally been added.
+ $user_login = trim( $user_login );
+ $user_email = trim( $user_email );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Allow for w.org plugins to block registrations based on spam checks, etc.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null !== ( $pre_register_error = apply_filters( 'wporg_login_pre_registration', null, $user_login, $user_email, $user_mailinglist ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $pre_register_error ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'Your username is: %s', 'wporg' ), $user_login ) . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= __( 'You can create a password at the following URL:', 'wporg' ) . "\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body .= home_url( "/register/create/{$user_login}/{$activation_key}/" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= home_url( '/register/create/' . urlencode( $user_login ) . '/' . urlencode( $activation_key ) . '/' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= __( '-- The WordPress.org Team', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,8 +207,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Insert user, no password tho.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_login = $pending_user['user_login'];
- $user_email = $pending_user['user_email'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_login = trim( $pending_user['user_login'] );
+ $user_email = trim( $pending_user['user_email'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_mailinglist = !empty( $pending_user['meta']['user_mailinglist'] ) && $pending_user['meta']['user_mailinglist'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $password ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $fields as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['user_fields'][ $field ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = sanitize_text_field( wp_unslash( $_POST['user_fields'][ $field ] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = trim( sanitize_text_field( wp_unslash( $_POST['user_fields'][ $field ] ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'url' == $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $pending_user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pending_user['meta'][ $field ] = esc_url_raw( $value );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginregisterphp"></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/themes/pub/wporg-login/register.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/themes/pub/wporg-login/register.php 2020-09-25 20:36:00 UTC (rev 10287)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php 2020-09-26 01:46:31 UTC (rev 10288)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,11 +5,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package wporg-login
</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">-$user_login = isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$user_login = isset( $_POST['user_login'] ) ? trim( wp_unslash( $_POST['user_login'] ) ) : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user_login && !empty( WP_WPOrg_SSO::$matched_route_params['user'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_login = WP_WPOrg_SSO::$matched_route_params['user'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_login = trim( WP_WPOrg_SSO::$matched_route_params['user'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$user_email = isset( $_POST['user_email'] ) ? wp_unslash( $_POST['user_email'] ) : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$user_email = isset( $_POST['user_email'] ) ? trim( wp_unslash( $_POST['user_email'] ) ) : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_mailinglist = isset( $_POST['user_mailinglist'] ) && 'true' == $_POST['user_mailinglist'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $error_user_login = $error_user_email = $error_recapcha_status = false;
</span></span></pre>
</div>
</div>
</body>
</html>