Commitdf539e2

committed

[SecurityBundle] Fixlogout.csrf_token_generator default value

1 parentfc0f8da commitdf539e2Copy full SHA for df539e2

File tree

+40

-2

lines changed

+40

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto`
`222`	`222`	`if (isset($v['csrf_token_generator'])) {`
`223`	`223`	`$v['enable_csrf'] =true;`
`224`	`224`	`}elseif ($v['enable_csrf']) {`
`225`		`-$v['csrf_token_generator'] ='security.csrf.token_generator';`
	`225`	`+$v['csrf_token_generator'] ='security.csrf.token_manager';`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`return$v;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function testLogoutCsrf()`
`122`	`122`
`123`	`123`	`$assertions = [`
`124`	`124`	`'custom_token_generator' => [true,'a_token_generator'],`
`125`		`-'default_token_generator' => [true,'security.csrf.token_generator'],`
	`125`	`+'default_token_generator' => [true,'security.csrf.token_manager'],`
`126`	`126`	`'disabled_csrf' => [false,null],`
`127`	`127`	`'empty' => [false,null],`
`128`	`128`	`];`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,19 @@ public function testCookieClearingOnLogout()`
`69`	`69`	`$this->assertNull($cookieJar->get('flavor'));`
`70`	`70`	`}`
`71`	`71`
	`72`	`+publicfunctiontestEnabledCsrf()`
	`73`	`+ {`
	`74`	`+$client =$this->createClient(['test_case' =>'Logout','root_config' =>'config_csrf_enabled.yml']);`
	`75`	`+`
	`76`	`+$cookieJar =$client->getCookieJar();`
	`77`	`+$cookieJar->set(newCookie('flavor','chocolate',strtotime('+1 day'),null,'somedomain'));`
	`78`	`+`
	`79`	`+$client->request('POST','/login', ['_username' =>'johannes','_password' =>'test']);`
	`80`	`+$client->request('GET','/logout');`
	`81`	`+`
	`82`	`+$this->assertResponseStatusCodeSame(Response::HTTP_FORBIDDEN);`
	`83`	`+ }`
	`84`	`+`
`72`	`85`	`privatefunctioncallInRequestContext(KernelBrowser$client,callable$callable):void`
`73`	`86`	`{`
`74`	`87`	`/** @var EventDispatcherInterface $eventDispatcher */`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,25 @@`
	`1`	`+imports:`
	`2`	`+-{ resource: ./../config/framework.yml }`
	`3`	`+`
	`4`	`+security:`
	`5`	`+password_hashers:`
	`6`	`+Symfony\Component\Security\Core\User\InMemoryUser:plaintext`
	`7`	`+`
	`8`	`+providers:`
	`9`	`+in_memory:`
	`10`	`+memory:`
	`11`	`+users:`
	`12`	`+johannes:{ password: test, roles: [ROLE_USER] }`
	`13`	`+`
	`14`	`+firewalls:`
	`15`	`+default:`
	`16`	`+form_login:`
	`17`	`+check_path:login`
	`18`	`+remember_me:true`
	`19`	`+require_previous_session:false`
	`20`	`+logout:`
	`21`	`+enable_csrf:true`
	`22`	`+`
	`23`	`+access_control:`
	`24`	`+ -{ path: ^/login$, roles: IS_AUTHENTICATED_ANONYMOUSLY }`
	`25`	`+ -{ path: .*, roles: IS_AUTHENTICATED_FULLY }`

Comments

(0)