Allow configuration of NotCompromisedPassword API endpoint in Framewo…

…rkBundle
symfony · Apr 10, 2019 · c372b16 · c372b16
1 parent b35d049
commit c372b16
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -835,9 +835,19 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
                                 ->end()
                             ->end()
                         ->end()
-                        ->booleanNode('disable_not_compromised_password')
-                            ->defaultFalse()
-                            ->info('Disable NotCompromisedPassword Validator: the value will always be valid.')
+                        ->arrayNode('not_compromised_password')
+                            ->addDefaultsIfNotSet()
+                            ->info('not-compromised password validator configuration')
+                            ->children()
+                                ->booleanNode('enabled')
+                                    ->defaultTrue()
+                                    ->info('Enable NotCompromisedPassword Validator. When disabled, the value will always be valid.')
+                                ->end()
+                                ->scalarNode('endpoint')
+                                    ->defaultValue('https://api.pwnedpasswords.com/range/%s')
+                                    ->info('API endpoint for NotCompromisedPassword Validator.')
+                                ->end()
+                            ->end()
                         ->end()
                         ->arrayNode('auto_mapping')
                             ->useAttributeAsKey('namespace')

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1249,7 +1249,8 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
 
         $container
             ->getDefinition('validator.not_compromised_password')
-            ->setArgument(2, $config['disable_not_compromised_password'])
+            ->setArgument(2, !$config['not_compromised_password']['enabled'])
+            ->setArgument(3, $config['not_compromised_password']['endpoint'])
         ;
     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -235,7 +235,10 @@ protected static function getBundleDefaultConfig()
                     'paths' => [],
                 ],
                 'auto_mapping' => [],
-                'disable_not_compromised_password' => false,
+                'not_compromised_password' => [
+                    'enabled' => true,
+                    'endpoint' => 'https://api.pwnedpasswords.com/range/%s',
+                ],
             ],
             'annotations' => [
                 'cache' => 'php_array',