Don't allow true as algorithm config value

Jeroen van den Nieuwenhuisen · Jeroen van den Nieuwenhuisen · commit c2926d91d032 · 2019-12-02T21:52:00.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -399,7 +399,7 @@ private function addEncodersSection(ArrayNodeDefinition $rootNode)
                         ->performNoDeepMerging()
                         ->beforeNormalization()->ifString()->then(function ($v) { return ['algorithm' => $v]; })->end()
                         ->children()
-                            ->scalarNode('algorithm')->cannotBeEmpty()->end()
+                            ->scalarNode('algorithm')->cannotBeEmpty()->validate()->ifTrue()->thenInvalid('Invalid algorithm %s')->end()->end()
                             ->scalarNode('hash_algorithm')->info('Name of hashing algorithm for PBKDF2 (i.e. sha256, sha512, etc..) See hash_algos() for a list of supported algorithms.')->defaultValue('sha512')->end()
                             ->scalarNode('key_length')->defaultValue(40)->end()
                             ->booleanNode('ignore_case')->defaultFalse()->end()
diff --git a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
@@ -88,7 +88,7 @@ private function getEncoderConfigFromAlgorithm($config)
             $config['algorithm'] = SodiumPasswordEncoder::isSupported() ? 'sodium' : 'native';
         }
 
-        switch ((string) $config['algorithm']) {
+        switch ($config['algorithm']) {
             case 'plaintext':
                 return [
                     'class' => PlaintextPasswordEncoder::class,

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ private function getEncoderConfigFromAlgorithm($config)`
`88`	`88`	`$config['algorithm'] = SodiumPasswordEncoder::isSupported() ? 'sodium' : 'native';`
`89`	`89`	`}`
`90`	`90`
`91`		`- switch ((string) $config['algorithm']) {`
	`91`	`+ switch ($config['algorithm']) {`
`92`	`92`	`case 'plaintext':`
`93`	`93`	`return [`
`94`	`94`	`'class' => PlaintextPasswordEncoder::class,`