Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/Symfony/Component/Security/Csrf/CsrfTokenManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ private function derandomize(string $value): string
return $value;
}
$key = base64_decode(strtr($parts[1], '-_', '+/'));
if ('' === $key || false === $key) {
return $value;
}
$value = base64_decode(strtr($parts[2], '-_', '+/'));

return $this->xor($value, $key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,26 @@ public function testNonExistingTokenIsNotValid($namespace, $manager, $storage)
$this->assertFalse($manager->isTokenValid(new CsrfToken('token_id', 'FOOBAR')));
}

public function testTokenShouldNotTriggerDivisionByZero()
{
[$generator, $storage] = $this->getGeneratorAndStorage();
$manager = new CsrfTokenManager($generator, $storage);

// Scenario: the token that was returned is abc.def.ghi, and gets modified in the browser to abc..ghi

$storage->expects($this->once())
->method('hasToken')
->with('https-token_id')
->willReturn(true);

$storage->expects($this->once())
->method('getToken')
->with('https-token_id')
->willReturn('def');

$this->assertFalse($manager->isTokenValid(new CsrfToken('token_id', 'abc..ghi')));
}

/**
* @dataProvider getManagerGeneratorAndStorage
*/
Expand Down