added DBAL default implementation of Symfony\Component\Security\Http\…

…Session\SessionRegistryStorageInterface
symfony · paschke · May 4, 2011 · May 5, 2011 · May 5, 2011 · May 5, 2011
commit bc182f9c0670a9e262f3e8e8d3814cd7f58dc65f
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitConcurrentSessionsCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitConcurrentSessionsCommand.php
@@ -11,18 +11,17 @@

 namespace Symfony\Bundle\SecurityBundle\Command;

+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Security\Http\Session\Dbal\Schema;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\Output;
-use Doctrine\ORM\Tools\Console\Command\SchemaTool\CreateCommand;
-use Symfony\Bundle\DoctrineBundle\Command\Proxy\DoctrineCommandHelper;

 /**
 * Installs the database schema required by the concurrent session Doctrine implementation
 *
 * @author Stefan Paschke <stefan.paschke@gmail.com>
 */
-class InitConcurrentSessionsCommand extends CreateCommand
+class InitConcurrentSessionsCommand extends ContainerAwareCommand
 {
    /**
     * @see Command
@@ -33,7 +32,7 @@ protected function configure()

        $this
            ->setName('init:concurrent-session')
-            ->setDescription('Executes the SQL needed to generate the database schema reqired by the concurrent sessions feature.')
+            ->setDescription('Executes the SQL needed to generate the database schema required by the concurrent sessions feature.')
            ->setHelp(<<<EOT
 The <info>init:concurrent-session</info> command executes the SQL needed to
 generate the database schema required by the concurrent session Doctrine implementation:
@@ -52,8 +51,26 @@ protected function configure()
     */
    protected function execute(InputInterface $input, OutputInterface $output)
    {
-        DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), 'security');
+        $connection = $this->getContainer()->get('security.session_registry.dbal.connection');
+        $sm = $connection->getSchemaManager();
+        $tableNames = $sm->listTableNames();
+        $tables = array(
+            'session_information_table_name' => $this->getContainer()->getParameter('security.session_registry.dbal.session_information_table_name'),
+        );
+
+        foreach ($tables as $table) {
+            if (in_array($table, $tableNames, true)) {
+                $output->writeln(sprintf('The table "%s" already exists. Aborting.', $table));
+
+                return;
+            }
+        }
+
+        $schema = new Schema($tables);
+        foreach ($schema->toSql($connection->getDatabasePlatform()) as $sql) {
+            $connection->exec($sql);
+        }

-        parent::execute($input, $output);
+        $output->writeln('concurrent session tables have been initialized successfully.');
    }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -79,10 +79,30 @@ public function getConfigTreeBuilder()
        $this->addFirewallsSection($rootNode, $this->factories);
        $this->addAccessControlSection($rootNode);
        $this->addRoleHierarchySection($rootNode);
+        $this->addSessionRegistrySection($rootNode);

        return $tb;
    }

