symfony · paschke · May 4, 2011 · May 5, 2011 · May 5, 2011 · May 5, 2011
diff --git a/src/Symfony/Bridge/Doctrine/Security/SessionRegistry/Schema.php b/src/Symfony/Bridge/Doctrine/Security/SessionRegistry/Schema.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Security\SessionRegistry;
+
+use Doctrine\DBAL\Schema\Schema as BaseSchema;
+
+/**
+ * The schema used for the ACL system.
+ *
+ * @author Stefan Paschke <stefan.paschke@gmail.com>
+ */
+final class Schema extends BaseSchema
+{
+    /**
+     * Constructor
+     *
+     * @param array $options the names for tables
+     */
+    public function __construct(array $options)
+    {
+        parent::__construct();
+
+        $this->addSessionInformationTable($options);
+    }
+
+    /**
+     * Adds the session_information table to the schema
+     */
+    protected function addSessionInformationTable(array $options)
+    {
+        $table = $this->createTable($options['session_information_table_name']);
+        $table->addColumn('session_id', 'string');
+        $table->addColumn('username', 'string');
+        $table->addColumn('expired', 'datetime', array('unsigned' => true, 'notnull' => false));
+        $table->addColumn('last_request', 'datetime', array('unsigned' => true, 'notnull' => false));
+        $table->setPrimaryKey(array('session_id'));
+        $table->addUniqueIndex(array('session_id'));
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Security/SessionRegistry/SessionInformation.php b/src/Symfony/Bridge/Doctrine/Security/SessionRegistry/SessionInformation.php
@@ -0,0 +1,42 @@
+<?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\Bridge\Doctrine\Security\SessionRegistry;
+
+use Symfony\Component\Security\Http\Session\SessionInformation as BaseSessionInformation;
+
+/**
+ * SessionInformation.
+ *
+ * Allows to persist SessionInformation using Doctrine DBAL.
+ *
+ * @author Stefan Paschke <stefan.paschke@gmail.com>
+ */
+class SessionInformation extends BaseSessionInformation
+{
+    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);
+        }
+    }
+
+    public function getExpired()
+    {
+        return parent::getExpired();
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Security/SessionRegistry/SessionRegistryStorage.php b/src/Symfony/Bridge/Doctrine/Security/SessionRegistry/SessionRegistryStorage.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Symfony\Bridge\Doctrine\Security\SessionRegistry;
+
+use Doctrine\DBAL\Driver\Connection;
+use Symfony\Component\Security\Http\Session\SessionInformation;
+use Symfony\Component\Security\Http\Session\SessionRegistryStorageInterface;
+
+class SessionRegistryStorage implements SessionRegistryStorageInterface
+{
+    protected $connection;
+    protected $options;
+
+    public function __construct(Connection $connection, array $options)
+    {
+        $this->connection   = $connection;
+        $this->options      = $options;
+    }
+
+    /**
+     * not implemented
+     */
+    public function getUsers()
+    {
+        throw new \BadMethodCallException("Not implemented.");
+    }
+
+    /**
+     * Obtains the maintained information for one session.
+     *
+     * @param string $sessionId the session identifier key.
+     * @return SessionInformation a SessionInformation object.
+     */
+    public function getSessionInformation($sessionId)
+    {
+        $statement = $this->connection->executeQuery(
+            'SELECT * FROM '.$this->options['session_information_table_name'].' WHERE session_id = :session_id',
+            array('session_id' => $sessionId)
+        );
+
+        $data = $statement->fetch(\PDO::FETCH_ASSOC);
+
+        return $data ? $this->instantiateSessionInformationFromResultSet($data) : null;
+    }
+
+    /**
+     * Obtains the maintained information for one user.
+     *
+     * @param string $username The user identifier.
+     * @param boolean $includeExpiredSessions.
+     * @return array An array of SessionInformation objects.
+     */
+    public function getSessionInformations($username, $includeExpiredSessions = false)
+    {
+        $sessionInformations = array();
+
+        $statement = $this->connection->executeQuery(
+            'SELECT *
+                FROM '.$this->options['session_information_table_name'].'
+                WHERE username = :username'.($includeExpiredSessions ? '' : ' AND expired IS NULL ').'
+                ORDER BY last_request DESC',
+            array('username' => $username)
+        );
+
+        while ($data = $statement->fetch(\PDO::FETCH_ASSOC))
+        {
+            $sessionInformations[] = $this->instantiateSessionInformationFromResultSet($data);
+        }
+
+        return $sessionInformations;
+    }
+
+    /**
+     * Adds information for one session.
+     *
+     * @param string $sessionId the session identifier key.
+     * @param SessionInformation a SessionInformation object.
+     */
+    public function setSessionInformation(SessionInformation $sessionInformation)
+    {
+        $statement = $this->connection->prepare(
+            'INSERT INTO '.$this->options['session_information_table_name'].'
+                (session_id, username, last_request, expired) VALUES(:session_id, :username, :last_request, :expired)
+            ON DUPLICATE KEY
+                UPDATE username=:username, last_request=:last_request, expired=:expired');
+
+        $statement->bindValue('session_id', $sessionInformation->getSessionId());
+        $statement->bindValue('username', $sessionInformation->getUsername());
+        $statement->bindValue('last_request', $sessionInformation->getLastRequest(), 'datetime');
+        $statement->bindValue('expired', $sessionInformation->getExpired(), 'datetime');
+        $statement->execute();
+    }
+
+    /**
+     * Deletes the maintained information of one session.
+     *
+     * @param string $sessionId the session identifier key.
+     */
+    public function removeSessionInformation($sessionId)
+    {
+        $this->connection->delete($this->options['session_information_table_name'], array('session_id' => $sessionId));
+    }
+
+    private function instantiateSessionInformationFromResultSet($data)
+    {
+        return new $this->options['session_information_class_name'](
+            $data['session_id'],
+            $data['username'],
+            (null == $data['last_request']) ? null : new \DateTime($data['last_request']),
+            (null == $data['expired']) ? null : new \DateTime($data['expired'])
+        );
+    }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitConcurrentSessionsCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitConcurrentSessionsCommand.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\Command;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Bridge\Doctrine\Security\SessionRegistry\Schema;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Installs the database schema required by the concurrent session Doctrine implementation
+ *
+ * @author Stefan Paschke <stefan.paschke@gmail.com>
+ */
+class InitConcurrentSessionsCommand extends ContainerAwareCommand
+{
+    /**
+     * @see Command
+     */
+    protected function configure()
+    {
+        parent::configure();
+
+        $this
+            ->setName('init:concurrent-session')
+            ->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:
+
+<info>./app/console init:concurrent-session</info>
+
+You can also output the SQL instead of executing it:
+
+<info>./app/console init:concurrent-session --dump-sql</info>
+EOT
+        );
+    }
+
+    /**
+     * @see Command
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $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);
+        }
+
+        $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,31 @@ 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()
+                        ->scalarNode('session_registry_storage')->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+
     private function addAclSection(ArrayNodeDefinition $rootNode)
     {
         $rootNode
@@ -248,6 +269,13 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     ->scalarNode('role')->defaultValue('ROLE_ALLOWED_TO_SWITCH')->end()
                 ->end()
             ->end()
+            ->arrayNode('session_concurrency')
+                ->canBeUnset()
+                ->children()
+                    ->scalarNode('max_sessions')->defaultNull()->end()
+                    ->scalarNode('expiration_url')->defaultValue('/')->end()
+                ->end()
+            ->end()
         ;
 
         $abstractFactoryKeys = array();

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -38,13 +38,13 @@ abstract class AbstractFactory implements SecurityFactoryInterface
         'failure_forward'                => false,
     );
 
-    public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId)
+    public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId, $sessionStrategy)
     {
         // authentication provider
         $authProviderId = $this->createAuthProvider($container, $id, $config, $userProviderId);
 
         // authentication listener
-        $listenerId = $this->createListener($container, $id, $config, $userProviderId);
+        $listenerId = $this->createListener($container, $id, $config, $userProviderId, $sessionStrategy);
 
         // add remember-me aware tag if requested
         if ($this->isRememberMeAware($config)) {
@@ -144,10 +144,11 @@ protected function isRememberMeAware($config)
         return $config['remember_me'];
     }
 
-    protected function createListener($container, $id, $config, $userProvider)
+    protected function createListener($container, $id, $config, $userProvider, $sessionStrategy)
     {
         $listenerId = $this->getListenerId();
         $listener = new DefinitionDecorator($listenerId);
+        $listener->replaceArgument(2, $sessionStrategy);
         $listener->replaceArgument(4, $id);
         $listener->replaceArgument(5, array_intersect_key($config, $this->options));
 

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php
@@ -71,9 +71,9 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
         return $provider;
     }
 
-    protected function createListener($container, $id, $config, $userProvider)
+    protected function createListener($container, $id, $config, $userProvider, $sessionStrategy)
     {
-        $listenerId = parent::createListener($container, $id, $config, $userProvider);
+        $listenerId = parent::createListener($container, $id, $config, $userProvider, $sessionStrategy);
 
         if (isset($config['csrf_provider'])) {
             $container

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
@@ -24,7 +24,7 @@
  */
 class HttpBasicFactory implements SecurityFactoryInterface
 {
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint, $sessionStrategy)
     {
         $provider = 'security.authentication.provider.dao.'.$id;
         $container

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
@@ -24,7 +24,7 @@
  */
 class HttpDigestFactory implements SecurityFactoryInterface
 {
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint, $sessionStrategy)
     {
         $provider = 'security.authentication.provider.dao.'.$id;
         $container

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -29,7 +29,7 @@ class RememberMeFactory implements SecurityFactoryInterface
         'remember_me_parameter' => '_remember_me',
     );
 
-    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
+    public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint, $sessionStrategy)
     {
         // authentication provider
         $authProviderId = 'security.authentication.provider.rememberme.'.$id;