Skip to content

Fix token auth prefix removal. #721

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
markstory merged 3 commits into from
May 9, 2025
Merged

Fix token auth prefix removal. #721

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b9a743
Fix token auth prefix removal.
dereuromark May 2, 2025
f9be25e
Update tests/TestCase/Authenticator/TokenAuthenticatorTest.php
dereuromark May 7, 2025
f5d38f9
Update test
markstory May 7, 2025
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
7 changes: 6 additions & 1 deletion src/Authenticator/TokenAuthenticator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@ protected function getToken(ServerRequestInterface $request): ?string
*/
protected function stripTokenPrefix(string $token, string $prefix): string
{
return trim(str_ireplace($prefix, '', $token));
$prefixLength = mb_strlen($prefix);
if (mb_substr(mb_strtolower($token), 0, $prefixLength) === mb_strtolower($prefix)) {
$token = mb_substr($token, $prefixLength);
}

return trim($token);
}

/**
Expand Down
10 changes: 10 additions & 0 deletions tests/TestCase/Authenticator/TokenAuthenticatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ public function testTokenPrefix()
$result = $tokenAuth->authenticate($requestWithHeaders);
$this->assertInstanceOf(Result::class, $result);
$this->assertSame(Result::FAILURE_IDENTITY_NOT_FOUND, $result->getStatus());

// should not modify in between
$requestWithHeaders = $this->request->withAddedHeader('X-Dipper-Auth', 'auth-token-13');
Comment thread
dereuromark marked this conversation as resolved.
Outdated
$tokenAuth = new TokenAuthenticator($this->identifiers, [
'header' => 'X-Dipper-Auth',
'tokenPrefix' => 'token_',
]);
$result = $tokenAuth->authenticate($requestWithHeaders);
$this->assertInstanceOf(Result::class, $result);
$this->assertSame(Result::SUCCESS, $result->getStatus());
}

/**
Expand Down
Loading