Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(508)

Unified Diff: content/browser/frame_host/render_frame_host_manager_browsertest.cc

Issue 2528813002: Fix Self-Referencing OOPIF Infinite Loop (Closed)
Patch Set: refactor allowedToLoadFrame conditional Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.cc ('k') | content/test/data/coreferencingframe_1.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
index 152daf15a33be4d81996f1eb17666d4fccbfd66e..02027b0ee6df0729ec661026ca96ad901960bf25 100644
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -2954,8 +2954,8 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
// Verify that GetLastCommittedOrigin() is correct for the full lifetime of a
// RenderFrameHost, including when it's pending, current, and pending deletion.
-// This is checked both for main frames and subframes. See
-// https://crbug.com/590035.
+// This is checked both for main frames and subframes.
+// See https://crbug.com/590035.
IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, LastCommittedOrigin) {
StartEmbeddedServer();
GURL url_a(embedded_test_server()->GetURL("a.com", "/title1.html"));
@@ -3106,4 +3106,170 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
}
}
+// Ensure that loading a page with cross-site coreferencing iframes does not
+// cause an infinite number of nested iframes to be created.
+// See https://crbug.com/650332.
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, CoReferencingFrames) {
+ // Load a page with a cross-site coreferencing iframe. "Coreferencing" here
+ // refers to two separate pages that contain subframes with URLs to each
+ // other.
+ StartEmbeddedServer();
+ GURL url_1(
+ embedded_test_server()->GetURL("a.com", "/coreferencingframe_1.html"));
+ EXPECT_TRUE(NavigateToURL(shell(), url_1));
+
+ WebContentsImpl* web_contents =
+ static_cast<WebContentsImpl*>(shell()->web_contents());
+
+ FrameTreeNode* root = web_contents->GetFrameTree()->root();
+
+ // The FrameTree contains two successful instances of each site plus an
+ // unsuccessfully-navigated third instance of B with a blank URL. When not in
+ // site-per-process mode, the FrameTreeVisualizer depicts all nodes as
+ // referencing Site A because iframes are identified with their root site.
+ if (AreAllSitesIsolatedForTesting()) {
+ EXPECT_EQ(
+ " Site A ------------ proxies for B\n"
+ " +--Site B ------- proxies for A\n"
+ " +--Site A -- proxies for B\n"
+ " +--Site B -- proxies for A\n"
+ " +--Site B -- proxies for A\n"
+ "Where A = http://a.com/\n"
+ " B = http://b.com/",
+ FrameTreeVisualizer().DepictFrameTree(root));
+ } else {
+ EXPECT_EQ(
+ " Site A\n"
+ " +--Site A\n"
+ " +--Site A\n"
+ " +--Site A\n"
+ " +--Site A\n"
+ "Where A = http://a.com/",
+ FrameTreeVisualizer().DepictFrameTree(root));
+ }
+ FrameTreeNode* bottom_child =
+ root->child_at(0)->child_at(0)->child_at(0)->child_at(0);
+ EXPECT_TRUE(bottom_child->current_url().is_empty());
+ EXPECT_FALSE(bottom_child->has_committed_real_load());
+}
+
+// Ensures that nested subframes with the same URL but different fragments can
+// only be nested once. See https://crbug.com/650332.
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
+ SelfReferencingFragmentFrames) {
+ StartEmbeddedServer();
+ GURL url(
+ embedded_test_server()->GetURL("a.com", "/page_with_iframe.html#123"));
+ EXPECT_TRUE(NavigateToURL(shell(), url));
+
+ WebContentsImpl* web_contents =
+ static_cast<WebContentsImpl*>(shell()->web_contents());
+
+ FrameTreeNode* root = web_contents->GetFrameTree()->root();
+ FrameTreeNode* child = root->child_at(0);
+
+ // ExecuteScript is used here and once more below because it is important to
+ // use renderer-initiated navigations since browser-initiated navigations are
+ // bypassed in the self-referencing navigation check.
+ TestFrameNavigationObserver observer1(child);
+ EXPECT_TRUE(
+ ExecuteScript(child, "location.href = '" + url.spec() + "456" + "';"));
+ observer1.Wait();
+
+ FrameTreeNode* grandchild = child->child_at(0);
+ GURL expected_url(embedded_test_server()->GetURL("a.com", "/title1.html"));
+ EXPECT_EQ(expected_url, grandchild->current_url());
+
+ // This navigation should be blocked.
+ GURL blocked_url(embedded_test_server()->GetURL(
+ "a.com", "/page_with_iframe.html#123456789"));
+ TestNavigationManager manager(web_contents, blocked_url);
+ EXPECT_TRUE(ExecuteScript(grandchild,
+ "location.href = '" + blocked_url.spec() + "';"));
+ // Wait for WillStartRequest and verify that the request is aborted before
+ // starting it.
+ EXPECT_FALSE(manager.WaitForRequestStart());
+ WaitForLoadStop(web_contents);
+
+ // The FrameTree contains two successful instances of the url plus an
+ // unsuccessfully-navigated third instance with a blank URL.
+ EXPECT_EQ(
+ " Site A\n"
+ " +--Site A\n"
+ " +--Site A\n"
+ "Where A = http://a.com/",
+ FrameTreeVisualizer().DepictFrameTree(root));
+
+ // The URL of the grandchild has not changed.
+ EXPECT_EQ(expected_url, grandchild->current_url());
+}
+
+// Ensure that loading a page with a meta refresh iframe does not cause an
+// infinite number of nested iframes to be created. This test loads a page with
+// an about:blank iframe where the page injects html containing a meta refresh
+// into the iframe. This test then checks that this does not cause infinite
+// nested iframes to be created. See https://crbug.com/527367.
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
+ SelfReferencingMetaRefreshFrames) {
+ // Load a page with a blank iframe.
+ StartEmbeddedServer();
+ GURL url(embedded_test_server()->GetURL(
+ "a.com", "/page_with_meta_refresh_frame.html"));
+ NavigateToURLBlockUntilNavigationsComplete(shell(), url, 3);
+
+ WebContentsImpl* web_contents =
+ static_cast<WebContentsImpl*>(shell()->web_contents());
+
+ FrameTreeNode* root = web_contents->GetFrameTree()->root();
+
+ // The third navigation should fail and be cancelled, leaving a FrameTree with
+ // a height of 2.
+ EXPECT_EQ(
+ " Site A\n"
+ " +--Site A\n"
+ " +--Site A\n"
+ "Where A = http://a.com/",
+ FrameTreeVisualizer().DepictFrameTree(root));
+
+ EXPECT_EQ(GURL(url::kAboutBlankURL),
+ root->child_at(0)->child_at(0)->current_url());
+
+ EXPECT_FALSE(root->child_at(0)->child_at(0)->has_committed_real_load());
+}
+
+// Ensure that navigating a subframe to the same URL as its parent twice in a
+// row is not blocked by the self-reference check.
+// See https://crbug.com/650332.
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
+ SelfReferencingSameURLRenavigation) {
+ StartEmbeddedServer();
+ GURL first_url(
+ embedded_test_server()->GetURL("a.com", "/page_with_iframe.html"));
+ GURL second_url(first_url.spec() + "#123");
+ EXPECT_TRUE(NavigateToURL(shell(), first_url));
+
+ WebContentsImpl* web_contents =
+ static_cast<WebContentsImpl*>(shell()->web_contents());
+
+ FrameTreeNode* root = web_contents->GetFrameTree()->root();
+ FrameTreeNode* child = root->child_at(0);
+
+ TestFrameNavigationObserver observer1(child);
+ EXPECT_TRUE(
+ ExecuteScript(child, "location.href = '" + second_url.spec() + "';"));
+ observer1.Wait();
+
+ EXPECT_EQ(child->current_url(), second_url);
+
+ TestFrameNavigationObserver observer2(child);
+ // This navigation shouldn't be blocked. Blocking should only occur when more
+ // than one ancestor has the same URL (excluding fragments), and the
+ // navigating frame's current URL shouldn't count toward that.
+ EXPECT_TRUE(
+ ExecuteScript(child, "location.href = '" + first_url.spec() + "';"));
+ observer2.Wait();
+
+ EXPECT_EQ(child->current_url(), first_url);
+}
+
} // namespace content
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.cc ('k') | content/test/data/coreferencingframe_1.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698