Remove sorting of security listeners at runtime

scheb · scheb · commit 29a751cacae5 · 2021-10-17T17:49:33.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -416,6 +416,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
                 'csrf_token_id' => $firewall['logout']['csrf_token_id'],
                 'logout_path' => $firewall['logout']['path'],
             ]);
+            $listeners[] = new Reference($logoutListenerId);
 
             // add default logout listener
             if (isset($firewall['logout']['success_handler'])) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -206,6 +206,7 @@ public function testFirewalls()
                 'security.channel_listener',
                 'security.firewall.authenticator.secure',
                 'security.authentication.switchuser_listener.secure',
+                'security.logout_listener.secure',
                 'security.access_listener',
             ],
             [
@@ -335,6 +336,7 @@ public function testLegacyFirewalls()
                 'security.authentication.listener.rememberme.secure',
                 'security.authentication.listener.anonymous.secure',
                 'security.authentication.switchuser_listener.secure',
+                'security.logout_listener.secure',
                 'security.access_listener',
             ],
             [
diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
@@ -52,38 +52,13 @@ public function onKernelRequest(RequestEvent $event)
 
         $authenticationListeners = $listeners[0];
         $exceptionListener = $listeners[1];
-        $logoutListener = $listeners[2];
 
         if (null !== $exceptionListener) {
             $this->exceptionListeners[$event->getRequest()] = $exceptionListener;
             $exceptionListener->register($this->dispatcher);
         }
 
-        // Authentication listeners are pre-sorted by SortFirewallListenersPass
-        $authenticationListeners = function () use ($authenticationListeners, $logoutListener) {
-            if (null !== $logoutListener) {
-                $logoutListenerPriority = $this->getListenerPriority($logoutListener);
-            }
-
-            foreach ($authenticationListeners as $listener) {
-                $listenerPriority = $this->getListenerPriority($listener);
-
-                // Yielding the LogoutListener at the correct position
-                if (null !== $logoutListener && $listenerPriority < $logoutListenerPriority) {
-                    yield $logoutListener;
-                    $logoutListener = null;
-                }
-
-                yield $listener;
-            }
-
-            // When LogoutListener has the lowest priority of all listeners
-            if (null !== $logoutListener) {
-                yield $logoutListener;
-            }
-        };
-
-        $this->callListeners($event, $authenticationListeners());
+        $this->callListeners($event, $authenticationListeners);
     }
 
     public function onKernelFinishRequest(FinishRequestEvent $event)
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
@@ -35,7 +35,7 @@
     },
     "conflict": {
         "symfony/event-dispatcher": "<4.3",
-        "symfony/security-bundle": "<5.3",
+        "symfony/security-bundle": "<5.4",
         "symfony/security-csrf": "<4.4"
     },
     "suggest": {