+    private function addSessionRegistrySection(ArrayNodeDefinition $rootNode)
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('session_registry')
+                    ->children()
+                        ->scalarNode('connection')->end()
+                        ->arrayNode('tables')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->scalarNode('session_information')->defaultValue('cs_session_information')->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+
    private function addAclSection(ArrayNodeDefinition $rootNode)
    {
        $rootNode

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -62,6 +62,10 @@ public function load(array $configs, ContainerBuilder $container)
        $loader->load('templating_twig.xml');
        $loader->load('collectors.xml');

+        if (isset($config['session_registry'])) {
+            $this->sessionRegistryLoad($config['session_registry'], $container);
+        }
+
        // set some global scalars
        $container->setParameter('security.access.denied_url', $config['access_denied_url']);
        $container->setParameter('security.authentication.manager.erase_credentials', $config['erase_credentials']);
@@ -158,6 +162,31 @@ private function configureDbalAclProvider(array $config, ContainerBuilder $conta
        $container->setParameter('security.acl.dbal.sid_table_name', $config['tables']['security_identity']);
    }

+    private function sessionRegistryLoad($config, ContainerBuilder $container)
+    {
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('security_session_registry.xml');
+
+        if (isset($config['session_registry_storage'])) {
+            // FIXME: define custom session registry storage
+
+            return;
+        }
+
+        $this->configureDbalSessionRegistryStorage($config, $container, $loader);
+    }
+
+    private function configureDbalSessionRegistryStorage($config, ContainerBuilder $container, $loader)
+    {
+        $loader->load('security_session_registry_dbal.xml');
+
+        if (isset($config['connection'])) {
+            $container->setAlias('security.session_registry.dbal.connection', sprintf('doctrine.dbal.%s_connection', $config['connection']));
+        }
+
+        $container->setParameter('security.session_registry.dbal.session_information_table_name', $config['tables']['session_information']);
+    }
+
    /**
     * Loads the web configuration.
     *

diff --git a/src/Symfony/Bundle/SecurityBundle/Doctrine/DoctrineSessionInformation.php b/src/Symfony/Bundle/SecurityBundle/Doctrine/DoctrineSessionInformation.php
diff --git a/src/Symfony/Bundle/SecurityBundle/Doctrine/DoctrineSessionRegistryStorage.php b/src/Symfony/Bundle/SecurityBundle/Doctrine/DoctrineSessionRegistryStorage.php
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -24,10 +24,6 @@
        <parameter key="security.authentication.manager.class">Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager</parameter>

        <parameter key="security.authentication.session_strategy.class">Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy</parameter>
-        <parameter key="security.authentication.concurrent_session_strategy.class">Symfony\Component\Security\Http\Session\ConcurrentSessionControlStrategy</parameter>
-        <parameter key="security.authentication.session_registry.class">Symfony\Component\Security\Http\Session\SessionRegistry</parameter>
-        <parameter key="security.authentication.session_registry_storage.class">Symfony\Bundle\SecurityBundle\Doctrine\DoctrineSessionRegistryStorage</parameter>
-        <parameter key="security.authentication.session_information.class">Symfony\Bundle\SecurityBundle\Doctrine\DoctrineSessionInformation</parameter>

        <parameter key="security.access.decision_manager.class">Symfony\Component\Security\Core\Authorization\AccessDecisionManager</parameter>

@@ -72,21 +68,6 @@
            <argument>%security.authentication.session_strategy.strategy%</argument>
        </service>

-        <service id="security.authentication.concurrent_session_strategy" class="%security.authentication.concurrent_session_strategy.class%" public="false">
-            <argument type="service" id="security.authentication.session_registry" />
-            <argument /> <!-- maximum Sessions -->
-            <argument /> <!-- Strategy -->
-        </service>
-
-        <service id="security.authentication.session_registry" class="%security.authentication.session_registry.class%" public="false">
-            <argument type="service" id="security.authentication.session_registry_storage" />
-            <argument>%security.authentication.session_information.class%</argument>
-        </service>
-
-        <service id="security.authentication.session_registry_storage" class="%security.authentication.session_registry_storage.class%" public="true">
-            <argument type="service" id="doctrine.orm.security_entity_manager" />
-        </service>
-
        <service id="security.encoder_factory.generic" class="%security.encoder_factory.generic.class%" public="false">
            <argument type="collection"></argument>
        </service>

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_session_registry.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_session_registry.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="security.authentication.concurrent_session_strategy.class">Symfony\Component\Security\Http\Session\ConcurrentSessionControlStrategy</parameter>
+        <parameter key="security.authentication.session_registry.class">Symfony\Component\Security\Http\Session\SessionRegistry</parameter>
+        <parameter key="security.authentication.session_information.class">Symfony\Component\Security\Http\Session\SessionInformation</parameter>
+    </parameters>
+
+    <services>
+        <service id="security.authentication.concurrent_session_strategy" class="%security.authentication.concurrent_session_strategy.class%" public="false">
+            <argument type="service" id="security.authentication.session_registry" />
+            <argument /> <!-- maximum Sessions -->
+            <argument /> <!-- Strategy -->
+        </service>
+
+        <service id="security.authentication.session_registry" class="%security.authentication.session_registry.class%" public="false">
+            <argument type="service" id="security.authentication.session_registry_storage" />
+            <argument>%security.authentication.session_information.class%</argument>
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_session_registry_dbal.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_session_registry_dbal.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="security.authentication.session_registry_storage.class">Symfony\Component\Security\Http\Session\Dbal\SessionRegistryStorage</parameter>
+        <parameter key="security.authentication.session_information.class">Symfony\Component\Security\Http\Session\Dbal\DbalSessionInformation</parameter>
+    </parameters>
+
+    <services>
+        <service id="security.session_registry.dbal.connection" alias="database_connection" />
+
+
+        <service id="security.authentication.session_registry_storage" class="%security.authentication.session_registry_storage.class%" public="true">
+            <argument type="service" id="security.session_registry.dbal.connection" />
+            <argument type="collection">
+                <argument key="session_information_table_name">%security.session_registry.dbal.session_information_table_name%</argument>
+                <argument key="session_information_class_name">%security.authentication.session_information.class%</argument>
+            </argument>
+        </service>
+
+    </services>
+</container>
diff --git a/src/Symfony/Component/Security/Http/Session/Dbal/DbalSessionInformation.php b/src/Symfony/Component/Security/Http/Session/Dbal/DbalSessionInformation.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\Session\Dbal;
+
+use Symfony\Component\Security\Http\Session\SessionInformation;
+
+/**
+ * DbalSessionInformation.
+ *
+ * Allows to persist SessionInformation using Doctrine DBAL.
+ *
+ * @author Stefan Paschke <stefan.paschke@gmail.com>
+ */
+class DbalSessionInformation extends SessionInformation
+{
+    public function __construct($sessionId, $username, \DateTime $lastRequest = null, \DateTime $expired = null)
+    {
+        parent::__construct($sessionId, $username);
+
+        if (null !== $lastRequest) {
+            $this->setLastRequest($lastRequest);
+        }
+
+        if (null !== $expired) {
+            $this->setExpired($expired);
+        }
+    }
+}