Only set cache defaults on cacheable pages

canonical · Mar 29, 2021 · 4ce7a8a · 4ce7a8a
1 parent fbef41e
commit 4ce7a8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/canonicalwebteam/flask_base/app.py b/canonicalwebteam/flask_base/app.py
@@ -44,9 +44,13 @@ def set_cache_control_headers(response):
         # Our status endpoints need to be uncached
         # to report accurate information at all times
         response.cache_control.no_store = True
-        response.cache_control.max_age = 0
 
-    elif response.status_code == 200:
+    elif (
+        response.status_code == 200
+        and not response.cache_control.no_store
+        and not response.cache_control.no_cache
+        and not response.cache_control.private
+    ):
         # Normal responses, where the cache-control object hasn't
         # been independently modified, should:
 

diff --git a/tests/test_flask_base.py b/tests/test_flask_base.py
@@ -125,9 +125,7 @@ def test_status_endpoints(self):
             response = client.get("_status/check")
             self.assertEqual(response.status_code, 200)
             self.assertEqual(response.data.decode(), "a-build-id")
-            self.assertEqual(
-                response.headers.get("Cache-Control"), "no-store, max-age=0"
-            )
+            self.assertEqual(response.headers.get("Cache-Control"), "no-store")
 
     def test_redirects_deleted(self):
         """