moved security related things to a new SecurityBundle (the Security c…

…omponent is left unchanged)
symfony · Jan 26, 2011 · e645090 · e645090
1 parent a367dfc
commit e645090
Show file tree

Hide file tree

Showing 84 changed files with 213 additions and 186 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Bundle\FrameworkBundle;
 
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAuthenticationProvidersPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddFieldFactoryGuessersPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TemplatingPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RegisterKernelListenersPass;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddSecurityVotersPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConverterManagerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RoutingResolverPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
@@ -57,7 +55,6 @@ public function registerExtensions(ContainerBuilder $container)
 
         $container->addScope('request');
 
-        $container->addCompilerPass(new AddSecurityVotersPass());
         $container->addCompilerPass(new ConverterManagerPass());
         $container->addCompilerPass(new RoutingResolverPass());
         $container->addCompilerPass(new ProfilerPass());
@@ -68,7 +65,6 @@ public function registerExtensions(ContainerBuilder $container)
         $container->addCompilerPass(new AddClassesToCachePass());
         $container->addCompilerPass(new TranslatorPass());
         $container->addCompilerPass(new AddCacheWarmerPass());
-        $container->addCompilerPass(new AddAuthenticationProvidersPass());
     }
 
     /**

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -7,7 +7,6 @@
     <parameters>
         <parameter key="data_collector.config.class">Symfony\Bundle\FrameworkBundle\DataCollector\ConfigDataCollector</parameter>
         <parameter key="data_collector.request.class">Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector</parameter>
-        <parameter key="data_collector.security.class">Symfony\Component\HttpKernel\DataCollector\SecurityDataCollector</parameter>
         <parameter key="data_collector.exception.class">Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector</parameter>
         <parameter key="data_collector.events.class">Symfony\Component\HttpKernel\DataCollector\EventDataCollector</parameter>
         <parameter key="data_collector.logger.class">Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector</parameter>
@@ -26,11 +25,6 @@
             <tag name="data_collector" template="WebProfilerBundle:Collector:request" id="request" priority="255" />
         </service>
 
-        <service id="data_collector.security" class="%data_collector.security.class%" public="false">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:security" id="security" priority="255" />
-            <argument type="service" id="security.context" on-invalid="ignore" />
-        </service>
-
         <service id="data_collector.exception" class="%data_collector.exception.class%" public="false">
             <tag name="data_collector" template="WebProfilerBundle:Collector:exception" id="exception" priority="255" />
         </service>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -14,7 +14,6 @@
         <parameter key="templating.helper.session.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper</parameter>
         <parameter key="templating.helper.code.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\CodeHelper</parameter>
         <parameter key="templating.helper.translator.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper</parameter>
-        <parameter key="templating.helper.security.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\SecurityHelper</parameter>
         <parameter key="templating.helper.form.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper</parameter>
     </parameters>
 
@@ -68,11 +67,6 @@
             <argument type="service" id="translator" />
         </service>
 
-        <service id="templating.helper.security" class="%templating.helper.security.class%">
-            <tag name="templating.helper" alias="security" />
-            <argument type="service" id="security.context" on-invalid="ignore" />
-        </service>
-
         <service id="templating.helper.form" class="%templating.helper.form.class%">
             <tag name="templating.helper" alias="form" />
             <argument type="service" id="templating.engine.php" />

diff --git a/...rameworkBundle/Command/InitAclCommand.php → ...SecurityBundle/Command/InitAclCommand.php b/...rameworkBundle/Command/InitAclCommand.php → ...SecurityBundle/Command/InitAclCommand.php
@@ -9,13 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\Command;
+namespace Symfony\Bundle\SecurityBundle\Command;
 
 use Symfony\Component\Security\Acl\Dbal\Schema;
-
-use Doctrine\DBAL\DriverManager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Doctrine\DBAL\DriverManager;
 
 /**
  * Installs the tables required by the ACL system

diff --git a/...l/DataCollector/SecurityDataCollector.php → ...e/DataCollector/SecurityDataCollector.php b/...l/DataCollector/SecurityDataCollector.php → ...e/DataCollector/SecurityDataCollector.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\HttpKernel\DataCollector;
+namespace Symfony\Bundle\SecurityBundle\DataCollector;
 
 use Symfony\Component\Security\SecurityContext;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/...mpiler/AddAuthenticationProvidersPass.php → ...mpiler/AddAuthenticationProvidersPass.php b/...mpiler/AddAuthenticationProvidersPass.php → ...mpiler/AddAuthenticationProvidersPass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

diff --git a/...ection/Compiler/AddSecurityVotersPass.php → ...ection/Compiler/AddSecurityVotersPass.php b/...ection/Compiler/AddSecurityVotersPass.php → ...ection/Compiler/AddSecurityVotersPass.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

diff --git a/...ion/Security/Factory/FormLoginFactory.php → ...ion/Security/Factory/FormLoginFactory.php b/...ion/Security/Factory/FormLoginFactory.php → ...ion/Security/Factory/FormLoginFactory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Security\Factory;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;

diff --git a/...ion/Security/Factory/HttpBasicFactory.php → ...ion/Security/Factory/HttpBasicFactory.php b/...ion/Security/Factory/HttpBasicFactory.php → ...ion/Security/Factory/HttpBasicFactory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Security\Factory;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;

diff --git a/...on/Security/Factory/HttpDigestFactory.php → ...on/Security/Factory/HttpDigestFactory.php b/...on/Security/Factory/HttpDigestFactory.php → ...on/Security/Factory/HttpDigestFactory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Security\Factory;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;

diff --git a/...on/Security/Factory/RememberMeFactory.php → ...on/Security/Factory/RememberMeFactory.php b/...on/Security/Factory/RememberMeFactory.php → ...on/Security/Factory/RememberMeFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Security\Factory;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
 
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Parameter;

diff --git a/...rity/Factory/SecurityFactoryInterface.php → ...rity/Factory/SecurityFactoryInterface.php b/...rity/Factory/SecurityFactoryInterface.php → ...rity/Factory/SecurityFactoryInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Security\Factory;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 

diff --git a/...njection/Security/Factory/X509Factory.php → ...njection/Security/Factory/X509Factory.php b/...njection/Security/Factory/X509Factory.php → ...njection/Security/Factory/X509Factory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Security\Factory;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;

diff --git a/...DependencyInjection/SecurityExtension.php → ...DependencyInjection/SecurityExtension.php b/...DependencyInjection/SecurityExtension.php → ...DependencyInjection/SecurityExtension.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://www.symfony-project.org/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="data_collector.security.class">Symfony\Bundle\SecurityBundle\DataCollector\SecurityDataCollector</parameter>
+    </parameters>
+
+    <services>
+        <service id="data_collector.security" class="%data_collector.security.class%" public="false">
+            <tag name="data_collector" template="SecurityBundle:Collector:security" id="security" priority="255" />
+            <argument type="service" id="security.context" on-invalid="ignore" />
+        </service>
+    </services>
+</container>
diff --git a/...eworkBundle/Resources/config/security.xml → ...urityBundle/Resources/config/security.xml b/...eworkBundle/Resources/config/security.xml → ...urityBundle/Resources/config/security.xml
@@ -28,38 +28,38 @@
 
         <parameter key="security.authentication.manager.class">Symfony\Component\Security\Authentication\AuthenticationProviderManager</parameter>
 
-        <parameter key="security.authentication.retry_entry_point.class">Symfony\Component\HttpKernel\Security\EntryPoint\RetryAuthenticationEntryPoint</parameter>
+        <parameter key="security.authentication.retry_entry_point.class">Symfony\Bundle\SecurityBundle\Security\EntryPoint\RetryAuthenticationEntryPoint</parameter>
 
-        <parameter key="security.authentication.session_strategy.class">Symfony\Component\HttpKernel\Security\Session\SessionAuthenticationStrategy</parameter>
+        <parameter key="security.authentication.session_strategy.class">Symfony\Bundle\SecurityBundle\Security\Session\SessionAuthenticationStrategy</parameter>
         <parameter key="security.authentication.session_strategy.strategy">migrate</parameter>
 
-        <parameter key="security.authentication.form_entry_point.class">Symfony\Component\HttpKernel\Security\EntryPoint\FormAuthenticationEntryPoint</parameter>
-        <parameter key="security.authentication.listener.form.class">Symfony\Component\HttpKernel\Security\Firewall\UsernamePasswordFormAuthenticationListener</parameter>
+        <parameter key="security.authentication.form_entry_point.class">Symfony\Bundle\SecurityBundle\Security\EntryPoint\FormAuthenticationEntryPoint</parameter>
+        <parameter key="security.authentication.listener.form.class">Symfony\Bundle\SecurityBundle\Security\Firewall\UsernamePasswordFormAuthenticationListener</parameter>
         <parameter key="security.authentication.form.options" type="collection" />
 
-        <parameter key="security.authentication.basic_entry_point.class">Symfony\Component\HttpKernel\Security\EntryPoint\BasicAuthenticationEntryPoint</parameter>
+        <parameter key="security.authentication.basic_entry_point.class">Symfony\Bundle\SecurityBundle\Security\EntryPoint\BasicAuthenticationEntryPoint</parameter>
         <parameter key="security.authentication.basic_entry_point.realm">Symfony2</parameter>
 
-        <parameter key="security.authentication.digest_entry_point.class">Symfony\Component\HttpKernel\Security\EntryPoint\DigestAuthenticationEntryPoint</parameter>
+        <parameter key="security.authentication.digest_entry_point.class">Symfony\Bundle\SecurityBundle\Security\EntryPoint\DigestAuthenticationEntryPoint</parameter>
         <parameter key="security.authentication.digest_entry_point.realm">Symfony2</parameter>
         <parameter key="security.authentication.digest_entry_point.key">SomethingUnique</parameter>
 
-        <parameter key="security.authentication.listener.x509.class">Symfony\Component\HttpKernel\Security\Firewall\X509AuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.x509.class">Symfony\Bundle\SecurityBundle\Security\Firewall\X509AuthenticationListener</parameter>
         <parameter key="security.authentication.x509.user">SSL_CLIENT_S_DN_Email</parameter>
         <parameter key="security.authentication.x509.credentials">SSL_CLIENT_S_DN</parameter>
 
-        <parameter key="security.authentication.listener.basic.class">Symfony\Component\HttpKernel\Security\Firewall\BasicAuthenticationListener</parameter>
-        <parameter key="security.authentication.listener.digest.class">Symfony\Component\HttpKernel\Security\Firewall\DigestAuthenticationListener</parameter>
-        <parameter key="security.authentication.listener.anonymous.class">Symfony\Component\HttpKernel\Security\Firewall\AnonymousAuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.basic.class">Symfony\Bundle\SecurityBundle\Security\Firewall\BasicAuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.digest.class">Symfony\Bundle\SecurityBundle\Security\Firewall\DigestAuthenticationListener</parameter>
+        <parameter key="security.authentication.listener.anonymous.class">Symfony\Bundle\SecurityBundle\Security\Firewall\AnonymousAuthenticationListener</parameter>
 
         <parameter key="security.authentication.provider.anonymous">Symfony\Component\Security\Authentication\Provider\AnonymousAuthenticationProvider</parameter>
         <parameter key="security.anonymous.key">SomeRandomValue</parameter>
 
-        <parameter key="security.authentication.listener.rememberme.class">Symfony\Component\HttpKernel\Security\Firewall\RememberMeListener</parameter>
+        <parameter key="security.authentication.listener.rememberme.class">Symfony\Bundle\SecurityBundle\Security\Firewall\RememberMeListener</parameter>
         <parameter key="security.rembemerme.token.provider.in_memory.class">Symfony\Component\Security\Authentication\RememberMe\InMemoryTokenProvider</parameter>
 
-        <parameter key="security.authentication.rememberme.services.persistent.class">Symfony\Component\HttpKernel\Security\RememberMe\PersistentTokenBasedRememberMeServices</parameter>
-        <parameter key="security.authentication.rememberme.services.simplehash.class">Symfony\Component\HttpKernel\Security\RememberMe\TokenBasedRememberMeServices</parameter>
+        <parameter key="security.authentication.rememberme.services.persistent.class">Symfony\Bundle\SecurityBundle\Security\RememberMe\PersistentTokenBasedRememberMeServices</parameter>
+        <parameter key="security.authentication.rememberme.services.simplehash.class">Symfony\Bundle\SecurityBundle\Security\RememberMe\TokenBasedRememberMeServices</parameter>
         <parameter key="security.authentication.rememberme.services.options.name">SYMFONY_REMEMBERME</parameter>
         <parameter key="security.authentication.rememberme.services.options.lifetime">31536000</parameter>
         <parameter key="security.authentication.rememberme.services.options.path">/</parameter>
@@ -69,15 +69,15 @@
         <parameter key="security.authentication.rememberme.services.options.always_remember_me">false</parameter>
         <parameter key="security.authentication.rememberme.services.options.remember_me_parameter">_remember_me</parameter>
 
-        <parameter key="security.channel_listener.class">Symfony\Component\HttpKernel\Security\Firewall\ChannelListener</parameter>
+        <parameter key="security.channel_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\ChannelListener</parameter>
 
-        <parameter key="security.logout_listener.class">Symfony\Component\HttpKernel\Security\Firewall\LogoutListener</parameter>
+        <parameter key="security.logout_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\LogoutListener</parameter>
         <parameter key="security.logout.path">/logout</parameter>
         <parameter key="security.logout.target_path">/</parameter>
-        <parameter key="security.logout.handler.session.class">Symfony\Component\HttpKernel\Security\Logout\SessionLogoutHandler</parameter>
-        <parameter key="security.logout.handler.cookie_clearing.class">Symfony\Component\HttpKernel\Security\Logout\CookieClearingLogoutHandler</parameter>
+        <parameter key="security.logout.handler.session.class">Symfony\Bundle\SecurityBundle\Security\Logout\SessionLogoutHandler</parameter>
+        <parameter key="security.logout.handler.cookie_clearing.class">Symfony\Bundle\SecurityBundle\Security\Logout\CookieClearingLogoutHandler</parameter>
 
-        <parameter key="security.authentication.switchuser_listener.class">Symfony\Component\HttpKernel\Security\Firewall\SwitchUserListener</parameter>
+        <parameter key="security.authentication.switchuser_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\SwitchUserListener</parameter>
         <parameter key="security.authentication.switchuser.role">ROLE_ALLOWED_TO_SWITCH</parameter>
         <parameter key="security.authentication.switchuser.parameter">_switch_user</parameter>
 
@@ -92,13 +92,13 @@
         <parameter key="security.access.authenticated_voter.class">Symfony\Component\Security\Authorization\Voter\AuthenticatedVoter</parameter>
         <parameter key="security.access.role_hierarchy_voter.class">Symfony\Component\Security\Authorization\Voter\RoleHierarchyVoter</parameter>
 
-        <parameter key="security.access_listener.class">Symfony\Component\HttpKernel\Security\Firewall\AccessListener</parameter>
-        <parameter key="security.access_map.class">Symfony\Component\HttpKernel\Security\AccessMap</parameter>
-        <parameter key="security.exception_listener.class">Symfony\Component\HttpKernel\Security\Firewall\ExceptionListener</parameter>
-        <parameter key="security.context_listener.class">Symfony\Component\HttpKernel\Security\Firewall\ContextListener</parameter>
-        <parameter key="security.firewall.class">Symfony\Component\HttpKernel\Security\Firewall</parameter>
-        <parameter key="security.firewall.map.class">Symfony\Bundle\FrameworkBundle\Security\FirewallMap</parameter>
-        <parameter key="security.firewall.context.class">Symfony\Bundle\FrameworkBundle\Security\FirewallContext</parameter>
+        <parameter key="security.access_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\AccessListener</parameter>
+        <parameter key="security.access_map.class">Symfony\Bundle\SecurityBundle\Security\AccessMap</parameter>
+        <parameter key="security.exception_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\ExceptionListener</parameter>
+        <parameter key="security.context_listener.class">Symfony\Bundle\SecurityBundle\Security\Firewall\ContextListener</parameter>
+        <parameter key="security.firewall.class">Symfony\Bundle\SecurityBundle\Security\Firewall</parameter>
+        <parameter key="security.firewall.map.class">Symfony\Bundle\SecurityBundle\Security\FirewallMap</parameter>
+        <parameter key="security.firewall.context.class">Symfony\Bundle\SecurityBundle\Security\FirewallContext</parameter>
         <parameter key="security.matcher.class">Symfony\Component\HttpFoundation\RequestMatcher</parameter>
 
         <parameter key="security.role_hierarchy.class">Symfony\Component\Security\Role\RoleHierarchy</parameter>

diff --git a/...kBundle/Resources/config/security_acl.xml → ...yBundle/Resources/config/security_acl.xml b/...kBundle/Resources/config/security_acl.xml → ...yBundle/Resources/config/security_acl.xml