Skip to content
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

Jump to bottom

Merge main into user_management #6

Merged
merged 2 commits into from
Jan 9, 2023
Merged

Merge main into user_management #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a2758b
Merge pull request #3 from anzusystems/update_require_common_bundle
sakulb Jan 4, 2023
9a05d51
Fix hash for stateless token as argon2id creates problems (#4)
marforon Jan 9, 2023
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
22 changes: 13 additions & 9 deletions src/Util/StatelessTokenUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace AnzuSystems\AuthBundle\Util;

use AnzuSystems\CommonBundle\Helper\PasswordHelper;
use Symfony\Component\HttpFoundation\Request;

final class StatelessTokenUtil
Expand All @@ -16,19 +15,20 @@ public function __construct(

public function createForRequest(Request $request): string
{
return urldecode(base64_encode(PasswordHelper::passwordHash(
$this->createPlainForRequest($request)
)));
return urldecode(base64_encode(
$this->createHashForRequest($request)
));
}

/**
* @param non-empty-string $hash
*/
public function isValidForRequest(Request $request, string $hash): bool
{
$token = $this->createPlainForRequest($request);

return password_verify($token, urldecode(base64_decode($hash, strict: true)));
return hash_equals(
known_string: $this->createHashForRequest($request),
user_string: urldecode(base64_decode($hash, strict: true)),
);
}

/**
Expand All @@ -39,8 +39,12 @@ public function isNotValidForRequest(Request $request, string $hash): bool
return false === $this->isValidForRequest($request, $hash);
}

private function createPlainForRequest(Request $request): string
private function createHashForRequest(Request $request): string
{
return $request->headers->get('User-Agent') . $request->getClientIp() . $this->statelessTokenSalt;
return hash_hmac(
algo: 'sha256',
data: $request->headers->get('User-Agent') . $request->getClientIp(),
key: $this->statelessTokenSalt,
);
}
}