[Security] Revise UserPasswordEncoderInterface::needsRehash()

This commit is contained in:
Roland Franssen 2019-07-31 15:42:59 +02:00 committed by Nicolas Grekas
parent 40fe1610d2
commit c5a283d417
4 changed files with 12 additions and 7 deletions

View File

@ -50,10 +50,10 @@ class UserPasswordEncoder implements UserPasswordEncoderInterface
/**
* {@inheritdoc}
*/
public function needsRehash(UserInterface $user, string $encoded): bool
public function needsRehash(UserInterface $user): bool
{
$encoder = $this->encoderFactory->getEncoder($user);
return method_exists($encoder, 'needsRehash') && $encoder->needsRehash($encoded);
return method_exists($encoder, 'needsRehash') && $encoder->needsRehash($user->getPassword());
}
}

View File

@ -18,7 +18,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
*
* @author Ariel Ferrandini <arielferrandini@gmail.com>
*
* @method bool needsRehash(UserInterface $user, string $encoded)
* @method bool needsRehash(UserInterface $user)
*/
interface UserPasswordEncoderInterface
{

View File

@ -85,9 +85,9 @@ class UserPasswordEncoderTest extends TestCase
$passwordEncoder = new UserPasswordEncoder($mockEncoderFactory);
$hash = $passwordEncoder->encodePassword($user, 'foo', 'salt');
$this->assertFalse($passwordEncoder->needsRehash($user, $hash));
$this->assertTrue($passwordEncoder->needsRehash($user, $hash));
$this->assertFalse($passwordEncoder->needsRehash($user, $hash));
$user->setPassword($passwordEncoder->encodePassword($user, 'foo', 'salt'));
$this->assertFalse($passwordEncoder->needsRehash($user));
$this->assertTrue($passwordEncoder->needsRehash($user));
$this->assertFalse($passwordEncoder->needsRehash($user));
}
}

View File

@ -164,4 +164,9 @@ final class User implements UserInterface, EquatableInterface, AdvancedUserInter
return true;
}
public function setPassword(string $password)
{
$this->password = $password;
}
}