merged branch fabpot/firewall-leaks (PR #8946)

fabpot · fabpot · commit 535cf50c3a95 · 2013-09-06T20:18:09.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [Security] fixed a leak in the ContextListener | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Trying to fix leaks when using the same Kernel to handle several requests in a row without resetting the Container or shutting down the Kernel. Commits ------- 899f176 [Security] fixed a leak in ExceptionListener 2fd8a7a [Security] fixed a leak in the ContextListener
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -38,6 +38,7 @@ class ContextListener implements ListenerInterface
     private $logger;
     private $userProviders;
     private $dispatcher;
+    private $registered;
 
     public function __construct(SecurityContextInterface $context, array $userProviders, $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
     {
@@ -65,8 +66,9 @@ public function __construct(SecurityContextInterface $context, array $userProvid
      */
     public function handle(GetResponseEvent $event)
     {
-        if (null !== $this->dispatcher && HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
+        if (!$this->registered && null !== $this->dispatcher && HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
             $this->dispatcher->addListener(KernelEvents::RESPONSE, array($this, 'onKernelResponse'));
+            $this->registered = true;
         }
 
         $request = $event->getRequest();
diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
@@ -76,6 +76,10 @@ public function register(EventDispatcherInterface $dispatcher)
      */
     public function onKernelException(GetResponseForExceptionEvent $event)
     {
+        // we need to remove ourselves as the exception listener can be
+        // different depending on the Request
+        $event->getDispatcher()->removeListener(KernelEvents::EXCEPTION, array($this, 'onKernelException'));
+
         $exception = $event->getException();
         $request = $event->getRequest();
 

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ class ContextListener implements ListenerInterface`
`38`	`38`	`private $logger;`
`39`	`39`	`private $userProviders;`
`40`	`40`	`private $dispatcher;`
	`41`	`+ private $registered;`
`41`	`42`
`42`	`43`	`public function __construct(SecurityContextInterface $context, array $userProviders, $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)`
`43`	`44`	`{`
`@@ -65,8 +66,9 @@ public function __construct(SecurityContextInterface $context, array $userProvid`
`65`	`66`	`*/`
`66`	`67`	`public function handle(GetResponseEvent $event)`
`67`	`68`	`{`
`68`		`- if (null !== $this->dispatcher && HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {`
	`69`	`+ if (!$this->registered && null !== $this->dispatcher && HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {`
`69`	`70`	`$this->dispatcher->addListener(KernelEvents::RESPONSE, array($this, 'onKernelResponse'));`
	`71`	`+ $this->registered = true;`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`$request = $event->getRequest();`