Browse Source

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

Rui Marinho 13 years ago
parent
commit
fc41d4f223

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php

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

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php

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

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml

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

+ 2 - 1
src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml

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