Cache problem fix

CTFd/api/v1/scoreboard.py

@@ -3,7 +3,7 @@
 from flask_restx import Namespace, Resource
 from sqlalchemy import select
 
-from CTFd.cache import cache, make_cache_key
+from CTFd.cache import cache, make_cache_key, make_cache_key_with_args
 from CTFd.models import Awards, Solves, Users, db
 from CTFd.utils import get_config
 from CTFd.utils.dates import isoformat, unix_time_to_utc
@@ -82,7 +82,7 @@ def get(self):
 class ScoreboardDetail(Resource):
     @check_account_visibility
     @check_score_visibility
-    @cache.cached(timeout=60, key_prefix=make_cache_key)
+    @cache.cached(timeout=60, key_prefix=make_cache_key_with_args)
     def get(self, count):
         response = {}
 

CTFd/cache/__init__.py

@@ -52,6 +52,22 @@ def make_cache_key(path=None, key_prefix="view/%s"):
     return cache_key
 
 
+def make_cache_key_with_args(path=None, key_prefix="view/%s", view_args=None):
+    """
+    This function ensures that view arguments are taken into account when generating a cache key
+    :param path:
+    :param key_prefix:
+    :return:
+    """
+    if path is None:
+        path = request.endpoint
+    if view_args is None:
+        view_args = request.view_args
+    for k, v in view_args.items():
+        path += f'_{k}_{v}'
+    return make_cache_key(path, key_prefix)
+
+
 def clear_config():
     from CTFd.utils import _get_config, get_app_config
 
@@ -91,7 +107,7 @@ def clear_standings():
 
     # Clear out HTTP request responses
     cache.delete(make_cache_key(path=api.name + "." + ScoreboardList.endpoint))
-    cache.delete(make_cache_key(path=api.name + "." + ScoreboardDetail.endpoint))
+    cache.delete(make_cache_key_with_args(path=api.name + "." + ScoreboardDetail.endpoint, view_args={"count": 10}))
     cache.delete_memoized(ScoreboardList.get)
 
     # Clear out scoreboard templates

tests/api/v1/test_scoreboard.py

@@ -36,13 +36,13 @@ def test_scoreboard_is_cached():
         with login_as_user(app, "user1") as client:
             # No cached data
             assert app.cache.get("view/api.scoreboard_scoreboard_list") is None
-            assert app.cache.get("view/api.scoreboard_scoreboard_detail") is None
+            assert app.cache.get("view/api.scoreboard_scoreboard_detail_count_10") is None
 
             # Load and check cached data
             client.get("/api/v1/scoreboard")
             assert app.cache.get("view/api.scoreboard_scoreboard_list")
             client.get("/api/v1/scoreboard/top/10")
-            assert app.cache.get("view/api.scoreboard_scoreboard_detail")
+            assert app.cache.get("view/api.scoreboard_scoreboard_detail_count_10")
 
             # Check scoreboard page
             assert (
@@ -55,7 +55,7 @@ def test_scoreboard_is_cached():
             # Empty standings and check that the cached data is gone
             clear_standings()
             assert app.cache.get("view/api.scoreboard_scoreboard_list") is None
-            assert app.cache.get("view/api.scoreboard_scoreboard_detail") is None
+            assert app.cache.get("view/api.scoreboard_scoreboard_detail_count_10") is None
             assert (
                 app.cache.get(make_template_fragment_key("public_scoreboard_table"))
                 is None