[HttpKernel] Make AbstractTestSessionListener compatible with CookieClearingLogoutHandler
This commit is contained in:
parent
b61c8fcb77
commit
f54d96926a
@ -71,6 +71,13 @@ abstract class AbstractTestSessionListener implements EventSubscriberInterface
|
|||||||
|
|
||||||
if ($session instanceof Session ? !$session->isEmpty() || (null !== $this->sessionId && $session->getId() !== $this->sessionId) : $wasStarted) {
|
if ($session instanceof Session ? !$session->isEmpty() || (null !== $this->sessionId && $session->getId() !== $this->sessionId) : $wasStarted) {
|
||||||
$params = session_get_cookie_params();
|
$params = session_get_cookie_params();
|
||||||
|
|
||||||
|
foreach ($event->getResponse()->headers->getCookies() as $cookie) {
|
||||||
|
if ($session->getName() === $cookie->getName() && $params['path'] === $cookie->getPath() && $params['domain'] == $cookie->getDomain()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
|
$event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
|
||||||
$this->sessionId = $session->getId();
|
$this->sessionId = $session->getId();
|
||||||
}
|
}
|
||||||
|
@ -106,6 +106,36 @@ class TestSessionListenerTest extends TestCase
|
|||||||
$this->assertNotEmpty($response->headers->getCookies());
|
$this->assertNotEmpty($response->headers->getCookies());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider anotherCookieProvider
|
||||||
|
*/
|
||||||
|
public function testSessionWithNewSessionIdAndNewCookieDoesNotSendAnotherCookie($existing, array $expected)
|
||||||
|
{
|
||||||
|
$this->sessionHasBeenStarted();
|
||||||
|
$this->sessionIsEmpty();
|
||||||
|
$this->fixSessionId('456');
|
||||||
|
|
||||||
|
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
|
||||||
|
$request = Request::create('/', 'GET', array(), array('MOCKSESSID' => '123'));
|
||||||
|
$event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
|
||||||
|
$this->listener->onKernelRequest($event);
|
||||||
|
|
||||||
|
$response = new Response('', 200, array('Set-Cookie' => $existing));
|
||||||
|
|
||||||
|
$response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
|
||||||
|
|
||||||
|
$this->assertSame($expected, $response->headers->get('Set-Cookie', null, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function anotherCookieProvider()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
'same' => array('MOCKSESSID=789; path=/', array('MOCKSESSID=789; path=/')),
|
||||||
|
'different domain' => array('MOCKSESSID=789; path=/; domain=example.com', array('MOCKSESSID=789; path=/; domain=example.com', 'MOCKSESSID=456; path=/')),
|
||||||
|
'different path' => array('MOCKSESSID=789; path=/foo', array('MOCKSESSID=789; path=/foo', 'MOCKSESSID=456; path=/')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public function testUnstartedSessionIsNotSave()
|
public function testUnstartedSessionIsNotSave()
|
||||||
{
|
{
|
||||||
$this->sessionHasNotBeenStarted();
|
$this->sessionHasNotBeenStarted();
|
||||||
@ -123,10 +153,10 @@ class TestSessionListenerTest extends TestCase
|
|||||||
$this->assertFalse(is_subclass_of(TestSessionListener::class, ServiceSubscriberInterface::class, 'Implementing ServiceSubscriberInterface would create a dep on the DI component, which eg Silex cannot afford'));
|
$this->assertFalse(is_subclass_of(TestSessionListener::class, ServiceSubscriberInterface::class, 'Implementing ServiceSubscriberInterface would create a dep on the DI component, which eg Silex cannot afford'));
|
||||||
}
|
}
|
||||||
|
|
||||||
private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST)
|
private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, Response $response = null)
|
||||||
{
|
{
|
||||||
$request->setSession($this->session);
|
$request->setSession($this->session);
|
||||||
$response = new Response();
|
$response = $response ?: new Response();
|
||||||
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
|
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
|
||||||
$event = new FilterResponseEvent($kernel, $request, $type, $response);
|
$event = new FilterResponseEvent($kernel, $request, $type, $response);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user