Commit38ffc89

committed

csrf_token_lazy form option

1 parent02c1e3c commit38ffc89Copy full SHA for 38ffc89

File tree

+22

-1

lines changed

src/Symfony/Component/Form
- Extension/Csrf/Type
  - FormTypeCsrfExtension.php
- Tests/Extension/Csrf/Type
  - FormTypeCsrfExtensionTest.php

+22

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function finishView(FormView $view, FormInterface $form, array $options):`
`68`	`68`	`if ($options['csrf_protection'] && !$view->parent &&$options['compound']) {`
`69`	`69`	`$factory =$form->getConfig()->getFormFactory();`
`70`	`70`	`$tokenId =$options['csrf_token_id'] ?: ($form->getName() ?:$form->getConfig()->getType()->getInnerType()::class);`
`71`		`-$data = (string)$options['csrf_token_manager']->getToken($tokenId);`
	`71`	`+$data =$options['csrf_token_lazy'] ?'' :(string)$options['csrf_token_manager']->getToken($tokenId);`
`72`	`72`
`73`	`73`	`$csrfForm =$factory->createNamed($options['csrf_field_name'], HiddenType::class,$data, [`
`74`	`74`	`'block_prefix' =>'csrf_token',`
`@@ -87,6 +87,7 @@ public function configureOptions(OptionsResolver $resolver): void`
`87`	`87`	`'csrf_message' =>'The CSRF token is invalid. Please try to resubmit the form.',`
`88`	`88`	`'csrf_token_manager' =>$this->defaultTokenManager,`
`89`	`89`	`'csrf_token_id' =>null,`
	`90`	`+'csrf_token_lazy' =>false`
`90`	`91`	`]);`
`91`	`92`	`}`
`92`	`93`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,26 @@ public function testGenerateCsrfToken()`
`122`	`122`	`$this->assertEquals('token',$view['csrf']->vars['value']);`
`123`	`123`	`}`
`124`	`124`
	`125`	`+publicfunctiontestGenerateLazyCsrfToken()`
	`126`	`+ {`
	`127`	`+$this->tokenManager->expects($this->once())`
	`128`	`+ ->method('getToken')`
	`129`	`+ ->with('TOKEN_ID')`
	`130`	`+ ->willReturn(newCsrfToken('TOKEN_ID','token'));`
	`131`	`+`
	`132`	`+$view =$this->factory`
	`133`	`+ ->create('Symfony\Component\Form\Extension\Core\Type\FormType',null, [`
	`134`	`+'csrf_field_name' =>'csrf',`
	`135`	`+'csrf_token_manager' =>$this->tokenManager,`
	`136`	`+'csrf_token_id' =>'TOKEN_ID',`
	`137`	`+'csrf_token_lazy' =>true,`
	`138`	`+'compound' =>true,`
	`139`	`+ ])`
	`140`	`+ ->createView();`
	`141`	`+`
	`142`	`+$this->assertEquals('token','');`
	`143`	`+ }`
	`144`	`+`
`125`	`145`	`publicfunctiontestGenerateCsrfTokenUsesFormNameAsIntentionByDefault()`
`126`	`146`	`{`
`127`	`147`	`$this->tokenManager->expects($this->once())`

Comments

(0)