Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added 304 CSP test and removed "content-*" prefix from headers to ignore on 304 #13579

Merged
merged 1 commit into from
Oct 24, 2018
Merged

Added 304 CSP test and removed "content-*" prefix from headers to ignore on 304 #13579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions content-security-policy/generic/304-response-should-update-csp.sub.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!DOCTYPE HTML>
<html>
<head>
<script src='/resources/testharness.js'></script>
<script src='/resources/testharnessreport.js'></script>
<title>Test that a 304 response will update the CSP header</title>
</head>
<body>
<script>
var t1 = async_test("Test that the first frame uses nonce abc");
var t2 = async_test("Test that the first frame does not use nonce def");

var t3 = async_test("Test that the second frame uses nonce def");
var t4 = async_test("Test that the second frame does not use nonce abc");

var i1 = document.createElement('iframe');
// We add a random parameter to avoid previous tests cached requests.
// We want to make sure i1 gets a 200 code and i2 gets a 304 code.
i1.src = "support/304-response.py?{{$id:uuid()}}";

var i2 = document.createElement('iframe');
i2.src = "support/304-response.py?{{$id}}";

var load_second_frame = function() {
document.body.appendChild(i2);
}

window.onmessage = function(e) {
if (e.source == i1.contentWindow) {
if (e.data == "abc_executed") { t1.done(); return; }
if (e.data == "script-src 'nonce-abc' 'sha256-IIB78ZS1RMMrAWpsLg/RrDbVPhI14rKm3sFOeKPYulw=';") { t2.done(); return; }

t1.step(function() { assert_unreached("Unexpected message received"); });
t2.step(function() { assert_unreached("Unexpected message received"); });
}

if (e.source == i2.contentWindow) {
if (e.data == "def_executed") { t3.done(); return; }
if (e.data == "script-src 'nonce-def' 'sha256-IIB78ZS1RMMrAWpsLg/RrDbVPhI14rKm3sFOeKPYulw=';") { t4.done(); return; }

t3.step(function() { assert_unreached("Unexpected message received"); });
t4.step(function() { assert_unreached("Unexpected message received"); });
}

};

i1.onload = load_second_frame;
document.body.appendChild(i1);
</script>
</body>

</html>
33 changes: 33 additions & 0 deletions content-security-policy/generic/support/304-response.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
def main(request, response):
if request.headers.get("If-None-Match"):
# we are now receing the second request, we will send back a different CSP
# with the 304 response
response.status = 304
headers = [("Content-Type", "text/html"),
("Content-Security-Policy", "script-src 'nonce-def' 'sha256-IIB78ZS1RMMrAWpsLg/RrDbVPhI14rKm3sFOeKPYulw=';"),
("Cache-Control", "private, max-age=0, must-revalidate"),
("ETag", "123456")]
return headers, ""
else:
headers = [("Content-Type", "text/html"),
("Content-Security-Policy", "script-src 'nonce-abc' 'sha256-IIB78ZS1RMMrAWpsLg/RrDbVPhI14rKm3sFOeKPYulw=';"),
("Cache-Control", "private, max-age=0, must-revalidate"),
("Etag", "123456")]
return headers, '''
<!DOCTYPE html>
<html>
<head>
<script>
window.addEventListener("securitypolicyviolation", function(e) {
top.postMessage(e.originalPolicy, '*');
});
</script>
<script nonce="abc">
top.postMessage('abc_executed', '*');
</script>
<script nonce="def">
top.postMessage('def_executed', '*');
</script>
</head>
</html>
'''
30 changes: 30 additions & 0 deletions fetch/http-cache/304-update.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,36 @@
}
]
},
{
name: "Content-* header",
requests: [
{
response_headers: [
["Expires", -5000],
["ETag", "GHI"],
["Content-Test-Header", "A"]
]
},
{
response_headers: [
["Expires", 3000],
["ETag", "GHI"],
["Content-Test-Header", "B"]
],
expected_type: "etag_validated",
expected_response_headers: [
["Content-Test-Header", "B"]
],
pause_after: true
},
{
expected_type: "cached",
expected_response_headers: [
["Content-Test-Header", "B"]
]
}
]
},
];
run_tests(tests);
</script>
Expand Down