Prevent overwriting failure_handler in security configuration if set

hwi · Mar 1, 2024 · caf319a · caf319a
1 parent 78762b5
commit caf319a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 Changelog
 =========
 ## 2.2.1 (2024-03-xx)
-* Bugfix: Prevent overwriting `failure_path` in `AuthenticationFailureHandler` when connect functionality is not enabled
+* Bugfix: Prevent overwriting `failure_path` in `AuthenticationFailureHandler` when connect functionality is not enabled,
+* Bugfix: Prevent overwriting `failure_handler` in security configuration if set,
 
 ## 2.2.0 (2024-02-28)
 * BC Break: Dropped support for PHP 7.4 & 8.0,

diff --git a/src/DependencyInjection/Security/Factory/OAuthAuthenticatorFactory.php b/src/DependencyInjection/Security/Factory/OAuthAuthenticatorFactory.php
@@ -138,6 +138,10 @@ public function getFirewallNames(): \ArrayIterator
     protected function createAuthenticationFailureHandler(ContainerBuilder $container, string $id, array $config): string
     {
         $id = $this->getFailureHandlerId($id);
+        if ($container->has($id)) {
+            return $id;
+        }
+
         $options = array_intersect_key($config, $this->defaultFailureHandlerOptions);
 
         $failureHandler = $container->setDefinition($id, new ChildDefinition('security.authentication.custom_failure_handler'));