8000 [Security][CSRF] Double Submit Cookies CSRF prevention strategy by backbone87 · Pull Request #18333 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Security][CSRF] Double Submit Cookies CSRF prevention strategy #18333

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

Closed
wants to merge 10 commits into from
Closed

[Security][CSRF] Double Submit Cookies CSRF prevention strategy #18333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d746f31
extend csrf token storage infrastructure
backbone87 Mar 28, 2016
e9573af
code style and feedback
backbone87 Sep 21, 2016
beed130
more codestyle fixes
backbone87 Sep 21, 2016
1cea0d2
remove @see
backbone87 Sep 21, 2016
a298be6
update suggestion notice in composer.json
backbone87 Sep 21, 2016
a533b0e
add a secureNamespace to SessionTokenStorageFactory for secure requests
backbone87 Sep 21, 2016
893fa0c
implement EventSubscriberInterface into CookieTokenStorageListener
backbone87 Sep 24, 2016
61b5483
add verification logic to CookieTokenStorage
backbone87 Sep 25, 2016
6e19ef9
rework CookieTokenStorage
backbone87 Sep 26, 2016
99dde3b
code style
backbone87 Sep 28, 2016
File filter

Filter by extension

10000 Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
code style
  • Loading branch information
@backbone87
backbone87 committed Sep 28, 2016
commit 99dde3b93f8c8106ef09558217c84381f9eb0ae6
4 changes: 2 additions & 2 deletions src/Symfony/Component/Security/Csrf/TokenStorage/CookieTokenStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function __construct($cookies, $secure, $secret, $ttl = null)
$this->cookies = self::parseCookieHeader($cookies);
$this->secure = (bool) $secure;
< 10000 span class='blob-code-inner blob-code-marker ' data-code-marker=" "> $this->secret = (string) $secret;
$this->ttl = $ttl === null ? 60 * 60 : (int) $ttl;
$this->ttl = null === $ttl ? 60 * 60 : (int) $ttl;

if ('' === $this->secret) {
throw new InvalidArgumentException('Secret must be a non-empty string');
Expand Down Expand Up @@ -151,7 +151,7 @@ public function createCookies()
}
}

if ($token !== '') {
if ('' !== $token) {
$cookies[] = $this->createCookie($tokenId, $token);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Security/Csrf/TokenStorage/CookieTokenStorageFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class CookieTokenStorageFactory implements TokenStorageFactoryInterface
public function __construct($secret, $ttl = null)
{
$this->secret = (string) $secret;
$this->ttl = $ttl === null ? 60 * 60 : (int) $ttl;
$this->ttl = null === $ttl ? 60 * 60 : (int) $ttl;

if ('' === $this->secret) {
throw new InvalidArgumentException('Secret must be a non-empty string');
Expand Down
9 changes: 6 additions & 3 deletions src/Symfony/Component/Security/Csrf/TokenStorage/CookieTokenStorageListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
*/
class CookieTokenStorageListener implements EventSubscriberInterface
{
/**
* @var string
*/
const DEFAULT_TOKEN_STORAGE_KEY = '_csrf_token_storage';

/**
* @var string
*/
Expand All @@ -36,9 +41,7 @@ class CookieTokenStorageListener implements EventSubscriberInterface
*/
public function __construct($tokenStorageKey = null)
{
// TODO should this class get its own DEFAULT_TOKEN_STORAGE_KEY constant?
// if no, where should the sole constant be put?
$this->tokenStorageKey = $tokenStorageKey === null ? RequestStackTokenStorage::DEFAULT_TOKEN_STORAGE_KEY : $tokenStorageKey;
$this->tokenStorageKey = null === $tokenStorageKey ? self::DEFAULT_TOKEN_STORAGE_KEY : $tokenStorageKey;
}

/**
Expand Down
15 changes: 4 additions & 11 deletions src/Symfony/Component/Security/Csrf/TokenStorage/RequestStackTokenStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,8 @@ class RequestStackTokenStorage extends AbstractTokenStorageProxy
* @param TokenStorageFactoryInterface $factory
* @param string|null $tokenStorageKey
*/
public function __construct(
RequestStack $requestStack,
TokenStorageFactoryInterface $factory,
$tokenStorageKey = null
) {
public function __construct(RequestStack $requestStack, TokenStorageFactoryInterface $factory, $tokenStorageKey = null)
{
$this->requestStack = $requestStack;
$this->factory = $factory;
$this->tokenStorageKey = $tokenStorageKey === null ? self::DEFAULT_TOKEN_STORAGE_KEY : $tokenStorageKey;
Expand All @@ -64,7 +61,6 @@ public function __construct(
*/
public function getProxiedTokenStorage()
{
// TODO use master or current request?
$request = $this->requestStack->getMasterRequest();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master?


if (!$request) {
Expand All @@ -77,11 +73,8 @@ public function getProxiedTokenStorage()
return $storage;
}

if ($storage !== null) {
throw new UnexpectedValueException(sprintf(
'Expected null or an instance of "Symfony\\Component\\Security\\Csrf\\TokenStorage\\TokenStorageInterface", got "%s"',
is_object($storage) ? get_class($storage) : gettype($storage)
));
if (null !== $storage) {
throw new UnexpectedValueException(sprintf('Expected null or an implementation of "%s", got "%s"', TokenStorageInterface::class, is_object($storage) ? get_class($storage) : gettype($storage)));
}

$storage = $this->factory->createTokenStorage($request);
Expand Down
0