minor #31690 [Security] Remove deprecated encoders (chalasr)

This PR was merged into the 5.0-dev branch. Discussion ---------- [Security] Remove deprecated encoders | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | TODO Commits ------- 795f0fb [Security] Remove deprecated encoders
symfony · May 29, 2019 · b9dca2e · b9dca2e
2 parents d5f0a26 + 795f0fb
commit b9dca2e
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 834 deletions.
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -29,7 +29,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\NativePasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\SodiumPasswordEncoder;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
@@ -556,38 +555,6 @@ private function createEncoder($config, ContainerBuilder $container)
             ];
         }
 
-        // bcrypt encoder
-        if ('bcrypt' === $config['algorithm']) {
-            @trigger_error('Configuring an encoder with "bcrypt" as algorithm is deprecated since Symfony 4.3, use "auto" instead.', E_USER_DEPRECATED);
-
-            return [
-                'class' => 'Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder',
-                'arguments' => [$config['cost'] ?? 13],
-            ];
-        }
-
-        // Argon2i encoder
-        if ('argon2i' === $config['algorithm']) {
-            @trigger_error('Configuring an encoder with "argon2i" as algorithm is deprecated since Symfony 4.3, use "auto" instead.', E_USER_DEPRECATED);
-
-            if (!Argon2iPasswordEncoder::isSupported()) {
-                if (\extension_loaded('sodium') && !\defined('SODIUM_CRYPTO_PWHASH_SALTBYTES')) {
-                    throw new InvalidConfigurationException('The installed libsodium version does not have support for Argon2i. Use "auto" instead.');
-                }
-
-                throw new InvalidConfigurationException('Argon2i algorithm is not supported. Install the libsodium extension or use "auto" instead.');
-            }
-
-            return [
-                'class' => 'Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder',
-                'arguments' => [
-                    $config['memory_cost'],
-                    $config['time_cost'],
-                    $config['threads'],
-                ],
-            ];
-        }
-
         if ('native' === $config['algorithm']) {
             return [
                 'class' => NativePasswordEncoder::class,

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
-use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\SodiumPasswordEncoder;
 
 abstract class CompleteConfigurationTest extends TestCase
@@ -377,116 +376,6 @@ public function testEncodersWithLibsodium()
         ]], $container->getDefinition('security.encoder_factory.generic')->getArguments());
     }
 
