Skip to content

[HttpKernel] Fix session initialized several times #38910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2020
Merged

[HttpKernel] Fix session initialized several times #38910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public function onKernelRequest(GetResponseEvent $event)
$session = null;
$request = $event->getRequest();
if (!$request->hasSession()) {
$request->setSessionFactory(function () { return $this->getSession(); });
$sess = null;
$request->setSessionFactory(function () use (&$sess) { return $sess ?? $sess = $this->getSession(); });
}

$session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);
Expand Down
34 changes: 34 additions & 0 deletions src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
Copy link
Member

@nicolas-grekas nicolas-grekas Nov 2, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This class is deprecated, I'm fixing it in the source directly, see 76c1939

use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\Event\ResponseEvent;
use Symfony\Component\HttpKernel\EventListener\AbstractSessionListener;
use Symfony\Component\HttpKernel\EventListener\SessionListener;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\KernelInterface;

class SessionListenerTest extends TestCase
{
Expand Down Expand Up @@ -178,4 +180,36 @@ public function testSurrogateMasterRequestIsPublic()
$this->assertTrue($response->headers->has('Expires'));
$this->assertLessThanOrEqual((new \DateTime('now', new \DateTimeZone('UTC'))), (new \DateTime($response->headers->get('Expires'))));
}

public function testGetSessionIsCalledOnce()
{
$session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
$sessionStorage = $this->getMockBuilder(NativeSessionStorage::class)->getMock();
$kernel = $this->getMockBuilder(KernelInterface::class)->getMock();

$sessionStorage->expects($this->once())
->method('setOptions')
->with(['cookie_secure' => true]);

$requestStack = new RequestStack();
$requestStack->push($masterRequest = new Request([], [], [], [], [], ['HTTPS' => 'on']));

$container = new Container();
$container->set('session_storage', $sessionStorage);
$container->set('session', $session);
$container->set('request_stack', $requestStack);

$event = new GetResponseEvent($kernel, $masterRequest, HttpKernelInterface::MASTER_REQUEST);

$listener = new SessionListener($container);
$listener->onKernelRequest($event);

$subRequest = $masterRequest->duplicate();
// at this point both master and subrequest have a closure to build the session

$masterRequest->getSession();

// calling the factory on the subRequest should not trigger a second call to storage->sesOptions()
$subRequest->getSession();
}
}