Commit3d1e8a7

committed

Merge branch '2.7' into 2.8

* 2.7: revert form login CSRF changes on wrong branch

2 parents53726dd +f1c30e4 commit3d1e8a7Copy full SHA for 3d1e8a7

File tree

2 files changed

-9

lines changed

cookbook/security
- csrf_in_login_form.rst
reference/configuration
- security.rst

2 files changed

-9

lines changed

`‎cookbook/security/csrf_in_login_form.rst`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ provider available in the Security component:`
`33`	`33`	`# ...`
`34`	`34`	`form_login:`
`35`	`35`	`# ...`
`36`		`-csrf_token_generator:security.csrf.token_manager`
	`36`	`+csrf_provider:security.csrf.token_manager`
`37`	`37`
`38`	`38`	`..code-block::xml`
`39`	`39`
`@@ -50,7 +50,7 @@ provider available in the Security component:`
`50`	`50`
`51`	`51`	`<firewallname="secured_area">`
`52`	`52`	`<!-- ...-->`
`53`		`- <form-logincsrf-token-generator="security.csrf.token_manager" />`
	`53`	`+ <form-logincsrf-provider="security.csrf.token_manager" />`
`54`	`54`	`</firewall>`
`55`	`55`	`</config>`
`56`	`56`	`</srv:container>`
`@@ -66,7 +66,7 @@ provider available in the Security component:`
`66`	`66`	`// ...`
`67`	`67`	`'form_login' => array(`
`68`	`68`	`// ...`
`69`		`- 'csrf_token_generator' => 'security.csrf.token_manager',`
	`69`	`+ 'csrf_provider' => 'security.csrf.token_manager',`
`70`	`70`	`),`
`71`	`71`	`),`
`72`	`72`	`),`
`@@ -124,7 +124,7 @@ After this, you have protected your login form against CSRF attacks.`
`124`	`124`	`..tip::`
`125`	`125`
`126`	`126`	You can change the name of the field by setting ``csrf_parameter`` and change
`127`		- the token ID by setting ``csrf_token_id`` in your configuration:
	`127`	+ the token ID by setting ``intention`` in your configuration:
`128`	`128`
`129`	`129`	`..configuration-block::`
`130`	`130`
`@@ -140,7 +140,7 @@ After this, you have protected your login form against CSRF attacks.`
`140`	`140`	`form_login:`
`141`	`141`	`# ...`
`142`	`142`	`csrf_parameter:_csrf_security_token`
`143`		`-csrf_token_id:a_private_string`
	`143`	`+intention:a_private_string`
`144`	`144`
`145`	`145`	`..code-block::xml`
`146`	`146`
`@@ -158,7 +158,7 @@ After this, you have protected your login form against CSRF attacks.`
`158`	`158`	`<firewallname="secured_area">`
`159`	`159`	`<!-- ...-->`
`160`	`160`	`<form-logincsrf-parameter="_csrf_security_token"`
`161`		`-csrf-token-id="a_private_string"`
	`161`	`+intention="a_private_string"`
`162`	`162`	`/>`
`163`	`163`	`</firewall>`
`164`	`164`	`</config>`
`@@ -176,7 +176,7 @@ After this, you have protected your login form against CSRF attacks.`
`176`	`176`	`'form_login' => array(`
`177`	`177`	`// ...`
`178`	`178`	`'csrf_parameter' => '_csrf_security_token',`
`179`		`- 'csrf_token_id' => 'a_private_string'`
	`179`	`+ 'intention' => 'a_private_string'`
`180`	`180`	`),`
`181`	`181`	`),`
`182`	`182`	`),`

`‎reference/configuration/security.rst`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,8 @@ Each part will be explained in the next section.`
`162`	`162`
`163`	`163`	`# csrf token options`
`164`	`164`	`csrf_parameter:_csrf_token`
`165`		`-csrf_token_id:authenticate`
`166`		`-csrf_token_generator:my.csrf_token_generator.id`
	`165`	`+intention:authenticate`
	`166`	`+csrf_provider:my.csrf_token_generator.id`
`167`	`167`
`168`	`168`	`# by default, the login form must be a POST, not a GET`
`169`	`169`	`post_only:true`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit3d1e8a7

File tree

2 files changed

2 files changed

`‎cookbook/security/csrf_in_login_form.rst`

`‎reference/configuration/security.rst`

0 commit comments