Skip to content

Commit 08fd2b3

Browse files
authored
Merge pull request #413 from CenterForOpenScience/revert-411-fix/ENG-11824
Revert "fix(cors): always send Cache-Control: no-store even without an Origin…"
2 parents 7f101d1 + f0e2ffa commit 08fd2b3

2 files changed

Lines changed: 1 addition & 15 deletions

File tree

‎mfr/server/handlers/core.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ 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-
5650
if not self.request.headers.get('Origin'):
5751
return
5852

@@ -76,6 +70,7 @@ def set_default_headers(self):
7670
self.set_header('Access-Control-Allow-Credentials', 'true')
7771
self.set_header('Access-Control-Allow-Headers', ', '.join(CORS_ACCEPT_HEADERS))
7872
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')
7974

8075
def options(self):
8176
self.set_status(204)

‎tests/server/handlers/test_cors.py‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,3 @@ 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)