-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[Validator] New PasswordStrength
constraint
#49789
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\Validator\Constraints; | ||
|
||
use Symfony\Component\Validator\Constraint; | ||
use Symfony\Component\Validator\Exception\ConstraintDefinitionException; | ||
use Symfony\Component\Validator\Exception\LogicException; | ||
use ZxcvbnPhp\Zxcvbn; | ||
|
||
/** | ||
* @Annotation | ||
* | ||
* @Target({"PROPERTY", "METHOD", "ANNOTATION"}) | ||
* | ||
* @author Florent Morselli <florent.morselli@spomky-labs.com> | ||
*/ | ||
#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] | ||
final class PasswordStrength extends Constraint | ||
{ | ||
public const PASSWORD_STRENGTH_ERROR = '4234df00-45dd-49a4-b303-a75dbf8b10d8'; | ||
public const RESTRICTED_USER_INPUT_ERROR = 'd187ff45-bf23-4331-aa87-c24a36e9b400'; | ||
|
||
protected const ERROR_NAMES = [ | ||
self::PASSWORD_STRENGTH_ERROR => 'PASSWORD_STRENGTH_ERROR', | ||
self::RESTRICTED_USER_INPUT_ERROR => 'RESTRICTED_USER_INPUT_ERROR', | ||
]; | ||
|
||
public string $lowStrengthMessage = 'The password strength is too low. Please use a stronger password.'; | ||
|
||
public int $minScore = 2; | ||
|
||
public string $restrictedDataMessage = 'The password contains the following restricted data: {{ wordList }}.'; | ||
|
||
/** | ||
* @var array<string> | ||
*/ | ||
public array $restrictedData = []; | ||
|
||
public function __construct(mixed $options = null, array $groups = null, mixed $payload = null) | ||
{ | ||
if (!class_exists(Zxcvbn::class)) { | ||
throw new LogicException(sprintf('The "%s" class requires the "bjeavons/zxcvbn-php" library. Try running "composer require bjeavons/zxcvbn-php".', self::class)); | ||
} | ||
|
||
if (isset($options['minScore']) && (!\is_int($options['minScore']) || $options['minScore'] < 1 || $options['minScore'] > 4)) { | ||
throw new ConstraintDefinitionException(sprintf('The parameter "minScore" of the "%s" constraint must be an integer between 1 and 4.', static::class)); | ||
} | ||
|
||
if (isset($options['restrictedData'])) { | ||
array_walk($options['restrictedData'], static function (mixed $value): void { | ||
if (!\is_string($value)) { | ||
throw new ConstraintDefinitionException(sprintf('The parameter "restrictedData" of the "%s" constraint must be a list of strings.', static::class)); | ||
} | ||
}); | ||
} | ||
parent::__construct($options, $groups, $payload); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\Validator\Constraints; | ||
|
||
use Symfony\Component\Validator\Constraint; | ||
use Symfony\Component\Validator\ConstraintValidator; | ||
use Symfony\Component\Validator\Exception\UnexpectedTypeException; | ||
use Symfony\Component\Validator\Exception\UnexpectedValueException; | ||
use ZxcvbnPhp\Matchers\DictionaryMatch; | ||
use ZxcvbnPhp\Matchers\MatchInterface; | ||
use ZxcvbnPhp\Zxcvbn; | ||
|
||
final class PasswordStrengthValidator extends ConstraintValidator | ||
{ | ||
public function validate(#[\SensitiveParameter] mixed $value, Constraint $constraint): void | ||
{ | ||
if (!$constraint instanceof PasswordStrength) { | ||
throw new UnexpectedTypeException($constraint, PasswordStrength::class); | ||
} | ||
|
||
if (null === $value) { | ||
return; | ||
} | ||
|
||
if (!\is_string($value)) { | ||
throw new UnexpectedValueException($value, 'string'); | ||
} | ||
|
||
$zxcvbn = new Zxcvbn(); | ||
$strength = $zxcvbn->passwordStrength($value, $constraint->restrictedData); | ||
|
||
if ($strength['score'] < $constraint->minScore) { | ||
$this->context->buildViolation($constraint->lowStrengthMessage) | ||
->setCode(PasswordStrength::PASSWORD_STRENGTH_ERROR) | ||
->addViolation(); | ||
} | ||
$wordList = $this->findRestrictedUserInputs($strength['sequence'] ?? []); | ||
if (0 !== \count($wordList)) { | ||
$this->context->buildViolation($constraint->restrictedDataMessage, [ | ||
'{{ wordList }}' => implode(', ', $wordList), | ||
]) | ||
->setCode(PasswordStrength::RESTRICTED_USER_INPUT_ERROR) | ||
->addViolation(); | ||
} | ||
} | ||
|
||
/** | ||
* @param array<MatchInterface> $sequence | ||
* | ||
* @return array<string> | ||
*/ | ||
private function findRestrictedUserInputs(array $sequence): array | ||
{ | ||
$found = []; | ||
|
||
foreach ($sequence as $item) { | ||
if (!$item instanceof DictionaryMatch) { | ||
continue; | ||
} | ||
if ('user_inputs' === $item->dictionaryName) { | ||
$found[] = $item->token; | ||
} | ||
} | ||
|
||
return $found; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\Validator\Tests\Constraints; | ||
|
||
use PHPUnit\Framework\TestCase; | ||
use Symfony\Component\Validator\Constraints\PasswordStrength; | ||
use Symfony\Component\Validator\Exception\ConstraintDefinitionException; | ||
|
||
class PasswordStrengthTest extends TestCase | ||
{ | ||
public function testConstructor() | ||
{ | ||
$constraint = new PasswordStrength(); | ||
$this->assertEquals(2, $constraint->minScore); | ||
$this->assertEquals([], $constraint->restrictedData); | ||
} | ||
|
||
public function testConstructorWithParameters() | ||
{ | ||
$constraint = new PasswordStrength([ | ||
'minScore' => 3, | ||
'restrictedData' => ['foo', 'bar'], | ||
]); | ||
|
||
$this->assertEquals(3, $constraint->minScore); | ||
$this->assertEquals(['foo', 'bar'], $constraint->restrictedData); | ||
} | ||
|
||
public function testInvalidScoreOfZero() | ||
{ | ||
$this->expectException(ConstraintDefinitionException::class); | ||
$this->expectExceptionMessage('The parameter "minScore" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be an integer between 1 and 4.'); | ||
new PasswordStrength(['minScore' => 0]); | ||
} | ||
|
||
public function testInvalidScoreOfFive() | ||
{ | ||
$this->expectException(ConstraintDefinitionException::class); | ||
$this->expectExceptionMessage('The parameter "minScore" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be an integer between 1 and 4.'); | ||
new PasswordStrength(['minScore' => 5]); | ||
} | ||
|
||
public function testInvalidRestrictedData() | ||
{ | ||
$this->expectException(ConstraintDefinitionException::class); | ||
$this->expectExceptionMessage('The parameter "restrictedData" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be a list of strings.'); | ||
new PasswordStrength(['restrictedData' => [123]]); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\Validator\Tests\Constraints; | ||
|
||
use Symfony\Component\Validator\Constraints\PasswordStrength; | ||
use Symfony\Component\Validator\Constraints\PasswordStrengthValidator; | ||
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase; | ||
|
||
class PasswordStrengthValidatorTest extends ConstraintValidatorTestCase | ||
{ | ||
protected function createValidator(): PasswordStrengthValidator | ||
{ | ||
return new PasswordStrengthValidator(); | ||
} | ||
|
||
/** | ||
* @dataProvider getValidValues | ||
*/ | ||
public function testValidValues(string $value) | ||
{ | ||
$this->validator->validate($value, new PasswordStrength()); | ||
|
||
$this->assertNoViolation(); | ||
} | ||
|
||
public static function getValidValues(): iterable | ||
{ | ||
yield ['This 1s a very g00d Pa55word! ;-)']; | ||
} | ||
|
||
/** | ||
* @dataProvider provideInvalidConstraints | ||
*/ | ||
public function testThePasswordIsWeak(PasswordStrength $constraint, string $password, string $expectedMessage, string $expectedCode, array $parameters = []) | ||
{ | ||
$this->validator->validate($password, $constraint); | ||
|
||
$this->buildViolation($expectedMessage) | ||
->setCode($expectedCode) | ||
->setParameters($parameters) | ||
->assertRaised(); | ||
} | ||
|
||
public static function provideInvalidConstraints(): iterable | ||
{ | ||
yield [ | ||
new PasswordStrength(), | ||
'password', | ||
'The password strength is too low. Please use a stronger password.', | ||
PasswordStrength::PASSWORD_STRENGTH_ERROR, | ||
]; | ||
yield [ | ||
new PasswordStrength([ | ||
'minScore' => 4, | ||
]), | ||
'Good password?', | ||
'The password strength is too low. Please use a stronger password.', | ||
PasswordStrength::PASSWORD_STRENGTH_ERROR, | ||
]; | ||
yield [ | ||
new PasswordStrength([ | ||
'restrictedData' => ['symfony'], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is very nice There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. that will be wonderful for showcasing real usage in the doc repo after :) |
||
]), | ||
'SyMfONY-framework-john', | ||
'The password contains the following restricted data: {{ wordList }}.', | ||
PasswordStrength::RESTRICTED_USER_INPUT_ERROR, | ||
[ | ||
'{{ wordList }}' => 'SyMfONY', | ||
], | ||
]; | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be added in the validator component composer.json as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes indeed I missed it. I have just added it as a dev dependency and in the
suggest
section as well.