[5.2] reset the attempts on lockout to avoid race condition re-lockout

src/Illuminate/Cache/RateLimiter.php

@@ -41,6 +41,8 @@ public function tooManyAttempts($key, $maxAttempts, $decayMinutes = 1)
         if ($this->attempts($key) > $maxAttempts) {
             $this->cache->add($key.':lockout', time() + ($decayMinutes * 60), $decayMinutes);
 
+            $this->resetAttempts($key);
+
             return true;
         }
 
@@ -72,6 +74,17 @@ public function attempts($key)
         return $this->cache->get($key, 0);
     }
 
+    /**
+     * Reset the number of attempts for the given key.
+     *
+     * @param  string  $key
+     * @return mixed
+     */
+    public function resetAttempts($key)
+    {
+        return $this->cache->forget($key);
+    }
+
     /**
      * Get the number of retries left for the given key.
      *
@@ -94,7 +107,7 @@ public function retriesLeft($key, $maxAttempts)
      */
     public function clear($key)
     {
-        $this->cache->forget($key);
+        $this->resetAttempts($key);
 
         $this->cache->forget($key.':lockout');
     }

tests/Cache/CacheRateLimiterTest.php

@@ -27,6 +27,7 @@ public function testTooManyAttemptsReturnsTrueIfMaxAttemptsExceeded()
         $cache->shouldReceive('get')->once()->with('key', 0)->andReturn(10);
         $cache->shouldReceive('has')->once()->with('key:lockout')->andReturn(false);
         $cache->shouldReceive('add')->once()->with('key:lockout', m::type('int'), 1);
+        $cache->shouldReceive('forget')->once()->with('key');
         $rateLimiter = new RateLimiter($cache);
 
         $this->assertTrue($rateLimiter->tooManyAttempts('key', 1, 1));