Skip to content

#13655 fix: stripslash passwords on login and user edit #12953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
skikken wants to merge 2 commits into
base: trunk
Choose a base branch
from
+80 −5
Draft

#13655 fix: stripslash passwords on login and user edit #12953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c16f52
fix: stripslash passwords on login and user edit
skikken Aug 10, 2026
372bda7
test: cover password stripslashing and hash migration
skikken Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/wp-admin/includes/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ function edit_user( $user_id = 0 ) {
$pass1 = '';
$pass2 = '';
if ( isset( $_POST['pass1'] ) ) {
$pass1 = trim( $_POST['pass1'] );
$pass1 = trim( wp_unslash( $_POST['pass1'] ) );
}
if ( isset( $_POST['pass2'] ) ) {
$pass2 = trim( $_POST['pass2'] );
$pass2 = trim( wp_unslash( $_POST['pass2'] ) );
}

if ( isset( $_POST['role'] ) && current_user_can( 'promote_users' ) && ( ! $user_id || current_user_can( 'promote_user', $user_id ) ) ) {
Expand Down
28 changes: 27 additions & 1 deletion src/wp-includes/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
$credentials['user_login'] = wp_unslash( $_POST['log'] );
}
if ( ! empty( $_POST['pwd'] ) && is_string( $_POST['pwd'] ) ) {
$credentials['user_password'] = $_POST['pwd'];
$credentials['user_password'] = wp_unslash( $_POST['pwd'] );
}
if ( ! empty( $_POST['rememberme'] ) ) {
$credentials['remember'] = $_POST['rememberme'];
Expand Down Expand Up @@ -207,6 +207,19 @@ function wp_authenticate_username_password(

$valid = wp_check_password( $password, $user->user_pass, $user->ID );

if ( ! $valid ) {
/*
* Back-compat for users whose password was hashed with magic-quote slashes
* intact. If the slashed version matches, migrate the hash to the
* unslashed password.
*/
$valid = wp_check_password( wp_slash( $password ), $user->user_pass, $user->ID );

if ( $valid ) {
wp_set_password( $password, $user->ID );
}
}

if ( ! $valid ) {
return new WP_Error(
'incorrect_password',
Expand Down Expand Up @@ -290,6 +303,19 @@ function wp_authenticate_email_password(

$valid = wp_check_password( $password, $user->user_pass, $user->ID );

if ( ! $valid ) {
/*
* Back-compat for users whose password was hashed with magic-quote slashes
* intact. If the slashed version matches, migrate the hash to the
* unslashed password.
*/
$valid = wp_check_password( wp_slash( $password ), $user->user_pass, $user->ID );

if ( $valid ) {
wp_set_password( $password, $user->ID );
}
}

if ( ! $valid ) {
return new WP_Error(
'incorrect_password',
Expand Down
4 changes: 2 additions & 2 deletions src/wp-login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,15 +970,15 @@ function wp_login_viewport_meta() {

// Check if password is one or all empty spaces.
if ( ! empty( $_POST['pass1'] ) ) {
$_POST['pass1'] = trim( $_POST['pass1'] );
$_POST['pass1'] = trim( wp_unslash( $_POST['pass1'] ) );

if ( empty( $_POST['pass1'] ) ) {
$errors->add( 'password_reset_empty_space', __( 'The password cannot be a space or all spaces.' ) );
}
}

// Check if password fields do not match.
if ( ! empty( $_POST['pass1'] ) && trim( $_POST['pass2'] ) !== $_POST['pass1'] ) {
if ( ! empty( $_POST['pass1'] ) && trim( wp_unslash( $_POST['pass2'] ) ) !== $_POST['pass1'] ) {
$errors->add( 'password_reset_mismatch', __( '<strong>Error:</strong> The passwords do not match.' ) );
}

Expand Down
49 changes: 49 additions & 0 deletions tests/phpunit/tests/auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,55 @@ public function data_passwords_for_trimming() {
);
}

/**
* Tests that wp_signon() unslashes the password from $_POST.
*
* @ticket 13655
*/
public function test_wp_signon_unslashes_password() {
$password = "pa'ss";
wp_set_password( $password, $this->user->ID );

$_POST['log'] = $this->user->user_login;
$_POST['pwd'] = wp_slash( $password );
$_POST['test'] = 1;

$authed_user = wp_signon();

unset( $_POST['log'], $_POST['pwd'], $_POST['test'] );

$this->assertNotWPError( $authed_user );
$this->assertInstanceOf( 'WP_User', $authed_user );
$this->assertSame( $this->user->ID, $authed_user->ID );
}

/**
* Tests that a password hashed with slashes intact is migrated on login.
*
* @ticket 13655
*/
public function test_slashed_password_hash_is_migrated_on_login() {
$password = "pa'ss";

// Simulate a legacy hash of the slashed password.
$slashed_hash = wp_hash_password( wp_slash( $password ) );
wp_update_user(
array(
'ID' => $this->user->ID,
'user_pass' => $slashed_hash,
)
);

$authed_user = wp_authenticate( $this->user->user_login, $password );

$this->assertNotWPError( $authed_user );
$this->assertSame( $this->user->ID, $authed_user->ID );

// The hash should now be of the unslashed password.
$user = get_user_by( 'id', $this->user->ID );
$this->assertTrue( wp_check_password( $password, $user->user_pass, $user->ID ) );
}

/**
* Tests hooking into wp_set_password().
*
Expand Down
Loading