-    /**
-     * @group legacy
-     *
-     * @expectedDeprecation Configuring an encoder with "argon2i" as algorithm is deprecated since Symfony 4.3, use "auto" instead.
-     */
-    public function testEncodersWithArgon2i()
-    {
-        if (!Argon2iPasswordEncoder::isSupported()) {
-            $this->markTestSkipped('Argon2i algorithm is not supported.');
-        }
-
-        $container = $this->getContainer('argon2i_encoder');
-
-        $this->assertEquals([[
-            'JMS\FooBundle\Entity\User1' => [
-                'class' => 'Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder',
-                'arguments' => [false],
-            ],
-            'JMS\FooBundle\Entity\User2' => [
-                'algorithm' => 'sha1',
-                'encode_as_base64' => false,
-                'iterations' => 5,
-                'hash_algorithm' => 'sha512',
-                'key_length' => 40,
-                'ignore_case' => false,
-                'cost' => null,
-                'memory_cost' => null,
-                'time_cost' => null,
-                'threads' => null,
-            ],
-            'JMS\FooBundle\Entity\User3' => [
-                'algorithm' => 'md5',
-                'hash_algorithm' => 'sha512',
-                'key_length' => 40,
-                'ignore_case' => false,
-                'encode_as_base64' => true,
-                'iterations' => 5000,
-                'cost' => null,
-                'memory_cost' => null,
-                'time_cost' => null,
-                'threads' => null,
-            ],
-            'JMS\FooBundle\Entity\User4' => new Reference('security.encoder.foo'),
-            'JMS\FooBundle\Entity\User5' => [
-                'class' => 'Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder',
-                'arguments' => ['sha1', false, 5, 30],
-            ],
-            'JMS\FooBundle\Entity\User6' => [
-                'class' => 'Symfony\Component\Security\Core\Encoder\NativePasswordEncoder',
-                'arguments' => [8, 102400, 15],
-            ],
-            'JMS\FooBundle\Entity\User7' => [
-                'class' => 'Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder',
-                'arguments' => [256, 1, 2],
-            ],
-        ]], $container->getDefinition('security.encoder_factory.generic')->getArguments());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testEncodersWithBCrypt()
-    {
-        $container = $this->getContainer('bcrypt_encoder');
-
-        $this->assertEquals([[
-            'JMS\FooBundle\Entity\User1' => [
-                'class' => 'Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder',
-                'arguments' => [false],
-            ],
-            'JMS\FooBundle\Entity\User2' => [
-                'algorithm' => 'sha1',
-                'encode_as_base64' => false,
-                'iterations' => 5,
-                'hash_algorithm' => 'sha512',
-                'key_length' => 40,
-                'ignore_case' => false,
-                'cost' => null,
-                'memory_cost' => null,
-                'time_cost' => null,
-                'threads' => null,
-            ],
-            'JMS\FooBundle\Entity\User3' => [
-                'algorithm' => 'md5',
-                'hash_algorithm' => 'sha512',
-                'key_length' => 40,
-                'ignore_case' => false,
-                'encode_as_base64' => true,
-                'iterations' => 5000,
-                'cost' => null,
-                'memory_cost' => null,
-                'time_cost' => null,
-                'threads' => null,
-            ],
-            'JMS\FooBundle\Entity\User4' => new Reference('security.encoder.foo'),
-            'JMS\FooBundle\Entity\User5' => [
-                'class' => 'Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder',
-                'arguments' => ['sha1', false, 5, 30],
-            ],
-            'JMS\FooBundle\Entity\User6' => [
-                'class' => 'Symfony\Component\Security\Core\Encoder\NativePasswordEncoder',
-                'arguments' => [8, 102400, 15],
-            ],
-            'JMS\FooBundle\Entity\User7' => [
-                'class' => 'Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder',
-                'arguments' => [15],
-            ],
-        ]], $container->getDefinition('security.encoder_factory.generic')->getArguments());
-    }
-
     public function testRememberMeThrowExceptionsDefault()
     {
         $container = $this->getContainer('container1');

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/argon2i_encoder.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/argon2i_encoder.php
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/bcrypt_encoder.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/bcrypt_encoder.php
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/argon2i_encoder.xml
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/bcrypt_encoder.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/bcrypt_encoder.xml
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/argon2i_encoder.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/argon2i_encoder.yml
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/bcrypt_encoder.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/bcrypt_encoder.yml
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -15,8 +15,6 @@
 use Symfony\Bundle\SecurityBundle\Command\UserPasswordEncoderCommand;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
-use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use Symfony\Component\Security\Core\Encoder\NativePasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder;
@@ -55,51 +53,6 @@ public function testEncodeNoPasswordNoInteraction()
         $this->assertEquals($statusCode, 1);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testEncodePasswordBcrypt()
-    {
-        $this->setupBcrypt();
-        $this->passwordEncoderCommandTester->execute([
-            'command' => 'security:encode-password',
-            'password' => 'password',
-            'user-class' => 'Custom\Class\Bcrypt\User',
-        ], ['interactive' => false]);
-
-        $output = $this->passwordEncoderCommandTester->getDisplay();
-        $this->assertContains('Password encoding succeeded', $output);
-
-        $encoder = new BCryptPasswordEncoder(17);
-        preg_match('# Encoded password\s{1,}([\w+\/$.]+={0,2})\s+#', $output, $matches);
-        $hash = $matches[1];
-        $this->assertTrue($encoder->isPasswordValid($hash, 'password', null));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testEncodePasswordArgon2i()
-    {
-        if (!Argon2iPasswordEncoder::isSupported()) {
-            $this->markTestSkipped('Argon2i algorithm not available.');
-        }
-        $this->setupArgon2i();
-        $this->passwordEncoderCommandTester->execute([
-            'command' => 'security:encode-password',
-            'password' => 'password',
-            'user-class' => 'Custom\Class\Argon2i\User',
-        ], ['interactive' => false]);
-
-        $output = $this->passwordEncoderCommandTester->getDisplay();
-        $this->assertContains('Password encoding succeeded', $output);
-
-        $encoder = new Argon2iPasswordEncoder();
-        preg_match('#  Encoded password\s+(\$argon2id?\$[\w,=\$+\/]+={0,2})\s+#', $output, $matches);
-        $hash = $matches[1];
-        $this->assertTrue($encoder->isPasswordValid($hash, 'password', null));
-    }
-
     public function testEncodePasswordNative()
     {
         $this->passwordEncoderCommandTester->execute([
@@ -195,25 +148,6 @@ public function testEncodePasswordNativeOutput()
         $this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testEncodePasswordArgon2iOutput()
-    {
-        if (!Argon2iPasswordEncoder::isSupported()) {
-            $this->markTestSkipped('Argon2i algorithm not available.');
-        }
-
-        $this->setupArgon2i();
-        $this->passwordEncoderCommandTester->execute([
-            'command' => 'security:encode-password',
-            'password' => 'p@ssw0rd',
-            'user-class' => 'Custom\Class\Argon2i\User',
-        ], ['interactive' => false]);
-
-        $this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay());
-    }
-
     public function testEncodePasswordSodiumOutput()
     {
         if (!SodiumPasswordEncoder::isSupported()) {
@@ -310,32 +244,6 @@ protected function tearDown()
         $this->passwordEncoderCommandTester = null;
     }
 
-    private function setupArgon2i()
-    {
-        putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));
-        $kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2i.yml']);
-        $kernel->boot();
-
-        $application = new Application($kernel);
-
-        $passwordEncoderCommand = $application->get('security:encode-password');
-
-        $this->passwordEncoderCommandTester = new CommandTester($passwordEncoderCommand);
-    }
-
-    private function setupBcrypt()
-    {
-        putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));
-        $kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'bcrypt.yml']);
-        $kernel->boot();
-
-        $application = new Application($kernel);
-
-        $passwordEncoderCommand = $application->get('security:encode-password');
-
-        $this->passwordEncoderCommandTester = new CommandTester($passwordEncoderCommand);
-    }
-
     private function setupSodium()
     {
         putenv('COLUMNS='.(119 + \strlen(PHP_EOL)));

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/argon2i.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/argon2i.yml
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bcrypt.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bcrypt.yml