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

COOP: test COOP popup from a CSP-sandboxed popup #21111

Merged
merged 9 commits into from
Aug 28, 2020
Merged

COOP: test COOP popup from a CSP-sandboxed popup #21111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e1f466
COOP: test COOP popup from a CSP-sandboxed popup
zcorpan Jan 9, 2020
3b3194a
Apply suggestions from code review
zcorpan Jan 10, 2020
a05e192
Remove get-host-info.sub.js from csp-sandbox.py
zcorpan Jan 10, 2020
94da6ee
Use byte strings in python
zcorpan Aug 20, 2020
32b2eef
Add a test per annevk's suggestion to navigate from CSP sandbox to CO…
zcorpan Aug 20, 2020
abbc0bd
Change fullyLoaded to a function
zcorpan Aug 26, 2020
5d9eed6
Add more assertions in the navigate test (unsure about correctness)
zcorpan Aug 26, 2020
b2db19d
Avoid spaces in window.open second argument
zcorpan Aug 26, 2020
36fc58a
Correct the same-origin check and add explanatory comments
zcorpan Aug 27, 2020
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
39 changes: 39 additions & 0 deletions html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<!doctype html>
<title>CSP sandbox popup navigate to Cross-Origin-Opener-Policy document should work</title>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/utils.js"></script> <!-- Use token() to allow running tests in parallel -->
<div id=log>
<script>
[
"allow-popups allow-scripts allow-same-origin",
"allow-popups allow-scripts",
].forEach(sandboxValue => {
async_test(t => {
const channel = new BroadcastChannel(token());
let popup;
channel.onmessage = t.step_func_done(e => {
assert_equals(e.data.name, '', 'e.data.name');
assert_false(e.data.opener, 'e.data.opener');
// `popup` is still the WindowProxy that holds the CSP sandbox document, not the
// after-navigation COOP document. The CSP sandbox only applies to the before navigation
// document/window.
assert_true(popup.closed, 'popup.closed');
// Same-origin check (with the CSP sandbox document) should not throw when 'allow-same-origin'
if (sandboxValue.includes('allow-same-origin')) {
assert_true(!!popup.document, 'same-origin check');
} else {
assert_throws_dom("SecurityError", () => { popup.document; }, 'same-origin check');
}
});
const navigateTo = `/html/cross-origin-opener-policy/resources/coop-coep.py?coop=same-origin&coep=&channel=${channel.name}`;
popup = window.open(`resources/csp-sandbox.py?coop=&coep=&sandbox=${sandboxValue}&channel=&navigate=${encodeURIComponent(navigateTo)}`, sandboxValue.replace(/ /g, '_'));
t.add_cleanup(() => { popup.close(); });
addEventListener('load', t.step_func(() => {
t.step_timeout(() => {
assert_unreached('Navigation from CSP sandbox to COOP document failed')
}, 1500);
}));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you have a reference to the popup and it won't be replaced, can't you assert something about the popup? That it's not closed and that it's document is no longer same-origin? I guess that doesn't work for the case where allow-same-origin isn't set.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But closed should be true after the navigation? The CSP sandbox doesn't have COOP, and then when navigating to the COOP document the browsing context is swapped.

The "is no longer same origin" is interesting. Should it not be same-origin for any of these 2 cases?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I misread the test.

}, `CSP: sandbox ${sandboxValue}; ${document.title}`);
});
</script>
24 changes: 24 additions & 0 deletions html/cross-origin-opener-policy/coop-csp-sandbox.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!doctype html>
<title>CSP sandboxed Cross-Origin-Opener-Policy popup should result in a network error</title>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/utils.js"></script> <!-- Use token() to allow running tests in parallel -->
<div id=log>
<script>
[
"allow-popups allow-scripts allow-same-origin",
"allow-popups allow-scripts",
].forEach(sandboxValue => {
async_test(t => {
const channel = new BroadcastChannel(token());
channel.onmessage = t.unreached_func("A COOP popup was created from a CSP-sandboxed popup");
const popup = window.open(`resources/csp-sandbox.py?coop=same-origin&coep=&sandbox=${sandboxValue}&channel=${channel.name}`);
t.add_cleanup(() => { popup.close(); });
addEventListener('load', t.step_func(() => {
t.step_timeout(() => {
t.done()
}, 1500);
}));
}, `CSP: sandbox ${sandboxValue}; ${document.title}`);
});
</script>
14 changes: 14 additions & 0 deletions html/cross-origin-opener-policy/resources/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,17 @@ function run_coop_test_iframe (documentTitle, iframe_origin, popup_origin, popup
document.body.append(frame);
}, `${documentTitle} with ${iframe_origin.name} iframe opening popup a ${popup_origin.name} with COOP: ${format_value(popup_coop)}`);
}

// Wait until the page is fully loaded before navigating
// so that it creates a history entry properly.
function fullyLoaded() {
return new Promise((resolve, reject) => {
addEventListener('load', () => {
requestAnimationFrame(() => {
requestAnimationFrame(() => {
resolve();
});
});
});
});
}
19 changes: 5 additions & 14 deletions html/cross-origin-opener-policy/resources/coop-coep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,19 @@ def main(request, response):
<!doctype html>
<meta charset=utf-8>
<script src="/common/get-host-info.sub.js"></script>
<body></body>
<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
<body>
<script>
const params = new URL(location).searchParams;
const navHistory = params.get("navHistory");
const avoidBackAndForth = params.get("avoidBackAndForth");
const navigate = params.get("navigate");
// Need to wait until the page is fully loaded before navigating
// so that it creates a history entry properly.
const fullyLoaded = new Promise((resolve, reject) => {
addEventListener('load', () => {
requestAnimationFrame(() => {
requestAnimationFrame(() => {
resolve();
});
});
});
});
if (navHistory !== null) {
fullyLoaded.then(() => {
fullyLoaded().then(() => {
history.go(Number(navHistory));
});
} else if (navigate !== null && (history.length === 1 || !avoidBackAndForth)) {
fullyLoaded.then(() => {
fullyLoaded().then(() => {
self.location = navigate;
});
} else {
Expand All @@ -74,4 +64,5 @@ def main(request, response):
document.body.appendChild(iframe);
}
</script>
</body>
"""
29 changes: 29 additions & 0 deletions html/cross-origin-opener-policy/resources/csp-sandbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
def main(request, response):
coop = request.GET.first(b"coop")
coep = request.GET.first(b"coep")
sandbox = request.GET.first(b"sandbox")
if coop != "":
response.headers.set(b"Cross-Origin-Opener-Policy", coop)
if coep != "":
response.headers.set(b"Cross-Origin-Embedder-Policy", coep)
response.headers.set(b"Content-Security-Policy", b"sandbox " + sandbox + b";")

# Open a popup to coop-coep.py with the same parameters (except sandbox)
response.content = b"""
<!doctype html>
<meta charset=utf-8>
<script src="/common/get-host-info.sub.js"></script>
<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
<script>
const params = new URL(location).searchParams;
params.delete("sandbox");
const navigate = params.get("navigate");
if (navigate) {
fullyLoaded().then(() => {
self.location = navigate;
});
} else {
window.open(`/html/cross-origin-opener-policy/resources/coop-coep.py?${params}`);
}
</script>
"""