Make the simple auth provider the same as in Symfony 2.7.
This commit is contained in:
parent
fcebc33d39
commit
9afad9decd
@ -11,8 +11,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Security\Core\Authentication\Provider;
|
namespace Symfony\Component\Security\Core\Authentication\Provider;
|
||||||
|
|
||||||
use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
|
|
||||||
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
|
|
||||||
use Symfony\Component\Security\Core\User\UserChecker;
|
use Symfony\Component\Security\Core\User\UserChecker;
|
||||||
use Symfony\Component\Security\Core\User\UserCheckerInterface;
|
use Symfony\Component\Security\Core\User\UserCheckerInterface;
|
||||||
use Symfony\Component\Security\Core\User\UserInterface;
|
use Symfony\Component\Security\Core\User\UserInterface;
|
||||||
@ -49,22 +47,9 @@ class SimpleAuthenticationProvider implements AuthenticationProviderInterface
|
|||||||
|
|
||||||
$user = $authToken->getUser();
|
$user = $authToken->getUser();
|
||||||
|
|
||||||
if (!$user instanceof UserInterface) {
|
|
||||||
try {
|
|
||||||
$user = $this->userProvider->loadUserByUsername($user);
|
|
||||||
|
|
||||||
if (!$user instanceof UserInterface) {
|
if (!$user instanceof UserInterface) {
|
||||||
return $authToken;
|
return $authToken;
|
||||||
}
|
}
|
||||||
} catch (UsernameNotFoundException $e) {
|
|
||||||
$e->setUsername($user);
|
|
||||||
throw $e;
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
$e = new AuthenticationServiceException($e->getMessage(), 0, $e);
|
|
||||||
$e->setToken($token);
|
|
||||||
throw $e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->userChecker->checkPreAuth($user);
|
$this->userChecker->checkPreAuth($user);
|
||||||
$this->userChecker->checkPostAuth($user);
|
$this->userChecker->checkPostAuth($user);
|
||||||
|
@ -15,7 +15,6 @@ use PHPUnit\Framework\TestCase;
|
|||||||
use Symfony\Component\Security\Core\Authentication\Provider\SimpleAuthenticationProvider;
|
use Symfony\Component\Security\Core\Authentication\Provider\SimpleAuthenticationProvider;
|
||||||
use Symfony\Component\Security\Core\Exception\DisabledException;
|
use Symfony\Component\Security\Core\Exception\DisabledException;
|
||||||
use Symfony\Component\Security\Core\Exception\LockedException;
|
use Symfony\Component\Security\Core\Exception\LockedException;
|
||||||
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
|
|
||||||
use Symfony\Component\Security\Core\User\UserChecker;
|
use Symfony\Component\Security\Core\User\UserChecker;
|
||||||
|
|
||||||
class SimpleAuthenticationProviderTest extends TestCase
|
class SimpleAuthenticationProviderTest extends TestCase
|
||||||
@ -74,54 +73,6 @@ class SimpleAuthenticationProviderTest extends TestCase
|
|||||||
$provider->authenticate($token);
|
$provider->authenticate($token);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testAuthenticateFromString()
|
|
||||||
{
|
|
||||||
$user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
|
|
||||||
|
|
||||||
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
|
|
||||||
$token->expects($this->any())
|
|
||||||
->method('getUser')
|
|
||||||
->will($this->returnValue('foo'));
|
|
||||||
|
|
||||||
$authenticator = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
|
|
||||||
$authenticator->expects($this->once())
|
|
||||||
->method('authenticateToken')
|
|
||||||
->will($this->returnValue($token));
|
|
||||||
|
|
||||||
$userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
|
|
||||||
$userProvider->expects($this->once())
|
|
||||||
->method('loadUserByUsername')
|
|
||||||
->willReturn($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
|
|
||||||
$provider = $this->getProvider($authenticator, $userProvider);
|
|
||||||
|
|
||||||
$this->assertSame($token, $provider->authenticate($token));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
|
|
||||||
*/
|
|
||||||
public function testUsernameNotFound()
|
|
||||||
{
|
|
||||||
$user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
|
|
||||||
|
|
||||||
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
|
|
||||||
$token->expects($this->any())
|
|
||||||
->method('getUser')
|
|
||||||
->will($this->returnValue('foo'));
|
|
||||||
|
|
||||||
$authenticator = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
|
|
||||||
$authenticator->expects($this->once())
|
|
||||||
->method('authenticateToken')
|
|
||||||
->will($this->returnValue($token));
|
|
||||||
|
|
||||||
$userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
|
|
||||||
$userProvider->expects($this->once())
|
|
||||||
->method('loadUserByUsername')
|
|
||||||
->willThrowException(new UsernameNotFoundException());
|
|
||||||
|
|
||||||
$this->getProvider($authenticator, $userProvider)->authenticate($token);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testAuthenticateSkipsUserChecksForNonUserInterfaceObjects()
|
public function testAuthenticateSkipsUserChecksForNonUserInterfaceObjects()
|
||||||
{
|
{
|
||||||
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
|
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
|
||||||
|
Reference in New Issue
Block a user