Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 4e06cf1

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.0
* 2.8: [travis] Fix deps=low/high builds fixed CS skip test with current phpunit bridge Fix for #19183 to add support for new PHP MongoDB extension in sessions. [Console] Fix for block() padding formatting after #19189 [Security][Guard] check if session exist before using it bumped Symfony version to 2.8.9 updated VERSION for 2.8.8 updated CHANGELOG for 2.8.8 bumped Symfony version to 2.7.16 updated VERSION for 2.7.15 update CONTRIBUTORS for 2.7.15 updated CHANGELOG for 2.7.15 Fix some lowest deps Fixed typos in the expectedException annotations Conflicts: CHANGELOG-2.7.md CHANGELOG-3.0.md src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Yaml/Tests/ParserTest.php
2 parents a06fcc9 + 3d8dfdd commit 4e06cf1

File tree

2 files changed

+222
-2
lines changed

2 files changed

+222
-2
lines changed

‎Guard/Authenticator/AbstractFormLoginAuthenticator.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Security\Guard\Authenticator;
1313

14+
use Symfony\Component\HttpFoundation\Session\SessionInterface;
1415
use Symfony\Component\Security\Guard\AbstractGuardAuthenticator;
1516
use Symfony\Component\HttpFoundation\RedirectResponse;
1617
use Symfony\Component\HttpFoundation\Request;
@@ -52,7 +53,10 @@ abstract protected function getDefaultSuccessRedirectUrl();
5253
*/
5354
public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
5455
{
55-
$request->getSession()->set(Security::AUTHENTICATION_ERROR, $exception);
56+
if ($request->getSession() instanceof SessionInterface) {
57+
$request->getSession()->set(Security::AUTHENTICATION_ERROR, $exception);
58+
}
59+
5660
$url = $this->getLoginUrl();
5761

5862
return new RedirectResponse($url);
@@ -69,9 +73,13 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
6973
*/
7074
public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey)
7175
{
76+
$targetPath = null;
77+
7278
// if the user hit a secure page and start() was called, this was
7379
// the URL they were on, and probably where you want to redirect to
74-
$targetPath = $request->getSession()->get('_security.'.$providerKey.'.target_path');
80+
if ($request->getSession() instanceof SessionInterface) {
81+
$targetPath = $request->getSession()->get('_security.'.$providerKey.'.target_path');
82+
}
7583

7684
if (!$targetPath) {
7785
$targetPath = $this->getDefaultSuccessRedirectUrl();

‎Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
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+
namespace Symfony\Component\Security\Guard\Tests\Authenticator;
13+
14+
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\Security\Core\Exception\AuthenticationException;
16+
use Symfony\Component\Security\Core\User\UserInterface;
17+
use Symfony\Component\Security\Core\User\UserProviderInterface;
18+
use Symfony\Component\Security\Guard\Authenticator\AbstractFormLoginAuthenticator;
19+
20+
/**
21+
* @author Jean Pasdeloup <jpasdeloup@sedona.fr>
22+
*/
23+
class FormLoginAuthenticatorTest extends \PHPUnit_Framework_TestCase
24+
{
25+
private $requestWithoutSession;
26+
private $requestWithSession;
27+
private $authenticator;
28+
29+
const LOGIN_URL = 'http://login';
30+
const DEFAULT_SUCCESS_URL = 'http://defaultsuccess';
31+
const CUSTOM_SUCCESS_URL = 'http://customsuccess';
32+
33+
public function testAuthenticationFailureWithoutSession()
34+
{
35+
$failureResponse = $this->authenticator->onAuthenticationFailure($this->requestWithoutSession, new AuthenticationException());
36+
37+
$this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $failureResponse);
38+
$this->assertEquals(self::LOGIN_URL, $failureResponse->getTargetUrl());
39+
}
40+
41+
public function testAuthenticationFailureWithSession()
42+
{
43+
$this->requestWithSession->getSession()
44+
->expects($this->once())
45+
->method('set');
46+
47+
$failureResponse = $this->authenticator->onAuthenticationFailure($this->requestWithSession, new AuthenticationException());
48+
49+
$this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $failureResponse);
50+
$this->assertEquals(self::LOGIN_URL, $failureResponse->getTargetUrl());
51+
}
52+
53+
public function testAuthenticationSuccessWithoutSession()
54+
{
55+
$token = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface')
56+
->disableOriginalConstructor()
57+
->getMock();
58+
59+
$redirectResponse = $this->authenticator->onAuthenticationSuccess($this->requestWithoutSession, $token, 'providerkey');
60+
61+
$this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $redirectResponse);
62+
$this->assertEquals(self::DEFAULT_SUCCESS_URL, $redirectResponse->getTargetUrl());
63+
}
64+
65+
public function testAuthenticationSuccessWithSessionButEmpty()
66+
{
67+
$token = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface')
68+
->disableOriginalConstructor()
69+
->getMock();
70+
$this->requestWithSession->getSession()
71+
->expects($this->once())
72+
->method('get')
73+
->will($this->returnValue(null));
74+
75+
$redirectResponse = $this->authenticator->onAuthenticationSuccess($this->requestWithSession, $token, 'providerkey');
76+
77+
$this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $redirectResponse);
78+
$this->assertEquals(self::DEFAULT_SUCCESS_URL, $redirectResponse->getTargetUrl());
79+
}
80+
81+
public function testAuthenticationSuccessWithSessionAndTarget()
82+
{
83+
$token = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Authentication\\Token\\TokenInterface')
84+
->disableOriginalConstructor()
85+
->getMock();
86+
$this->requestWithSession->getSession()
87+
->expects($this->once())
88+
->method('get')
89+
->will($this->returnValue(self::CUSTOM_SUCCESS_URL));
90+
91+
$redirectResponse = $this->authenticator->onAuthenticationSuccess($this->requestWithSession, $token, 'providerkey');
92+
93+
$this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $redirectResponse);
94+
$this->assertEquals(self::CUSTOM_SUCCESS_URL, $redirectResponse->getTargetUrl());
95+
}
96+
97+
public function testRememberMe()
98+
{
99+
$doSupport = $this->authenticator->supportsRememberMe();
100+
101+
$this->assertTrue($doSupport);
102+
}
103+
104+
public function testStartWithoutSession()
105+
{
106+
$failureResponse = $this->authenticator->start($this->requestWithoutSession, new AuthenticationException());
107+
108+
$this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $failureResponse);
109+
$this->assertEquals(self::LOGIN_URL, $failureResponse->getTargetUrl());
110+
}
111+
112+
public function testStartWithSession()
113+
{
114+
$failureResponse = $this->authenticator->start($this->requestWithSession, new AuthenticationException());
115+
116+
$this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $failureResponse);
117+
$this->assertEquals(self::LOGIN_URL, $failureResponse->getTargetUrl());
118+
}
119+
120+
protected function setUp()
121+
{
122+
$this->requestWithoutSession = new Request(array(), array(), array(), array(), array(), array());
123+
$this->requestWithSession = new Request(array(), array(), array(), array(), array(), array());
124+
125+
$session = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\Session\\SessionInterface')
126+
->disableOriginalConstructor()
127+
->getMock();
128+
$this->requestWithSession->setSession($session);
129+
130+
$this->authenticator = new TestFormLoginAuthenticator();
131+
$this->authenticator
132+
->setLoginUrl(self::LOGIN_URL)
133+
->setDefaultSuccessRedirectUrl(self::DEFAULT_SUCCESS_URL)
134+
;
135+
}
136+
137+
protected function tearDown()
138+
{
139+
$this->request = null;
140+
$this->requestWithSession = null;
141+
}
142+
}
143+
144+
class TestFormLoginAuthenticator extends AbstractFormLoginAuthenticator
145+
{
146+
private $loginUrl;
147+
private $defaultSuccessRedirectUrl;
148+
149+
/**
150+
* @param mixed $defaultSuccessRedirectUrl
151+
*
152+
* @return TestFormLoginAuthenticator
153+
*/
154+
public function setDefaultSuccessRedirectUrl($defaultSuccessRedirectUrl)
155+
{
156+
$this->defaultSuccessRedirectUrl = $defaultSuccessRedirectUrl;
157+
158+
return $this;
159+
}
160+
161+
/**
162+
* @param mixed $loginUrl
163+
*
164+
* @return TestFormLoginAuthenticator
165+
*/
166+
public function setLoginUrl($loginUrl)
167+
{
168+
$this->loginUrl = $loginUrl;
169+
170+
return $this;
171+
}
172+
173+
/**
174+
* {@inheritdoc}
175+
*/
176+
protected function getLoginUrl()
177+
{
178+
return $this->loginUrl;
179+
}
180+
181+
/**
182+
* {@inheritdoc}
183+
*/
184+
protected function getDefaultSuccessRedirectUrl()
185+
{
186+
return $this->defaultSuccessRedirectUrl;
187+
}
188+
189+
/**
190+
* {@inheritdoc}
191+
*/
192+
public function getCredentials(Request $request)
193+
{
194+
return 'credentials';
195+
}
196+
197+
/**
198+
* {@inheritdoc}
199+
*/
200+
public function getUser($credentials, UserProviderInterface $userProvider)
201+
{
202+
return $userProvider->loadUserByUsername($credentials);
203+
}
204+
205+
/**
206+
* {@inheritdoc}
207+
*/
208+
public function checkCredentials($credentials, UserInterface $user)
209+
{
210+
return true;
211+
}
212+
}

0 commit comments

Comments
 (0)