Merge remote branch 'schmittjoh/security'

fabpot · fabpot · commit 33b47b22db82 · 2011-06-04T13:52:18.000+02:00
* schmittjoh/security:
  [SecurityBundle] exposed setting in the configuration
  [Security/Http] removed irrelevant code
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -56,6 +56,7 @@ public function getConfigTreeBuilder()
             ->children()
                 ->scalarNode('access_denied_url')->defaultNull()->end()
                 ->scalarNode('session_fixation_strategy')->cannotBeEmpty()->defaultValue('migrate')->end()
+                ->booleanNode('hide_user_not_found')->defaultTrue()->end()
                 ->booleanNode('always_authenticate_before_granting')->defaultFalse()->end()
                 ->arrayNode('access_decision_manager')
                     ->addDefaultsIfNotSet()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -74,6 +74,7 @@ public function load(array $configs, ContainerBuilder $container)
             ->addArgument($config['access_decision_manager']['allow_if_equal_granted_denied'])
         ;
         $container->setParameter('security.access.always_authenticate_before_granting', $config['always_authenticate_before_granting']);
+        $container->setParameter('security.authentication.hide_user_not_found', $config['hide_user_not_found']);
 
         $this->createFirewalls($config, $container);
         $this->createAuthorization($config, $container);
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -141,6 +141,7 @@
             <argument type="service" id="security.user_checker" />
             <argument /> <!-- Provider-shared Key -->
             <argument type="service" id="security.encoder_factory" />
+            <argument>%security.authentication.hide_user_not_found%</argument>
         </service>
 
         <service id="security.authentication.provider.pre_authenticated" class="%security.authentication.provider.pre_authenticated.class%" abstract="true" public="false">
diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
@@ -140,8 +140,6 @@ public function onCoreException(GetResponseForExceptionEvent $event)
 
     private function startAuthentication(Request $request, AuthenticationException $authException)
     {
-        $this->context->setToken(null);
-
         if (null === $this->authenticationEntryPoint) {
             throw $authException;
         }

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public function load(array $configs, ContainerBuilder $container)`
`74`	`74`	`->addArgument($config['access_decision_manager']['allow_if_equal_granted_denied'])`
`75`	`75`	`;`
`76`	`76`	`$container->setParameter('security.access.always_authenticate_before_granting', $config['always_authenticate_before_granting']);`
	`77`	`+ $container->setParameter('security.authentication.hide_user_not_found', $config['hide_user_not_found']);`
`77`	`78`
`78`	`79`	`$this->createFirewalls($config, $container);`
`79`	`80`	`$this->createAuthorization($config, $container);`
Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,6 @@ public function onCoreException(GetResponseForExceptionEvent $event)`
`140`	`140`
`141`	`141`	`private function startAuthentication(Request $request, AuthenticationException $authException)`
`142`	`142`	`{`
`143`		`- $this->context->setToken(null);`
`144`		`-`
`145`	`143`	`if (null === $this->authenticationEntryPoint) {`
`146`	`144`	`throw $authException;`
`147`	`145`	`}`