sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Login and Registration: Simplify the test for `wp_signon()` added in [46640]. 

Make sure it actually tests the change in behavior, previously it passed both before and after the patch.

Add `wp_unslash()` to the last remaining instance of `$_POST['user_login']` that didn't have it.

See #38744.

git-svn-id: https://develop.svn.wordpress.org/trunk@46650 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-11-04 15:04:41 +00:00
parent c231bb4869
commit 20165c2ffb
3 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-login.php
View File

@ -373,7 +373,7 @@ function retrieve_password() {
$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) ); $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
} }
} else { } else {
$login = trim( $_POST['user_login'] ); $login = trim( wp_unslash( $_POST['user_login'] ) );
$user_data = get_user_by( 'login', $login ); $user_data = get_user_by( 'login', $login );
} }

18
tests/phpunit/tests/auth.php
View File

@ -387,7 +387,7 @@ class Tests_Auth extends WP_UnitTestCase {
* *
* @ticket 9568 * @ticket 9568
*/ */
function test_log_in_using_email() { public function test_log_in_using_email() {
$user_args = array( $user_args = array(
'user_login' => 'johndoe', 'user_login' => 'johndoe',
'user_email' => 'mail@example.com', 'user_email' => 'mail@example.com',
@ -398,4 +398,20 @@ class Tests_Auth extends WP_UnitTestCase {
$this->assertInstanceOf( 'WP_User', wp_authenticate( $user_args['user_email'], $user_args['user_pass'] ) ); $this->assertInstanceOf( 'WP_User', wp_authenticate( $user_args['user_email'], $user_args['user_pass'] ) );
$this->assertInstanceOf( 'WP_User', wp_authenticate( $user_args['user_login'], $user_args['user_pass'] ) ); $this->assertInstanceOf( 'WP_User', wp_authenticate( $user_args['user_login'], $user_args['user_pass'] ) );
} }
/**
* @ticket 38744
*/
public function test_wp_signon_using_email_with_an_apostrophe() {
$user_args = array(
'user_email' => "mail\'@example.com",
'user_pass' => 'password',
);
$this->factory()->user->create( $user_args );
$_POST['log'] = $user_args['user_email'];
$_POST['pwd'] = $user_args['user_pass'];
$this->assertInstanceOf( 'WP_User', wp_signon() );
}
} }

36
tests/phpunit/tests/user.php
View File

@ -35,22 +35,6 @@ class Tests_User extends WP_UnitTestCase {
); );
self::$user_ids[] = self::$contrib_id; self::$user_ids[] = self::$contrib_id;
self::$user_ids[] = $factory->user->create(
array(
'user_login' => "testemailaddress'@test.com",
'user_nicename' => 'user_email_with_apostrophe',
'user_pass' => 'password',
'first_name' => 'John',
'last_name' => 'Doe',
'display_name' => 'John Doe',
'user_email' => "testemailaddress'@test.com",
'user_url' => 'http://tacos.com',
'role' => 'contributor',
'nickname' => 'Johnny',
'description' => 'I am a WordPress user that cares about privacy.',
)
);
self::$author_id = $factory->user->create( self::$author_id = $factory->user->create(
array( array(
'user_login' => 'author_login', 'user_login' => 'author_login',
@ -64,8 +48,8 @@ class Tests_User extends WP_UnitTestCase {
self::$user_ids[] = self::$admin_id; self::$user_ids[] = self::$admin_id;
self::$editor_id = $factory->user->create( self::$editor_id = $factory->user->create(
array( array(
'role' => 'editor',
'user_email' => 'test@test.com', 'user_email' => 'test@test.com',
'role' => 'editor',
) )
); );
self::$user_ids[] = self::$editor_id; self::$user_ids[] = self::$editor_id;
@ -81,24 +65,6 @@ class Tests_User extends WP_UnitTestCase {
$this->author = clone self::$_author; $this->author = clone self::$_author;
} }
public function test_that_you_can_login_with_an_email_that_has_apostrophe() {
// Create the user with an email that has an apostrophe (see test setup).
// Login as the user.
$credentials = [
'user_login' => "testemailaddress'@test.com",
'user_password' => 'password',
];
// Attempt to login.
$user = wp_signon( $credentials );
// Assert that the login was successfull.
// If the login fails, an instance of WP_Error is returned rather than User object.
$this->assertNotWPError( $user );
}
function test_get_users_of_blog() { function test_get_users_of_blog() {
// add one of each user role // add one of each user role
$nusers = array( $nusers = array(