8000 [security] Making more changes due to the memory and chain provider c… · DavidChristmann/symfony-docs@b0d9f65 · GitHub
Skip to content

Commit b0d9f65

Browse files
weaverryanweaverryan
committed
[security] Making more changes due to the memory and chain provider configuration changes in 2.1
1 parent 732da1d commit b0d9f65

File tree

3 files changed

+62
-39
lines changed

3 files changed

+62
-39
lines changed

‎book/security.rst

Lines changed: 48 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -897,18 +897,21 @@ In fact, you've seen this already in the example in this chapter.
897897
# ...
898898
providers:
899899
default_provider:
900-
users:
901-
ryan: { password: ryanpass, roles: 'ROLE_USER' }
902-
admin: { password: kitten, roles: 'ROLE_ADMIN' }
900+
memory:
901+
users:
902+
ryan: { password: ryanpass, roles: 'ROLE_USER' }
903+
admin: { password: kitten, roles: 'ROLE_ADMIN' }
903904
904905
.. code-block:: xml
905906
906907
<!-- app/config/config.xml -->
907908
<config>
908909
<!-- ... -->
909910
<provider name="default_provider">
910-
<user name="ryan" password="ryanpass" roles="ROLE_USER" />
911-
<user name="admin" password="kitten" roles="ROLE_ADMIN" />
911+
<memory>
912+
<user name="ryan" password="ryanpass" roles="ROLE_USER" />
913+
<user name="admin" password="kitten" roles="ROLE_ADMIN" />
914+
</memory>
912915
</provider>
913916
</config>
914917
@@ -919,9 +922,11 @@ In fact, you've seen this already in the example in this chapter.
919922
// ...
920923
'providers' => array(
921924
'default_provider' => array(
922-
'users' => array(
923-
'ryan' => array('password' => 'ryanpass', 'roles' => 'ROLE_USER'),
924-
'admin' => array('password' => 'kitten', 'roles' => 'ROLE_ADMIN'),
925+
'memory' => array(
926+
'users' => array(
927+
'ryan' => array('password' => 'ryanpass', 'roles' => 'ROLE_USER'),
928+
'admin' => array('password' => 'kitten', 'roles' => 'ROLE_ADMIN'),
929+
),
925930
),
926931
),
927932
),
@@ -1064,9 +1069,10 @@ do the following:
10641069
# ...
10651070
providers:
10661071
in_memory:
1067-
users:
1068-
ryan: { password: bb87a29949f3a1ee0559f8a57357487151281386, roles: 'ROLE_USER' }
1069-
admin: { password: 74913f5cd5f61ec0bcfdb775414c2fb3d161b620, roles: 'ROLE_ADMIN' }
1072+
memory:
1073+
users:
1074+
ryan: { password: bb87a29949f3a1ee0559f8a57357487151281386, roles: 'ROLE_USER' }
1075+
admin: { password: 74913f5cd5f61ec0bcfdb775414c2fb3d161b620, roles: 'ROLE_ADMIN' }
10701076
10711077
encoders:
10721078
Symfony\Component\Security\Core\User\User:
@@ -1080,8 +1086,10 @@ do the following:
10801086
<config>
10811087
<!-- ... -->
10821088
<provider name="in_memory">
1083-
<user name="ryan" password="bb87a29949f3a1ee0559f8a57357487151281386" roles="ROLE_USER" />
1084-
<user name="admin" password="74913f5cd5f61ec0bcfdb775414c2fb3d161b620" roles="ROLE_ADMIN" />
1089+
<memory>
1090+
<user name="ryan" password="bb87a29949f3a1ee0559f8a57357487151281386" roles="ROLE_USER" />
1091+
<user name="admin" password="74913f5cd5f61ec0bcfdb775414c2fb3d161b620" roles="ROLE_ADMIN" />
1092+
</memory>
10851093
</provider>
10861094
10871095
<encoder class="Symfony\Component\Security\Core\User\User" algorithm="sha1" iterations="1" encode_as_base64="false" />
@@ -1094,9 +1102,11 @@ do the following:
10941102
// ...
10951103
'providers' => array(
10961104
'in_memory' => array(
1097-
'users' => array(
1098-
'ryan' => array('password' => 'bb87a29949f3a1ee0559f8a57357487151281386', 'roles' => 'ROLE_USER'),
1099-
'admin' => array('password' => '74913f5cd5f61ec0bcfdb775414c2fb3d161b620', 'roles' => 'ROLE_ADMIN'),
1105+
'memory' => array(
1106+
'users' => array(
1107+
'ryan' => array('password' => 'bb87a29949f3a1ee0559f8a57357487151281386', 'roles' => 'ROLE_USER'),
1108+
'admin' => array('password' => '74913f5cd5f61ec0bcfdb775414c2fb3d161b620', 'roles' => 'ROLE_ADMIN'),
1109+
),
11001110
),
11011111
),
11021112
),
@@ -1220,7 +1230,8 @@ a new provider that chains the two together:
12201230
security:
12211231
providers:
12221232
chain_provider:
1223-
providers: [in_memory, user_db]
1233+
chain:
1234+
providers: [in_memory, user_db]
12241235
in_memory:
12251236
users:
12261237
foo: { password: test }
@@ -1232,8 +1243,10 @@ a new provider that chains the two together:
12321243
<!-- app/config/config.xml -->
12331244
<config>
12341245
<provider name="chain_provider">
1235-
<provider>in_memory</provider>
1236-
<provider>user_db</provider>
1246+
<chain>
1247+
<provider>in_memory</provider>
1248+
<provider>user_db</provider>
1249+
</chain>
12371250
</provider>
12381251
<provider name="in_memory">
12391252
<user name="foo" password="test" />
@@ -1249,7 +1262,9 @@ a new provider that chains the two together:
12491262
$container->loadFromExtension('security', array(
12501263
'providers' => array(
12511264
'chain_provider' => array(
1252-
'providers' => array('in_memory', 'user_db'),
1265+
'chain' => array(
1266+
'providers' => array('in_memory', 'user_db'),
1267+
),
12531268
),
12541269
'in_memory' => array(
12551270
'users' => array(
@@ -1280,16 +1295,21 @@ the user from both the ``in_memory`` and ``user_db`` providers.
12801295
security:
12811296
providers:
12821297
main_provider:
1283-
users:
1284-
foo: { password: test }
1285-
entity: { class: Acme\UserBundle\Entity\User, property: username }
1298+
memory:
1299+
users:
1300+
foo: { password: test }
1301+
entity:
1302+
class: Acme\UserBundle\Entity\User,
1303+
property: username
12861304
12871305
.. code-block:: xml
12881306
12891307
<!-- app/config/config.xml -->
12901308
<config>
12911309
<provider name=="main_provider">
1292-
<user name="foo" password="test" />
1310+
<memory>
1311+
<user name="foo" password="test" />
1312+
</memory>
12931313
<entity class="Acme\UserBundle\Entity\User" property="username" />
12941314
</provider>
12951315
</config>
@@ -1300,8 +1320,10 @@ the user from both the ``in_memory`` and ``user_db`` providers.
13001320
$container->loadFromExtension('security', array(
13011321
'providers' => array(
13021322
'main_provider' => array(
1303-
'users' => array(
1304-
'foo' => array('password' => 'test'),
1323+
'memory' => array(
1324+
'users' => array(
1325+
'foo' => array('password' => 'test'),
1326+
),
13051327
),
13061328
'entity' => array('class' => 'Acme\UserBundle\Entity\User', 'property' => 'username'),
13071329
),

‎quick_tour/the_controller.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,10 @@ fits most common needs:
160160
161161
providers:
162162
in_memory:
163-
users:
164-
user: { password: userpass, roles: [ 'ROLE_USER' ] }
165-
admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] }
163+
memory:
164+
users:
165+
user: { password: userpass, roles: [ 'ROLE_USER' ] }
166+
admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] }
166167
167168
firewalls:
168169
dev:

‎reference/configuration/security.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ Each part will be explained in the next section.
6161
id: my.custom.encoder.service.id
6262
6363
providers:
64-
memory:
65-
name: memory
66-
users:
67-
foo: { password: foo, roles: ROLE_USER }
68-
bar: { password: bar, roles: [ROLE_USER, ROLE_ADMIN] }
69-
entity:
64+
memory_provider_name:
65+
memory:
66+
users:
67+
foo: { password: foo, roles: ROLE_USER }
68+
bar: { password: bar, roles: [ROLE_USER, ROLE_ADMIN] }
69+
entity_provider_name:
7070
entity: { class: SecurityBundle:User, property: username }
7171
7272
factories:
@@ -79,15 +79,15 @@ Each part will be explained in the next section.
7979
access_denied_url: /foo/error403
8080
access_denied_handler: some.service.id
8181
entry_point: some.service.id
82-
provider: name
82+
provider: some_provider_key_from_above
8383
context: name
8484
stateless: false
8585
x509:
86-
provider: name
86+
provider: some_provider_key_from_above
8787
http_basic:
88-
provider: name
88+
provider: some_provider_key_from_above
8989
http_digest:
90-
provider: name
90+
provider: some_provider_key_from_above
9191
form_login:
9292
check_path: /login_check
9393
login_path: /login

0 commit comments

Comments
 (0)
0