<!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>[37059] trunk: Users: In `edit_user()` check for a blank password when adding a user.</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="https://core.trac.wordpress.org/changeset/37059">37059</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37059","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-22 23:06:29 +0000 (Tue, 22 Mar 2016)</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'>Users: In `edit_user()` check for a blank password when adding a user.
Props wesleye, gitlost, adamsilverstein.
Fixes <a href="https://core.trac.wordpress.org/ticket/35715">#35715</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2016-03-22 21:49:36 UTC (rev 37058)
+++ trunk/src/wp-admin/includes/user.php 2016-03-22 23:06:29 UTC (rev 37059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'nickname', __( '<strong>ERROR</strong>: Please enter a nickname.' ) );
</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">- /* checking the password has been typed twice */
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before the password and confirm password fields are checked for congruity.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,13 +124,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* Check for "\" in password */
- if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for blank password when adding a user.
+ if ( ! $update && empty( $pass1 ) ) {
+ $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
+ }
+
+ // Check for "\" in password.
+ if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* checking the password has been typed twice the same */
- if ( $pass1 != $pass2 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Checking the password has been typed twice the same.
+ if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $pass1 ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $user->user_pass = $pass1;
</span></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2016-03-22 21:49:36 UTC (rev 37058)
+++ trunk/tests/phpunit/tests/user.php 2016-03-22 23:06:29 UTC (rev 37059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1132,4 +1132,71 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $was_admin_email_sent );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $was_user_email_sent );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Checks that calling edit_user() with no password returns an error when adding, and doesn't when updating.
+ *
+ * @ticket 35715
+ */
+ function test_edit_user_blank_pw() {
+ $_POST = $_GET = $_REQUEST = array();
+ $_POST['role'] = 'subscriber';
+ $_POST['email'] = 'user1@example.com';
+ $_POST['user_login'] = 'user_login1';
+ $_POST['first_name'] = 'first_name1';
+ $_POST['last_name'] = 'last_name1';
+ $_POST['nickname'] = 'nickname1';
+ $_POST['display_name'] = 'display_name1';
+
+ // Check new user with missing password.
+ $response = edit_user();
+
+ $this->assertInstanceOf( 'WP_Error', $response );
+ $this->assertEquals( 'pass', $response->get_error_code() );
+
+ // Check new user with password set.
+ $_POST['pass1'] = $_POST['pass2'] = 'password';
+
+ $user_id = edit_user();
+ $user = get_user_by( 'ID', $user_id );
+
+ $this->assertInternalType( 'int', $user_id );
+ $this->assertInstanceOf( 'WP_User', $user );
+ $this->assertEquals( 'nickname1', $user->nickname );
+
+ // Check updating user with empty password.
+ $_POST['nickname'] = 'nickname_updated';
+ $_POST['pass1'] = $_POST['pass2'] = '';
+
+ $user_id = edit_user( $user_id );
+
+ $this->assertInternalType( 'int', $user_id );
+ $this->assertEquals( 'nickname_updated', $user->nickname );
+
+ // Check updating user with missing second password.
+ $_POST['nickname'] = 'nickname_updated2';
+ $_POST['pass1'] = 'blank_pass2';
+ $_POST['pass2'] = '';
+
+ $response = edit_user( $user_id );
+
+ $this->assertInstanceOf( 'WP_Error', $response );
+ $this->assertEquals( 'pass', $response->get_error_code() );
+ $this->assertEquals( 'nickname_updated', $user->nickname );
+
+ // Check updating user with empty password via `check_passwords` action.
+ add_action( 'check_passwords', array( $this, 'action_check_passwords_blank_pw' ), 10, 2 );
+ $user_id = edit_user( $user_id );
+ remove_action( 'check_passwords', array( $this, 'action_check_passwords_blank_pw' ) );
+
+ $this->assertInternalType( 'int', $user_id );
+ $this->assertEquals( 'nickname_updated2', $user->nickname );
+ }
+
+ /**
+ * Check passwords action for test_edit_user_blank_pw().
+ */
+ function action_check_passwords_blank_pw( $user_login, &$pass1 ) {
+ $pass1 = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>