Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit97847c0

Browse files
[HttpKernel] Fix session handling: decouple "save" from setting response "private"
1 parentf95ac4f commit97847c0

File tree

8 files changed

+130
-19
lines changed

8 files changed

+130
-19
lines changed

‎src/Symfony/Component/HttpFoundation/Session/Session.php‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
2929
private$flashName;
3030
private$attributeName;
3131
private$data =array();
32+
private$hasBeenStarted;
3233

3334
/**
3435
* @param SessionStorageInterface $storage A SessionStorageInterface instance
@@ -140,6 +141,16 @@ public function count()
140141
returncount($this->getAttributeBag()->all());
141142
}
142143

144+
/**
145+
* @return bool
146+
*
147+
* @internal
148+
*/
149+
publicfunctionhasBeenStarted()
150+
{
151+
return$this->hasBeenStarted;
152+
}
153+
143154
/**
144155
* @return bool
145156
*
@@ -227,7 +238,7 @@ public function getMetadataBag()
227238
*/
228239
publicfunctionregisterBag(SessionBagInterface$bag)
229240
{
230-
$this->storage->registerBag(newSessionBagProxy($bag,$this->data));
241+
$this->storage->registerBag(newSessionBagProxy($bag,$this->data,$this->hasBeenStarted));
231242
}
232243

233244
/**
@@ -257,6 +268,6 @@ public function getFlashBag()
257268
*/
258269
privatefunctiongetAttributeBag()
259270
{
260-
return$this->storage->getBag($this->attributeName)->getBag();
271+
return$this->getBag($this->attributeName);
261272
}
262273
}

‎src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ final class SessionBagProxy implements SessionBagInterface
2020
{
2121
private$bag;
2222
private$data;
23+
private$hasBeenStarted;
2324

24-
publicfunction__construct(SessionBagInterface$bag,array &$data)
25+
publicfunction__construct(SessionBagInterface$bag,array &$data, &$hasBeenStarted)
2526
{
2627
$this->bag =$bag;
2728
$this->data = &$data;
29+
$this->hasBeenStarted = &$hasBeenStarted;
2830
}
2931

3032
/**
@@ -56,6 +58,7 @@ public function getName()
5658
*/
5759
publicfunctioninitialize(array &$array)
5860
{
61+
$this->hasBeenStarted =true;
5962
$this->data[$this->bag->getStorageKey()] = &$array;
6063

6164
$this->bag->initialize($array);

‎src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
namespaceSymfony\Component\HttpKernel\EventListener;
1313

14+
useSymfony\Component\HttpFoundation\Session\Session;
1415
useSymfony\Component\HttpFoundation\Session\SessionInterface;
16+
useSymfony\Component\HttpKernel\Event\FilterResponseEvent;
1517
useSymfony\Component\HttpKernel\Event\GetResponseEvent;
1618
useSymfony\Component\HttpKernel\KernelEvents;
1719
useSymfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -38,10 +40,30 @@ public function onKernelRequest(GetResponseEvent $event)
3840
$request->setSession($session);
3941
}
4042

43+
publicfunctiononKernelResponse(FilterResponseEvent$event)
44+
{
45+
if (!$event->isMasterRequest()) {
46+
return;
47+
}
48+
49+
if (!$session =$event->getRequest()->getSession()) {
50+
return;
51+
}
52+
53+
if ($session->isStarted() || ($sessioninstanceof Session &&$session->hasBeenStarted())) {
54+
$event->getResponse()
55+
->setPrivate()
56+
->setMaxAge(0)
57+
->headers->addCacheControlDirective('must-revalidate');
58+
}
59+
}
60+
4161
publicstaticfunctiongetSubscribedEvents()
4262
{
4363
returnarray(
4464
KernelEvents::REQUEST =>array('onKernelRequest',128),
65+
// low priority to come after regular response listeners, same as SaveSessionListener
66+
KernelEvents::RESPONSE =>array('onKernelResponse', -1000),
4567
);
4668
}
4769

‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,17 @@ public function onKernelResponse(FilterResponseEvent $event)
5858
return;
5959
}
6060

61-
$session =$event->getRequest()->getSession();
62-
if ($session &&$session->isStarted()) {
61+
if (!$session =$event->getRequest()->getSession()) {
62+
return;
63+
}
64+
65+
if ($hasBeenStarted =$session->isStarted()) {
6366
$session->save();
64-
if (!$sessioninstanceof Session || !\method_exists($session,'isEmpty') || !$session->isEmpty()) {
65-
$params =session_get_cookie_params();
66-
$event->getResponse()->headers->setCookie(newCookie($session->getName(),$session->getId(),0 ===$params['lifetime'] ?0 :time() +$params['lifetime'],$params['path'],$params['domain'],$params['secure'],$params['httponly']));
67-
}
67+
}
68+
69+
if ($sessioninstanceof Session ? !$session->isEmpty() :$hasBeenStarted) {
70+
$params =session_get_cookie_params();
71+
$event->getResponse()->headers->setCookie(newCookie($session->getName(),$session->getId(),0 ===$params['lifetime'] ?0 :time() +$params['lifetime'],$params['path'],$params['domain'],$params['secure'],$params['httponly']));
6872
}
6973
}
7074

