Skip to content

[Security] Fix RememberMe with null password #35335

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

Merged
merged 1 commit into from
Jan 20, 2020
Merged

[Security] Fix RememberMe with null password #35335

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
12 changes: 6 additions & 6 deletions src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
/**
* Generates the cookie value.
*
* @param int $expires The Unix timestamp when the cookie expires
* @param string $password The encoded password
* @param int $expires The Unix timestamp when the cookie expires
* @param string|null $password The encoded password
*
* @return string
*/
protected function generateCookieValue(string $class, string $username, int $expires, string $password)
protected function generateCookieValue(string $class, string $username, int $expires, ?string $password)
{
// $username is encoded because it might contain COOKIE_DELIMITER,
// we assume other values don't
Expand All @@ -111,12 +111,12 @@ protected function generateCookieValue(string $class, string $username, int $exp
/**
* Generates a hash for the cookie to ensure it is not being tampered with.
*
* @param int $expires The Unix timestamp when the cookie expires
* @param string $password The encoded password
* @param int $expires The Unix timestamp when the cookie expires
* @param string|null $password The encoded password
*
* @return string
*/
protected function generateCookieHash(string $class, string $username, int $expires, string $password)
protected function generateCookieHash(string $class, string $username, int $expires, ?string $password)
{
return hash_hmac('sha256', $class.self::COOKIE_DELIMITER.$username.self::COOKIE_DELIMITER.$expires.self::COOKIE_DELIMITER.$password, $this->getSecret());
}
Expand Down