Don't create RateLimiterManager before the event fires.

EreMaijala · May 30, 2024 · 7cb5b66 · 7cb5b66
1 parent 49e57f4
commit 7cb5b66
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/module/VuFind/src/VuFind/Bootstrapper.php b/module/VuFind/src/VuFind/Bootstrapper.php
@@ -385,11 +385,12 @@ protected function initRateLimiter(): void
         if (PHP_SAPI === 'cli') {
             return;
         }
-        $rateLimiterManager = $this->container->get(\VuFind\RateLimiter\RateLimiterManager::class);
-        if (!$rateLimiterManager->isEnabled()) {
-            return;
-        }
-        $callback = function ($event) use ($rateLimiterManager) {
+        $callback = function ($event) {
+            // Create rate limiter manager here so that we don't e.g. initialize the session too early:
+            $rateLimiterManager = $this->container->get(\VuFind\RateLimiter\RateLimiterManager::class);
+            if (!$rateLimiterManager->isEnabled()) {
+                return;
+            }
             $result = $rateLimiterManager->check($event);
             if (!$result['allow']) {
                 $response = $event->getResponse();