‎src/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ public function onKernelResponse(FilterResponseEvent $event)
5353
$session =$event->getRequest()->getSession();
5454
if ($session &&$session->isStarted()) {
5555
$session->save();
56-
$event->getResponse()
57-
->setPrivate()
58-
->setMaxAge(0)
59-
->headers->addCacheControlDirective('must-revalidate');
6056
}
6157
}
6258

‎src/Symfony/Component/HttpKernel/Tests/EventListener/SaveSessionListenerTest.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testOnlyTriggeredOnMasterRequest()
3232
$listener->onKernelResponse($event);
3333
}
3434

35-
publicfunctiontestSessionSavedAndResponsePrivate()
35+
publicfunctiontestSessionSaved()
3636
{
3737
$listener =newSaveSessionListener();
3838
$kernel =$this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
@@ -45,9 +45,5 @@ public function testSessionSavedAndResponsePrivate()
4545
$request->setSession($session);
4646
$response =newResponse();
4747
$listener->onKernelResponse(newFilterResponseEvent($kernel,$request, HttpKernelInterface::MASTER_REQUEST,$response));
48-
49-
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
50-
$this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
51-
$this->assertSame('0',$response->headers->getCacheControlDirective('max-age'));
5248
}
5349
}
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespaceSymfony\Component\HttpKernel\Tests\EventListener;
13+
14+
usePHPUnit\Framework\TestCase;
15+
useSymfony\Component\DependencyInjection\Container;
16+
useSymfony\Component\HttpFoundation\Request;
17+
useSymfony\Component\HttpFoundation\Response;
18+
useSymfony\Component\HttpFoundation\Session\Session;
19+
useSymfony\Component\HttpKernel\Event\GetResponseEvent;
20+
useSymfony\Component\HttpKernel\Event\FilterResponseEvent;
21+
useSymfony\Component\HttpKernel\EventListener\AbstractSessionListener;
22+
useSymfony\Component\HttpKernel\EventListener\SessionListener;
23+
useSymfony\Component\HttpKernel\HttpKernelInterface;
24+
25+
class SessionListenerTestextends TestCase
26+
{
27+
publicfunctiontestOnlyTriggeredOnMasterRequest()
28+
{
29+
$listener =$this->getMockForAbstractClass(AbstractSessionListener::class);
30+
$event =$this->getMockBuilder(GetResponseEvent::class)->disableOriginalConstructor()->getMock();
31+
$event->expects($this->once())->method('isMasterRequest')->willReturn(false);
32+
$event->expects($this->never())->method('getRequest');
33+
34+
// sub request
35+
$listener->onKernelRequest($event);
36+
}
37+
38+
publicfunctiontestSessionIsSet()
39+
{
40+
$session =$this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
41+
42+
$container =newContainer();
43+
$container->set('session',$session);
44+
45+
$request =newRequest();
46+
$listener =newSessionListener($container);
47+
48+
$event =$this->getMockBuilder(GetResponseEvent::class)->disableOriginalConstructor()->getMock();
49+
$event->expects($this->once())->method('isMasterRequest')->willReturn(true);
50+
$event->expects($this->once())->method('getRequest')->willReturn($request);
51+
52+
$listener->onKernelRequest($event);
53+
54+
$this->assertTrue($request->hasSession());
55+
$this->assertSame($session,$request->getSession());
56+
}
57+
58+
publicfunctiontestResponseIsPrivate()
59+
{
60+
$session =$this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
61+
$session->expects($this->once())->method('isStarted')->willReturn(false);
62+
$session->expects($this->once())->method('hasBeenStarted')->willReturn(true);
63+
64+
$container =newContainer();
65+
$container->set('session',$session);
66+
67+
$listener =newSessionListener($container);
68+
$kernel =$this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
69+
70+
$request =newRequest();
71+
$response =newResponse();
72+
$listener->onKernelRequest(newGetResponseEvent($kernel,$request, HttpKernelInterface::MASTER_REQUEST));
73+
$listener->onKernelResponse(newFilterResponseEvent($kernel,$request, HttpKernelInterface::MASTER_REQUEST,$response));
74+
75+
$this->assertTrue($response->headers->hasCacheControlDirective('private'));
76+
$this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
77+
$this->assertSame('0',$response->headers->getCacheControlDirective('max-age'));
78+
}
79+
}

‎src/Symfony/Component/HttpKernel/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php":"^5.5.9|>=7.0.8",
2020
"symfony/event-dispatcher":"~2.8|~3.0|~4.0",
21-
"symfony/http-foundation":"^3.3.11|~4.0",
21+
"symfony/http-foundation":"^3.3.4|^4.0.4",
2222
"symfony/debug":"~2.8|~3.0|~4.0",
2323
"psr/log":"~1.0"
2424
},

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp