Merge branch 'master' into fix_2fa

ocadotechnology · Sep 19, 2023 · 1de6a31 · 1de6a31
2 parents f8a140d + ed17db7
commit 1de6a31
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/portal/__init__.py b/portal/__init__.py
@@ -1 +1 @@
-__version__ = "6.36.0"
+__version__ = "6.36.1"
diff --git a/portal/helpers/ratelimit.py b/portal/helpers/ratelimit.py
@@ -161,7 +161,16 @@ def get_usage(request, group=None, fn=None, key=None, rate=None, method=ALL, inc
 
     cache_name = getattr(settings, "RATELIMIT_USE_CACHE", "default")
     cache = caches[cache_name]
-    cache_key = _make_cache_key(group, window, rate, value, method)
+
+    if value == "":
+        return {
+            "count": 0,
+            "limit": 0,
+            "should_limit": False,
+            "time_left": -1,
+        }
+    else:
+        cache_key = _make_cache_key(group, window, rate, value, method)
 
     count = None
     added = cache.add(cache_key, initial_value, period + EXPIRATION_FUDGE)