merged branch ruimarinho/http_digest (PR #3781)

Commits
-------

fc41d4f [Security] [HttpDigest] Fixes a configuration error caused by an invalid 'key' child node configuration

Discussion
----------

[Security] [HttpDigest] Fixes a configuration error caused by an invalid "key" child node configuration

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: ![Build status](https://secure.travis-ci.org/ruimarinho/symfony.png?branch=http_digest)
This commit is contained in:
Fabien Potencier 2012-04-06 14:14:53 +02:00
commit c140386957
4 changed files with 5 additions and 4 deletions

View File

@ -62,7 +62,7 @@ class HttpDigestFactory implements SecurityFactoryInterface
->children()
->scalarNode('provider')->end()
->scalarNode('realm')->defaultValue('Secured Area')->end()
->scalarNode('key')->cannotBeEmpty()->end()
->scalarNode('key')->isRequired()->cannotBeEmpty()->end()
->end()
;
}

View File

@ -48,7 +48,7 @@ $container->loadFromExtension('security', array(
'simple' => array('pattern' => '/login', 'security' => false),
'secure' => array('stateless' => true,
'http_basic' => true,
'http_digest' => true,
'http_digest' => array('key' => 'TheKey'),
'form_login' => true,
'anonymous' => true,
'switch_user' => true,

View File

@ -41,7 +41,7 @@
<firewall name="secure" stateless="true">
<http-basic />
<http-digest />
<http-digest key="TheKey" />
<form-login />
<anonymous />
<switch-user />

View File

@ -35,7 +35,8 @@ security:
secure:
stateless: true
http_basic: true
http_digest: true
http_digest:
key: TheKey
form_login: true
anonymous: true
switch_user: true