Skip to content

Fix for WP 6.8 #656

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

Open
wants to merge 1 commit into
base: 9.0
Choose a base branch
from
Open

Fix for WP 6.8 #656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 27 additions & 2 deletions src/Services/PasswordService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

namespace Corcel\Services;

use Corcel\Model\Option;
use Hautelook\Phpass\PasswordHash;

/**
Expand All @@ -26,7 +26,25 @@ public function __construct()
*/
public function makeHash($password)
{
return $this->hasher->HashPassword(trim($password));
$dbVersion = Option::where('option_name', 'db_version')->first()->option_value;
$isAtLeast68 = $dbVersion >= 58975;

if ($isAtLeast68) {
$password_to_hash = base64_encode( hash_hmac( 'sha384', trim( $password ), 'wp-sha384', true ) );

// Default $options: WordPress 6.8 uses ['cost' => 10] for bcrypt
// This can be overwritten by $options = apply_filters( 'wp_hash_password_options', array(), $algorithm ); though!
$options = array( 'cost' => 10 );

// Add a prefix to facilitate distinguishing vanilla bcrypt hashes.
$hashedPassword = '$wp' . password_hash( $password_to_hash, PASSWORD_BCRYPT, $options);

return $hashedPassword;
}
else {
return $this->hasher->HashPassword(trim($password));
}

}

/**
Expand All @@ -38,9 +56,16 @@ public function makeHash($password)
*/
public function check($password, $hash)
{

if (strlen($hash) <= 32) { // if the hash is still md5
return $hash === md5($password);
}
if (str_starts_with($hash, '$wp')) // fix for 6.8 wordpress
{
$password_to_verify = base64_encode( hash_hmac( 'sha384', $password, 'wp-sha384', true ) );

return password_verify( $password_to_verify, substr( $hash, 3 ) );
}

return $this->hasher->CheckPassword($password, $hash);
}
Expand Down