diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Saltless Encoder Interface

Browse Source 
A new interface for all encoders that do not require a user-generated salt.
This commit is contained in:
Zan Baldwin 2017-09-26 14:54:54 +01:00
parent 07f79737bc
commit 7c4aa0bccb
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
View File

@ -19,8 +19,8 @@ use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder;
use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
use Symfony\Component\Security\Core\Encoder\SelfSaltingEncoderInterface;
use Symfony\Component\Security\Core\User\User;
/**
@ -117,9 +117,9 @@ EOF
$encoderFactory = $this->encoderFactory ?: $this->getContainer()->get('security.encoder_factory');
$encoder = $encoderFactory->getEncoder($userClass);
$bcryptWithoutEmptySalt = !$emptySalt && $encoder instanceof BCryptPasswordEncoder;
$saltlessWithoutEmptySalt = !$emptySalt && $encoder instanceof SelfSaltingEncoderInterface;
if ($bcryptWithoutEmptySalt) {
if ($saltlessWithoutEmptySalt) {
$emptySalt = true;
}
@ -161,8 +161,8 @@ EOF
if (!$emptySalt) {
$errorIo->note(sprintf('Make sure that your salt storage field fits the salt length: %s chars', strlen($salt)));
} elseif ($bcryptWithoutEmptySalt) {
$errorIo->note('Bcrypt encoder used: the encoder generated its own built-in salt.');
} elseif ($saltlessWithoutEmptySalt) {
$errorIo->note('Self-salting encoder used: the encoder generated its own built-in salt.');
}
$errorIo->success('Password encoding succeeded');

12
src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
View File

@ -120,13 +120,11 @@ class UserPasswordEncoderCommandTest extends WebTestCase
public function testEncodePasswordBcryptOutput()
{
$this->passwordEncoderCommandTester->execute(
array(
'command' => 'security:encode-password',
'password' => 'p@ssw0rd',
'user-class' => 'Custom\Class\Bcrypt\User',
)
);
$this->passwordEncoderCommandTester->execute(array(
'command' => 'security:encode-password',
'password' => 'p@ssw0rd',
'user-class' => 'Custom\Class\Bcrypt\User',
), array('interactive' => false));
$this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
}

2
src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
View File

@ -17,7 +17,7 @@ use Symfony\Component\Security\Core\Exception\BadCredentialsException;
* @author Elnur Abdurrakhimov <elnur@elnur.pro>
* @author Terje Bråten <terje@braten.be>
*/
class BCryptPasswordEncoder extends BasePasswordEncoder
class BCryptPasswordEncoder extends BasePasswordEncoder implements SelfSaltingEncoderInterface
{
const MAX_PASSWORD_LENGTH = 72;

22
src/Symfony/Component/Security/Core/Encoder/SelfSaltingEncoderInterface.php Normal file
View File

@ -0,0 +1,22 @@
<?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\Encoder;
/**
* SelfSaltingEncoderInterface is a marker interface for encoders that do not
* require a user-generated salt.
*
* @author Zan Baldwin <hello@zanbaldwin.com>
*/
interface SelfSaltingEncoderInterface
{
}