fix: ensure ratelimit expiry is set every time

firebase · Jan 17, 2024 · 9cf1cbc · 9cf1cbc
1 parent 1b9e871
commit 9cf1cbc
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/CachedKeySet.php b/src/CachedKeySet.php
@@ -212,15 +212,24 @@ private function rateLimitExceeded(): bool
         }
 
         $cacheItem = $this->cache->getItem($this->rateLimitCacheKey);
+<<<<<<< Updated upstream
         if (!$cacheItem->isHit()) {
             $cacheItem->expiresAfter(60); // # of calls are cached each minute
+=======
+        if (!$cacheItem->isHit() || !is_array($cacheItemData = $cacheItem->get())) {
+            $cacheItemData = [
+                'callsPerMinute' => 0,
+                'expiry' => new \DateTime('+60 seconds', new \DateTimeZone('UTC')),
+            ];
+>>>>>>> Stashed changes
         }
 
-        $callsPerMinute = (int) $cacheItem->get();
-        if (++$callsPerMinute > $this->maxCallsPerMinute) {
+        if (++$cacheItemData['callsPerMinute'] > $this->maxCallsPerMinute) {
             return true;
         }
-        $cacheItem->set($callsPerMinute);
+
+        $cacheItem->set($cacheItemData);
+        $cacheItem->expiresAt($cacheItemData['expiry']);
         $this->cache->save($cacheItem);
         return false;
     }