From 3495929bea34478ba516b1562c7f71aa425a20b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Sat, 23 Mar 2013 23:20:23 +0100 Subject: [PATCH 1/4] [Security] Fixed encoder reference --- reference/configuration/security.rst | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index ff1045c0658..05dc47fc0e6 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -56,12 +56,8 @@ Each part will be explained in the next section. iterations: 5000 # Example options/values for what a custom encoder might look like - Acme\Your\Class\Name: - algorithm: ~ - ignore_case: false - encode_as_base64: true - iterations: 5000 - id: ~ + Acme\DemoBundle\Entity\User3: + id: my.encoder.id providers: # Required # Examples: From 29c54c3e9bc97ea1218a508b2d3503765602d68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Sat, 23 Mar 2013 23:25:24 +0100 Subject: [PATCH 2/4] [Security] Fix typo in chain provider entity --- reference/configuration/security.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index 05dc47fc0e6..62ae9504c93 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -78,8 +78,10 @@ Each part will be explained in the next section. # Example custom provider some_custom_provider: id: ~ - chain: - providers: [] + + # Chain some providers + chain: + providers: [ entity, memory ] firewalls: # Required # Examples: From bbfb24e7382eceb6a79e20f89068bf40c6b2cfd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Sat, 23 Mar 2013 23:24:40 +0100 Subject: [PATCH 3/4] [Security] Used more explicit name --- reference/configuration/security.rst | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index 62ae9504c93..c6197b237d5 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -62,26 +62,28 @@ Each part will be explained in the next section. providers: # Required # Examples: memory: - name: memory + name: my_in_memory_provider users: foo: - password: foo - roles: ROLE_USER + password: foo + roles: ROLE_USER bar: - password: bar - roles: [ROLE_USER, ROLE_ADMIN] - entity: + password: bar + roles: [ROLE_USER, ROLE_ADMIN] + + my_entity_provider: entity: - class: SecurityBundle:User - property: username + class: SecurityBundle:User + property: username # Example custom provider - some_custom_provider: + my_some_custom_provider: id: ~ # Chain some providers - chain: - providers: [ entity, memory ] + my_chain_provider: + chain: + providers: [ my_in_memory_provider, my_entity_provider ] firewalls: # Required # Examples: From a3d5856e20e799220771b7a8381a42ba120ecb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Tue, 26 Mar 2013 16:41:28 +0100 Subject: [PATCH 4/4] [Security] Fixed my_in_memory_provider --- reference/configuration/security.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index c6197b237d5..459c8bed10e 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -61,15 +61,15 @@ Each part will be explained in the next section. providers: # Required # Examples: - memory: - name: my_in_memory_provider - users: - foo: - password: foo - roles: ROLE_USER - bar: - password: bar - roles: [ROLE_USER, ROLE_ADMIN] + my_in_memory_provider: + memory: + users: + foo: + password: foo + roles: ROLE_USER + bar: + password: bar + roles: [ROLE_USER, ROLE_ADMIN] my_entity_provider: entity: