hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1276 : persistent cookies does not authenticate

Browse Source
This commit is contained in:
Romain Neutron
2013-07-10 18:38:10 +02:00
parent 6e3fb2f26e
commit 56ea42d2e6
4 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Application/Root.php
View File

@@ -38,14 +38,6 @@ return call_user_func(function($environment = PhraseaApplication::ENV_PROD) {
}
});
$app->before(function(Request $request) use ($app) {
if ($request->cookies->has('persistent') && !$app['authentication']->isAuthenticated()) {
if (false !== $session = $app['authentication.persistent-manager']->getSession($request->cookies->get('persistent'))) {
$app['authentication']->refreshAccount($session);
}
}
});
$app->bindRoutes();
if (PhraseaApplication::ENV_DEV === $app->getEnvironment()) {

3
lib/Alchemy/Phrasea/Controller/Root/Login.php
View File

@@ -1010,6 +1010,9 @@ class Login implements ControllerProviderInterface
->setNonce($nonce);
$cookie = new Cookie('persistent', $token);
$response->headers->setCookie($cookie);
$app['EM']->persist($session);
$app['EM']->flush();
}
$event = new PostAuthenticate($request, $response, $user, $context);

45
lib/Alchemy/Phrasea/Core/Event/Subscriber/PersistentCookieSubscriber.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
/*
* This file is part of Phraseanet
*
* (c) 2005-2013 Alchemy
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Alchemy\Phrasea\Core\Event\Subscriber;
use Silex\Application;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
class PersistentCookieSubscriber implements EventSubscriberInterface
{
private $app;
public function __construct(Application $app)
{
$this->app = $app;
}
public static function getSubscribedEvents()
{
return array(
KernelEvents::REQUEST => array('checkPersistentCookie', 128),
);
}
public function checkPersistentCookie(GetResponseEvent $event)
{
$request = $event->getRequest();
if ($request->cookies->has('persistent') && !$this->app['authentication']->isAuthenticated()) {
if (false !== $session = $this->app['authentication.persistent-manager']->getSession($request->cookies->get('persistent'))) {
$this->app['authentication']->refreshAccount($session);
}
}
}
}

10
lib/Alchemy/Phrasea/Core/Provider/AuthenticationManagerServiceProvider.php
View File

@@ -26,6 +26,7 @@ use Alchemy\Phrasea\Authentication\SuggestionFinder;
use Alchemy\Phrasea\Authentication\Token\TokenValidator;
use Silex\Application;
use Silex\ServiceProviderInterface;
use Alchemy\Phrasea\Core\Event\Subscriber\PersistentCookieSubscriber;
class AuthenticationManagerServiceProvider implements ServiceProviderInterface
{
@@ -67,7 +68,7 @@ class AuthenticationManagerServiceProvider implements ServiceProviderInterface
}
}, $authConf['auto-create']['templates']));
$enabled = $app['phraseanet.registry']->get('GV_autoregister') && $app['registration.enabled'];
return new AccountCreator($app['tokens'], $app['phraseanet.appbox'], $enabled, $templates);
@@ -126,5 +127,12 @@ class AuthenticationManagerServiceProvider implements ServiceProviderInterface
public function boot(Application $app)
{
$app['dispatcher'] = $app->share(
$app->extend('dispatcher', function($dispatcher, Application $app){
$dispatcher->addSubscriber(new PersistentCookieSubscriber($app));
return $dispatcher;
})
);
}
}