Skip to content

Commit 7f101d1

Browse files
authored
[ENG-11824] fix(cors): always send Cache-Control: no-store even without an Origin header (#411)
## Ticket https://openscience.atlassian.net/browse/ENG-11824
1 parent f7b293c commit 7f101d1

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

‎mfr/server/handlers/core.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ def _cross_origin_is_allowed(self):
4747
return False
4848

4949
def set_default_headers(self):
50+
# Always disable caching, even when no ``Origin`` header is present (e.g. a plain
51+
# ``<iframe src="...">`` navigation). Without this, responses carry no caching
52+
# directive at all in that case, leaving any intermediary (CDN, proxy, browser) free
53+
# to apply its own heuristic caching to a render response.
54+
self.set_header('Cache-control', 'no-store, no-cache, must-revalidate, max-age=0')
55+
5056
if not self.request.headers.get('Origin'):
5157
return
5258

@@ -70,7 +76,6 @@ def set_default_headers(self):
7076
self.set_header('Access-Control-Allow-Credentials', 'true')
7177
self.set_header('Access-Control-Allow-Headers', ', '.join(CORS_ACCEPT_HEADERS))
7278
self.set_header('Access-Control-Expose-Headers', ', '.join(CORS_EXPOSE_HEADERS))
73-
self.set_header('Cache-control', 'no-store, no-cache, must-revalidate, max-age=0')
7479

7580
def options(self):
7681
self.set_status(204)

‎tests/server/handlers/test_cors.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,3 +166,12 @@ def test_no_origin_means_no_cors(self):
166166
assert 'Access-Control-Allow-Credentials' not in self.handler.headers
167167
assert 'Access-Control-Allow-Headers' not in self.handler.headers
168168
assert 'Access-Control-Expose-Headers' not in self.handler.headers
169+
170+
@testing.gen_test
171+
def test_no_origin_still_disables_caching(self):
172+
for method in ('OPTIONS', 'HEAD' 'GET', 'POST', 'PUT', 'PATCH', 'DELETE'):
173+
self.handler.request = MockRequest(
174+
method=method,
175+
)
176+
self.handler.set_default_headers()
177+
assert self.handler.headers['Cache-control'] == 'no-store, no-cache, must-revalidate, max-age=0'

0 commit comments

Comments
 (0)