Propagating csp attribute changes on frameOwnerPropertiesChanged()

content/browser/site_per_process_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 531 matching lines @@
 SitePerProcessBrowserTest::SitePerProcessBrowserTest() {
 };
 
 std::string SitePerProcessBrowserTest::DepictFrameTree(FrameTreeNode* node) {
   return visualizer_.DepictFrameTree(node);
 }
 
 void SitePerProcessBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   IsolateAllSitesForTesting(command_line);
+
+  // TODO(amalika): Remove this switch when
+  // the EmbedderCSPEnforcement becomes stable
+  command_line->AppendSwitch(
+        switches::kEnableExperimentalWebPlatformFeatures);

[Mike West, 2016/09/29 08:58:53]

Hrm. This might be an argument for pushing the CSP bits out of the
`FrameOwnerPropertiesPropagationMargin` test into their own test (similar to
what's been done for `SitePerProcessHighDPIBrowserTest`). Let's ask the site
isolation folks for their opinion.

 };
 
 void SitePerProcessBrowserTest::SetUpOnMainThread() {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   SetupCrossSiteRedirector(embedded_test_server());
 }
 
 //
 // SitePerProcessHighDPIBrowserTest
@@ skipping 2457 matching lines @@
   for (size_t i = 0; i < arraysize(scrolling_values); ++i) {
     bool expect_scrollbar = scrolling_values[i] != "no";
     set_scrolling_property(root->current_frame_host(), scrolling_values[i]);
     for (size_t j = 0; j < arraysize(urls); ++j) {
       NavigateFrameToURL(child, urls[j]);
       EXPECT_EQ(expect_scrollbar, has_scrollbar(child->current_frame_host()));
     }
   }
 }
 
-// Verify that "marginwidth" and "marginheight" properties on frame elements
+// Verify that "marginwidth","marginheight" and "csp" properties on frame
+// elements
 // propagate to child frames correctly.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
-                       FrameOwnerPropertiesPropagationMargin) {
+                       FrameOwnerPropertiesPropagationMarginAndCSP) {
   GURL main_url(embedded_test_server()->GetURL(
-      "a.com", "/frame_owner_properties_margin.html"));
+      "a.com", "/frame_owner_properties_margin_and_csp.html"));
   NavigateToURL(shell(), main_url);
 
   // It is safe to obtain the root frame tree node here, as it doesn't change.
   FrameTreeNode* root = web_contents()->GetFrameTree()->root();
   ASSERT_EQ(1u, root->child_count());
 
   EXPECT_EQ(
       " Site A ------------ proxies for B\n"
       "   +--Site B ------- proxies for A\n"
       "Where A = http://a.com/\n"
@@ skipping 11 matching lines @@
   EXPECT_EQ("10", margin_width);
 
   std::string margin_height;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       child,
       "window.domAutomationController.send("
       "document.body.getAttribute('marginheight'));",
       &margin_height));
   EXPECT_EQ("50", margin_height);
 
+  std::string csp;
+  EXPECT_TRUE(ExecuteScriptAndExtractString(
+      root,
+      "window.domAutomationController.send("
+      "document.getElementById('child-1').getAttribute('csp'));",
+      &csp));
+  EXPECT_EQ("object-src none", csp);
+
   // Run the test over variety of parent/child cases.
   GURL urls[] = {
     // Remote to remote.
     embedded_test_server()->GetURL("c.com", "/title2.html"),
     // Remote to local.
     embedded_test_server()->GetURL("a.com", "/title1.html"),
     // Local to remote.
     embedded_test_server()->GetURL("b.com", "/title2.html")
   };
 
-  int current_margin_width = 15;
-  int current_margin_height = 25;
+  std::vector<std::string> csp_values = {"default-src a.com",
+                                         "default-src b.com", "img-src none"};
+  std::string current_csp;
+  int current_margin_width = 10;
+  int current_margin_height = 50;

[Mike West, 2016/09/29 08:58:53]

Why did the margins change?

 
-  // Before each navigation, we change the marginwidth and marginheight
+  // Before each navigation, we change the marginwidth, marginheight and csp

[Mike West, 2016/09/29 08:58:53]

Nit: Oxford comma (e.g. "x, y, and z")

   // properties of the frame. We then check whether those properties are applied
   // correctly after the navigation has completed.
   for (size_t i = 0; i < arraysize(urls); ++i) {
-    // Change marginwidth and marginheight before navigating.
+    current_csp = csp_values[i];
+    current_margin_width += 5;
+    current_margin_height += 10;
+
+    // Change marginwidth, marginheight, and csp before navigating.

[Mike West, 2016/09/29 08:58:53]

Nit: Move this before the assignments above.

     EXPECT_TRUE(ExecuteScript(
         root,
         base::StringPrintf("document.getElementById('child-1').setAttribute("
+                           "    'csp', '%s');",
+                           current_csp.c_str())));
+    EXPECT_TRUE(ExecuteScript(
+        root,
+        base::StringPrintf("document.getElementById('child-1').setAttribute("
                            "    'marginwidth', '%d');",
                            current_margin_width)));
     EXPECT_TRUE(ExecuteScript(
         root,
         base::StringPrintf("document.getElementById('child-1').setAttribute("
                            "    'marginheight', '%d');",
                            current_margin_height)));
 
     NavigateFrameToURL(child, urls[i]);
 
+    EXPECT_EQ(current_csp, child->frame_owner_properties().csp);
+
     std::string actual_margin_width;
     EXPECT_TRUE(ExecuteScriptAndExtractString(
         child,
         "window.domAutomationController.send("
         "document.body.getAttribute('marginwidth'));",
         &actual_margin_width));
     EXPECT_EQ(base::IntToString(current_margin_width), actual_margin_width);
 
     std::string actual_margin_height;
     EXPECT_TRUE(ExecuteScriptAndExtractString(
         child,
         "window.domAutomationController.send("
         "document.body.getAttribute('marginheight'));",
         &actual_margin_height));
     EXPECT_EQ(base::IntToString(current_margin_height), actual_margin_height);
-
-    current_margin_width += 5;
-    current_margin_height += 10;
   }
 }
 
 // Verify origin replication with an A-embed-B-embed-C-embed-A hierarchy.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, OriginReplication) {
   GURL main_url(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(b(c(a),b), a)"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
 
   // It is safe to obtain the root frame tree node here, as it doesn't change.
@@ skipping 5099 matching lines @@
       " Site A ------------ proxies for B C\n"
       "   +--Site B ------- proxies for A C\n"
       "        +--Site C -- proxies for A B\n"
       "Where A = http://a.com/\n"
       "      B = http://b.com/\n"
       "      C = http://c.com/",
       DepictFrameTree(root));
 }
 
 }  // namespace content