bug #51858 [Security] Fix resetting traceable listeners (chalasr)

fabpot · fabpot · commit adcd3d06d078 · 2023-10-06T16:05:19.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Security] Fix resetting traceable listeners | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #49532 | License | MIT Commits ------- 98c41e0 [Security] Fix resetting traceable listeners
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
@@ -17,13 +17,14 @@
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticatorManagerListener;
 use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Firewall collecting called security listeners and authenticators.
  *
  * @author Robin Chalas <robin.chalas@gmail.com>
  */
-final class TraceableFirewallListener extends FirewallListener
+final class TraceableFirewallListener extends FirewallListener implements ResetInterface
 {
     private $wrappedListeners = [];
     private $authenticatorsInfo = [];
@@ -38,6 +39,12 @@ public function getAuthenticatorsInfo(): array
         return $this->authenticatorsInfo;
     }
 
+    public function reset(): void
+    {
+        $this->wrappedListeners = [];
+        $this->authenticatorsInfo = [];
+    }
+
     protected function callListeners(RequestEvent $event, iterable $listeners)
     {
         $wrappedListeners = [];
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -544,6 +544,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
                     ->register('debug.security.firewall.authenticator.'.$id, TraceableAuthenticatorManagerListener::class)
                     ->setDecoratedService('security.firewall.authenticator.'.$id)
                     ->setArguments([new Reference('debug.security.firewall.authenticator.'.$id.'.inner')])
+                    ->addTag('kernel.reset', ['method' => 'reset'])
                 ;
             }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_debug.php
@@ -36,6 +36,7 @@
                 service('security.logout_url_generator'),
             ])
             ->tag('kernel.event_subscriber')
+            ->tag('kernel.reset', ['method' => 'reset'])
         ->alias('security.firewall', 'debug.security.firewall')
     ;
 };
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -29,7 +29,8 @@
         "symfony/security-core": "^5.4|^6.0",
         "symfony/security-csrf": "^4.4|^5.0|^6.0",
         "symfony/security-guard": "^5.3",
-        "symfony/security-http": "^5.4.20|~6.0.20|~6.1.12|^6.2.6"
+        "symfony/security-http": "^5.4.30|^6.3.6",
+        "symfony/service-contracts": "^1.10|^2|^3"
     },
     "require-dev": {
         "doctrine/annotations": "^1.10.4|^2",
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticatorManagerListener.php b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticatorManagerListener.php
@@ -16,13 +16,14 @@
 use Symfony\Component\Security\Http\Firewall\AbstractListener;
 use Symfony\Component\Security\Http\Firewall\AuthenticatorManagerListener;
 use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Decorates the AuthenticatorManagerListener to collect information about security authenticators.
  *
  * @author Robin Chalas <robin.chalas@gmail.com>
  */
-final class TraceableAuthenticatorManagerListener extends AbstractListener
+final class TraceableAuthenticatorManagerListener extends AbstractListener implements ResetInterface
 {
     private $authenticationManagerListener;
     private $authenticatorsInfo = [];
@@ -78,4 +79,9 @@ public function getAuthenticatorsInfo(): array
     {
         return $this->authenticatorsInfo;
     }
+
+    public function reset(): void
+    {
+        $this->authenticatorsInfo = [];
+    }
 }
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
@@ -18,12 +18,13 @@
     "require": {
         "php": ">=7.2.5",
         "symfony/deprecation-contracts": "^2.1|^3",
-        "symfony/security-core": "^5.4.19|~6.0.19|~6.1.11|^6.2.5",
         "symfony/http-foundation": "^5.3|^6.0",
         "symfony/http-kernel": "^5.3|^6.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php80": "^1.16",
-        "symfony/property-access": "^4.4|^5.0|^6.0"
+        "symfony/property-access": "^4.4|^5.0|^6.0",
+        "symfony/security-core": "^5.4.19|~6.0.19|~6.1.11|^6.2.5",
+        "symfony/service-contracts": "^1.10|^2|^3"
     },
     "require-dev": {
         "symfony/cache": "^4.4|^5.0|^6.0",

Original file line number	Diff line number	Diff line change
`@@ -544,6 +544,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $`
`544`	`544`	`->register('debug.security.firewall.authenticator.'.$id, TraceableAuthenticatorManagerListener::class)`
`545`	`545`	`->setDecoratedService('security.firewall.authenticator.'.$id)`
`546`	`546`	`->setArguments([new Reference('debug.security.firewall.authenticator.'.$id.'.inner')])`
	`547`	`+ ->addTag('kernel.reset', ['method' => 'reset'])`
`547`	`548`	`;`
`548`	`549`	`}`
`549`	`550`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`service('security.logout_url_generator'),`
`37`	`37`	`])`
`38`	`38`	`->tag('kernel.event_subscriber')`
	`39`	`+ ->tag('kernel.reset', ['method' => 'reset'])`
`39`	`40`	`->alias('security.firewall', 'debug.security.firewall')`
`40`	`41`	`;`
`41`	`42`	`};`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,14 @@`
`16`	`16`	`use Symfony\Component\Security\Http\Firewall\AbstractListener;`
`17`	`17`	`use Symfony\Component\Security\Http\Firewall\AuthenticatorManagerListener;`
`18`	`18`	`use Symfony\Component\VarDumper\Caster\ClassStub;`
	`19`	`+use Symfony\Contracts\Service\ResetInterface;`
`19`	`20`
`20`	`21`	`/**`
`21`	`22`	`* Decorates the AuthenticatorManagerListener to collect information about security authenticators.`
`22`	`23`	`*`
`23`	`24`	`* @author Robin Chalas <robin.chalas@gmail.com>`
`24`	`25`	`*/`
`25`		`-final class TraceableAuthenticatorManagerListener extends AbstractListener`
	`26`	`+final class TraceableAuthenticatorManagerListener extends AbstractListener implements ResetInterface`
`26`	`27`	`{`
`27`	`28`	`private $authenticationManagerListener;`
`28`	`29`	`private $authenticatorsInfo = [];`
`@@ -78,4 +79,9 @@ public function getAuthenticatorsInfo(): array`
`78`	`79`	`{`
`79`	`80`	`return $this->authenticatorsInfo;`
`80`	`81`	`}`
	`82`	`+`
	`83`	`+ public function reset(): void`
	`84`	`+ {`
	`85`	`+ $this->authenticatorsInfo = [];`
	`86`	`+ }`
`81`	`87`	`}`