From 67a2d43f4c270a33112e36cb26704cf995bcd6e6 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Mon, 2 Jul 2018 17:09:51 -0400
Subject: Bug 1472755 - False positives on IP blocking logic

---
 Bugzilla/Memcached.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Memcached.pm b/Bugzilla/Memcached.pm
index d34aaa595..f3272c194 100644
--- a/Bugzilla/Memcached.pm
+++ b/Bugzilla/Memcached.pm
@@ -227,11 +227,12 @@ sub should_rate_limit {
     my $prefix    = RATE_LIMIT_PREFIX . $name . ':';
     my $memcached = $self->{memcached};
 
+    return 0 unless $name;
     return 0 unless $memcached;
 
     $tries //= 3;
 
-    for (0 .. $tries) {
+    for my $try (0 .. $tries) {
         my $now = time;
         my ($key, @keys) = map { $prefix . ( $now - $_ ) } 0 .. $rate_seconds;
         $memcached->add($key, 0, $rate_seconds+1);
@@ -240,8 +241,9 @@ sub should_rate_limit {
         $tokens->{$key} = $cas->[1]++;
         return 1 if sum(values %$tokens) >= $rate_max;
         return 0 if $memcached->cas($key, @$cas, $rate_seconds+1);
+        WARN("retry for $prefix (try $try of $tries)");
     }
-    return 1;
+    return 0;
 }
 
 sub clear_all {
-- 
cgit v1.2.3-24-g4f1b