Skip to content

[SecurityBundle] Added UserPasswordValidator tests for the different Validation APIs #11585

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 6, 2014
Merged

[SecurityBundle] Added UserPasswordValidator tests for the different Validation APIs #11585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use Symfony\Bundle\SecurityBundle\SecurityBundle;
use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\ExpressionLanguage\Expression;

abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase
{
Expand Down
26 changes: 26 additions & 0 deletions ...ent/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?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\Security\Core\Tests\Validator\Constraints;

use Symfony\Component\Validator\Validation;

/**
* @since 2.5.4
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class LegacyUserPasswordValidator2Dot4ApiTest extends UserPasswordValidatorTest
{
protected function getApiVersion()
{
return Validation::API_VERSION_2_4;
}
}
26 changes: 26 additions & 0 deletions ...nt/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorLegacyApiTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?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\Security\Core\Tests\Validator\Constraints;

use Symfony\Component\Validator\Validation;

/**
* @since 2.5.4
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class LegacyUserPasswordValidatorLegacyApiTest extends UserPasswordValidatorTest
{
protected function getApiVersion()
{
return Validation::API_VERSION_2_5_BC;
}
}
129 changes: 73 additions & 56 deletions ...Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,117 +11,134 @@

namespace Symfony\Component\Security\Core\Tests\Validator\Constraints;

use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
use Symfony\Component\Security\Core\SecurityContextInterface;
use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
use Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator;
use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
use Symfony\Component\Validator\Validation;

class UserPasswordValidatorTest extends \PHPUnit_Framework_TestCase
/**
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class UserPasswordValidatorTest extends AbstractConstraintValidatorTest
{
const PASSWORD_VALID = true;
const PASSWORD_INVALID = false;
const PASSWORD = 's3Cr3t';

protected $context;
const SALT = '^S4lt$';

protected function setUp()
/**
* @var SecurityContextInterface
*/
protected $securityContext;

/**
* @var PasswordEncoderInterface
*/
protected $encoder;

/**
* @var EncoderFactoryInterface
*/
protected $encoderFactory;

protected function getApiVersion()
{
$this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);
return Validation::API_VERSION_2_5;
}

protected function tearDown()
protected function createValidator()
{
$this->context = null;
return new UserPasswordValidator($this->securityContext, $this->encoderFactory);
}

public function testPasswordIsValid()
protected function setUp()
{
$user = $this->createUser();
$securityContext = $this->createSecurityContext($user);
$this->securityContext = $this->createSecurityContext($user);
$this->encoder = $this->createPasswordEncoder();
$this->encoderFactory = $this->createEncoderFactory($this->encoder);

$encoder = $this->createPasswordEncoder(static::PASSWORD_VALID);
$encoderFactory = $this->createEncoderFactory($encoder);
parent::setUp();
}

public function testPasswordIsValid()
{
$constraint = new UserPassword(array(
'message' => 'myMessage',
));

$validator = new UserPasswordValidator($securityContext, $encoderFactory);
$validator->initialize($this->context);
$this->encoder->expects($this->once())
->method('isPasswordValid')
->with(static::PASSWORD, 'secret', static::SALT)
->will($this->returnValue(true));

$this
->context
->expects($this->never())
->method('addViolation')
;
$this->validator->validate('secret', $constraint);

$validator->validate('secret', new UserPassword());
$this->assertNoViolation();
}

public function testPasswordIsNotValid()
{
$user = $this->createUser();
$securityContext = $this->createSecurityContext($user);

$encoder = $this->createPasswordEncoder(static::PASSWORD_INVALID);
$encoderFactory = $this->createEncoderFactory($encoder);
$constraint = new UserPassword(array(
'message' => 'myMessage',
));

$validator = new UserPasswordValidator($securityContext, $encoderFactory);
$validator->initialize($this->context);
$this->encoder->expects($this->once())
->method('isPasswordValid')
->with(static::PASSWORD, 'secret', static::SALT)
->will($this->returnValue(false));

$this
->context
->expects($this->once())
->method('addViolation')
;
$this->validator->validate('secret', $constraint);

$validator->validate('secret', new UserPassword());
$this->assertViolation('myMessage');
}

/**
* @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
*/
public function testUserIsNotValid()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');

$user = $this->getMock('Foo\Bar\User');
$encoderFactory = $this->getMock('Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface');
$securityContext = $this->createSecurityContext($user);

$validator = new UserPasswordValidator($securityContext, $encoderFactory);
$validator->initialize($this->context);
$validator->validate('secret', new UserPassword());
$this->securityContext = $this->createSecurityContext($user);
$this->validator = $this->createValidator();
$this->validator->initialize($this->context);

$this->validator->validate('secret', new UserPassword());
}

protected function createUser()
{
$mock = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');

$mock
->expects($this->once())
->expects($this->any())
->method('getPassword')
->will($this->returnValue('s3Cr3t'))
->will($this->returnValue(static::PASSWORD))
;

$mock
->expects($this->once())
->expects($this->any())
->method('getSalt')
->will($this->returnValue('^S4lt$'))
->will($this->returnValue(static::SALT))
;

return $mock;
}

protected function createPasswordEncoder($isPasswordValid = true)
{
$mock = $this->getMock('Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface');

$mock
->expects($this->once())
->method('isPasswordValid')
->will($this->returnValue($isPasswordValid))
;

return $mock;
return $this->getMock('Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface');
}

protected function createEncoderFactory($encoder = null)
{
$mock = $this->getMock('Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface');

$mock
->expects($this->once())
->expects($this->any())
->method('getEncoder')
->will($this->returnValue($encoder))
;
Expand All @@ -135,7 +152,7 @@ protected function createSecurityContext($user = null)

$mock = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface');
$mock
->expects($this->once())
->expects($this->any())
->method('getToken')
->will($this->returnValue($token))
;
Expand All @@ -147,7 +164,7 @@ protected function createAuthenticationToken($user = null)
{
$mock = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
$mock
->expects($this->once())
->expects($this->any())
->method('getUser')
->will($this->returnValue($user))
;
Expand Down