[Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
This commit is contained in:
parent
620a3d4c69
commit
729902a33f
|
@ -67,17 +67,9 @@ class InMemoryUserProvider implements UserProviderInterface
|
|||
*/
|
||||
public function loadUserByUsername($username)
|
||||
{
|
||||
if (!isset($this->users[strtolower($username)])) {
|
||||
$ex = new UsernameNotFoundException(sprintf('Username "%s" does not exist.', $username));
|
||||
$ex->setUsername($username);
|
||||
$user = $this->getUser($username);
|
||||
|
||||
throw $ex;
|
||||
}
|
||||
|
||||
$user = $this->users[strtolower($username)];
|
||||
|
||||
return new User($user->getUsername(), $user->getPassword(), $user->getRoles(), $user->isEnabled(), $user->isAccountNonExpired(),
|
||||
$user->isCredentialsNonExpired(), $user->isAccountNonLocked());
|
||||
return new User($user->getUsername(), $user->getPassword(), $user->getRoles(), $user->isEnabled(), $user->isAccountNonExpired(), $user->isCredentialsNonExpired(), $user->isAccountNonLocked());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -89,7 +81,9 @@ class InMemoryUserProvider implements UserProviderInterface
|
|||
throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
|
||||
}
|
||||
|
||||
return $this->loadUserByUsername($user->getUsername());
|
||||
$storedUser = $this->getUser($user->getUsername());
|
||||
|
||||
return new User($storedUser->getUsername(), $storedUser->getPassword(), $storedUser->getRoles(), $storedUser->isEnabled(), $storedUser->isAccountNonExpired(), $storedUser->isCredentialsNonExpired() && $storedUser->getPassword() === $user->getPassword(), $storedUser->isAccountNonLocked());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -99,4 +93,25 @@ class InMemoryUserProvider implements UserProviderInterface
|
|||
{
|
||||
return $class === 'Symfony\Component\Security\Core\User\User';
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the user by given username.
|
||||
*
|
||||
* @param string $username The username.
|
||||
*
|
||||
* @return User
|
||||
*
|
||||
* @throws UsernameNotFoundException If user whose given username does not exist.
|
||||
*/
|
||||
private function getUser($username)
|
||||
{
|
||||
if (!isset($this->users[strtolower($username)])) {
|
||||
$ex = new UsernameNotFoundException(sprintf('Username "%s" does not exist.', $username));
|
||||
$ex->setUsername($username);
|
||||
|
||||
throw $ex;
|
||||
}
|
||||
|
||||
return $this->users[strtolower($username)];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -18,18 +18,39 @@ class InMemoryUserProviderTest extends \PHPUnit_Framework_TestCase
|
|||
{
|
||||
public function testConstructor()
|
||||
{
|
||||
$provider = new InMemoryUserProvider(array(
|
||||
$provider = $this->createProvider();
|
||||
|
||||
$user = $provider->loadUserByUsername('fabien');
|
||||
$this->assertEquals('foo', $user->getPassword());
|
||||
$this->assertEquals(array('ROLE_USER'), $user->getRoles());
|
||||
$this->assertFalse($user->isEnabled());
|
||||
}
|
||||
|
||||
public function testRefresh()
|
||||
{
|
||||
$user = new User('fabien', 'bar');
|
||||
|
||||
$provider = $this->createProvider();
|
||||
|
||||
$refreshedUser = $provider->refreshUser($user);
|
||||
$this->assertEquals('foo', $refreshedUser->getPassword());
|
||||
$this->assertEquals(array('ROLE_USER'), $refreshedUser->getRoles());
|
||||
$this->assertFalse($refreshedUser->isEnabled());
|
||||
$this->assertFalse($refreshedUser->isCredentialsNonExpired());
|
||||
}
|
||||
|
||||
/**
|
||||
* @return InMemoryUserProvider
|
||||
*/
|
||||
protected function createProvider()
|
||||
{
|
||||
return new InMemoryUserProvider(array(
|
||||
'fabien' => array(
|
||||
'password' => 'foo',
|
||||
'enabled' => false,
|
||||
'roles' => array('ROLE_USER'),
|
||||
),
|
||||
));
|
||||
|
||||
$user = $provider->loadUserByUsername('fabien');
|
||||
$this->assertEquals('foo', $user->getPassword());
|
||||
$this->assertEquals(array('ROLE_USER'), $user->getRoles());
|
||||
$this->assertFalse($user->isEnabled());
|
||||
}
|
||||
|
||||
public function testCreateUser()
|
||||
|
|
Reference in New Issue