Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix PHP Fatal error when validating CSRF token on a form bound with a string #7137

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 4 commits into from
Closed

Fix PHP Fatal error when validating CSRF token on a form bound with a string #7137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
021091e
Fix PHP Fatal error when validating CSRF token on a form bound with a…
Feb 20, 2013
c1f05c2
The curly brace should be on the previous line
Feb 20, 2013
f1928da
Fix PHP Fatal error when validating CSRF token on a form bound with a…
Feb 20, 2013
21efd50
Merge branch '2.1' of github.com:chbruyand/symfony into 2.1
Feb 20, 2013
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
5 changes: 3 additions & 2 deletions src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ public function preBind(FormEvent $event)
if (!isset($data[$this->fieldName]) || !$this->csrfProvider->isCsrfTokenValid($this->intention, $data[$this->fieldName])) {
$form->addError(new FormError('The CSRF token is invalid. Please try to resubmit the form.'));
}

unset($data[$this->fieldName]);
if (is_array($data)) {
unset($data[$this->fieldName]);
}
}

$event->setData($data);
Expand Down
20 changes: 20 additions & 0 deletions src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,26 @@ public function testFailIfRootAndCompoundAndTokenMissing()
$this->assertFalse($form->isValid());
}

public function testFailIfRootAndCompoundAndBoundDataIsString()
{
$form = $this->factory
->createBuilder('form', null, array(
'csrf_field_name' => 'csrf',
'csrf_provider' => $this->csrfProvider,
'intention' => '%INTENTION%',
'compound' => true,
))
->add('child', 'text')
->getForm();

$form->bind('malformed request');

$this->assertSame(array('child' => null), $form->getData());

// Validate accordingly
$this->assertFalse($form->isValid());
}

public function testDontValidateTokenIfCompoundButNoRoot()
{
$this->csrfProvider->expects($this->never())
Expand Down