Skip to content

GitLab

T
tangled
Commit 651e82f5 authored by John Abd-El-Malek's avatar John Abd-El-Malek Committed by Commit Bot
Browse files
Options

Revert "[COOP] Test allow-popup vs virtual-BCG." 

This reverts commit 5b3ef591.

Reason for revert: causing failures on android-asan since commit, first failure:
https://ci.chromium.org/p/chromium/builders/ci/android-asan/6907

Original change's description:
> [COOP] Test allow-popup vs virtual-BCG.
> 
> Add a few more tests when navigating with one document using
> COOP:same-origin-allow-popup or COOP-Report-Only:same-origin-allow-popup
> (or both)
> 
> Bug: chromium:1090273
> Change-Id: I95bf3c4aaf2f2db5e8f0076c495f5c1872d77431
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2279767
> Commit-Queue: Pâris Meuleman <pmeuleman@chromium.org>
> Reviewed-by: Pâris Meuleman <pmeuleman@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#786221}

TBR=arthursonzogni@chromium.org,pmeuleman@chromium.org

Change-Id: I7d5dc3f4df187d232006caafb5820d8ef9527e2b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1090273
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288430Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786372}
parent 53d1b06f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 325 deletions
content/browser/cross_origin_opener_policy_browsertest.cc
View file @ 651e82f5
......@@ -1183,6 +1183,7 @@ IN_PROC_BROWSER_TEST_P(CrossOriginOpenerPolicyBrowserTest,
},
// TODO(https://crbug.com/1101339). Test with COEP-RO.
// TODO(https://crbug.com/1101339). Test with COOP-RO+COOP.
// TODO(https://crbug.com/1101339). Test with COOP-same-origin-allow-popup
};
for (const auto& test_case : kTestCases) {
......@@ -1328,6 +1329,7 @@ IN_PROC_BROWSER_TEST_P(CrossOriginOpenerPolicyBrowserTest,
// TODO(https://crbug.com/1101339). Test with COEP-RO.
// TODO(https://crbug.com/1101339). Test with COOP-RO+COOP
// TODO(https://crbug.com/1101339). Test with COOP-same-origin-allow-popup
};
for (const auto& test_case : kTestCases) {
......@@ -1357,331 +1359,6 @@ IN_PROC_BROWSER_TEST_P(CrossOriginOpenerPolicyBrowserTest,
}
}
// Use two URLs, |url_a| and |url_b|. One of them at least uses
// COOP:same-origin-allow-popups, or COOP-Report-Only:same-origin-allow-popups,
// or both.
//
// Test two scenario:
// 1. From |url_a|, opens |url_b|
// 2. From |url_a|, navigates to |url_b|.
//
// In both cases, check whether a new virtual browsing context group has been
// used or not.
IN_PROC_BROWSER_TEST_P(CrossOriginOpenerPolicyBrowserTest,
VirtualBrowsingContextGroup_AllowPopups) {
const struct {
GURL url_a;
GURL url_b;
bool expect_different_group_window_open;
bool expect_different_group_navigation;
} kTestCases[] = {
// non-coop -> coop:allow-popup.
{
// same-origin.
https_server()->GetURL("a.com", "/title1.html"),
https_server()->GetURL(
"a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-origin.
https_server()->GetURL("a.a.com", "/title1.html"),
https_server()->GetURL(
"b.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-site.
https_server()->GetURL("a.com", "/title1.html"),
https_server()->GetURL(
"b.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
// coop:allow-popup -> non-coop.
{
// same-origin.
https_server()->GetURL(
"a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.com", "/title1.html"), false,
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-origin.
https_server()->GetURL(
"b.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.a.com", "/title1.html"), false,
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-site.
https_server()->GetURL(
"b.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.com", "/title1.html"), false,
false, // TODO(https://crbug.com/1101339). Replace with true.
},
// coop-ro:allow-popup -> non-coop.
{
// same-origin.
https_server()->GetURL("a.com",
"/set-header?"
"Cross-Origin-Opener-Policy-Report-Only: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.com", "/title1.html"), false,
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-origin.
https_server()->GetURL("b.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy-Report-Only: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.a.com", "/title1.html"), false,
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-site.
https_server()->GetURL("b.com",
"/set-header?"
"Cross-Origin-Opener-Policy-Report-Only: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.com", "/title1.html"), false,
false, // TODO(https://crbug.com/1101339). Replace with true.
},
// coop:allow-popup -> coop:allow-popup.
{
// same-origin.
https_server()->GetURL(
"a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL(
"a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false,
false,
},
{
// cross-origin.
https_server()->GetURL(
"a.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL(
"b.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-site.
https_server()->GetURL(
"a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL(
"b.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
// coop:allow-popup -> coop-ro:allow-popup.
{
// same-origin.
https_server()->GetURL("a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.com",
"/set-header?"
"Cross-Origin-Opener-Policy-Report-Only: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false,
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-origin.
https_server()->GetURL("a.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("b.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy-Report-Only: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-site.
https_server()->GetURL("a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("b.com",
"/set-header?"
"Cross-Origin-Opener-Policy-Report-Only: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
// coop-ro:allow-popup -> coop:allow-popup.
{
// same-origin.
https_server()->GetURL("a.com",
"/set-header?"
"Cross-Origin-Opener-Policy-Report-Only: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-origin.
https_server()->GetURL("a.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy-Report-Only: "
"same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL(
"b.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-site.
https_server()->GetURL(
"a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL(
"b.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Embedder-Policy: require-corp"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
// coop:allow-popup, coop-ro:same-origin-> no-coop.
{
// same-origin.
https_server()->GetURL(
"a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Opener-Policy-Report-Only: same-origin&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("a.com", "/title1.html"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-origin.
https_server()->GetURL(
"a.a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Opener-Policy-Report-Only: same-origin&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("b.a.com", "/title1.html"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
{
// cross-site.
https_server()->GetURL(
"a.com",
"/set-header?"
"Cross-Origin-Opener-Policy: same-origin-allow-popups&"
"Cross-Origin-Opener-Policy-Report-Only: same-origin&"
"Cross-Origin-Embedder-Policy: require-corp"),
https_server()->GetURL("b.com", "/title1.html"),
false, // TODO(https://crbug.com/1101339). Replace with true.
false, // TODO(https://crbug.com/1101339). Replace with true.
},
};
for (const auto& test_case : kTestCases) {
SCOPED_TRACE(testing::Message()
<< std::endl
<< "url_a = " << test_case.url_a << std::endl
<< "url_b = " << test_case.url_b << std::endl);
ASSERT_TRUE(NavigateToURL(shell(), test_case.url_a));
int group_initial = VirtualBrowsingContextGroup(web_contents());
ShellAddedObserver shell_observer;
EXPECT_TRUE(ExecJs(current_frame_host(),
JsReplace("window.open($1)", test_case.url_b)));
WebContents* popup = shell_observer.GetShell()->web_contents();
WaitForLoadStop(popup);
int group_openee = VirtualBrowsingContextGroup(popup);
ASSERT_TRUE(NavigateToURL(shell(), test_case.url_b));
int group_navigate = VirtualBrowsingContextGroup(web_contents());
if (test_case.expect_different_group_window_open)
EXPECT_NE(group_initial, group_navigate);
else
EXPECT_EQ(group_initial, group_navigate);
if (test_case.expect_different_group_navigation)
EXPECT_NE(group_initial, group_openee);
else
EXPECT_EQ(group_initial, group_openee);
}
}
// Navigates in between two pages from a different browsing context group. Then
// use the history API to navigate back and forth. Check their virtual browsing
// context group isn't restored.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment