Fetch Metadata: split up `document` destination.

As discussed in https://github.com/w3c/webappsec-fetch-metadata/issues/45, We have decided to shift the model around nested navigations from exposure via the request's `mode` to its `destination`. This patch splits the existing `document` destination into three parts: - `document` for top-level navigations and, for the moment, <portals>. - `iframe` for <iframe> navigations. - `frame` for <frame> navigations. Subsequent patch will remove the `nested-document` mode when we're ready to ship `Sec-Fetch-Dest`. Bug: 1011724 Change-Id: I23f23922fb49523aa050f59cbf13aabc086600bb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847295Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org> Reviewed-by: Mike West <mkwst@chromium.org> Commit-Queue: Yifan Luo <lyf@google.com> Cr-Commit-Position: refs/heads/master@{#705527}

Fetch Metadata: split up `document` destination.
As discussed in https://github.com/w3c/webappsec-fetch-metadata/issues/45, We have decided to shift the model around nested navigations from exposure via the request's `mode` to its `destination`. This patch splits the existing `document` destination into three parts: - `document` for top-level navigations and, for the moment, <portals>. - `iframe` for <iframe> navigations. - `frame` for <frame> navigations. Subsequent patch will remove the `nested-document` mode when we're ready to ship `Sec-Fetch-Dest`. Bug: 1011724 Change-Id: I23f23922fb49523aa050f59cbf13aabc086600bb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847295Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org> Reviewed-by: Mike West <mkwst@chromium.org> Commit-Queue: Yifan Luo <lyf@google.com> Cr-Commit-Position: refs/heads/master@{#705527}
0583f458 · Yifan Luo · Commit Bot · 2b601827 · 0583f458 · 0583f458
Commit 0583f458 authored Oct 14, 2019 by Yifan Luo Committed by Commit Bot Oct 14, 2019
15 changed files
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -305,12 +305,18 @@ void AddAdditionalRequestHeaders(net::HttpRequestHeaders* headers,
        destination = "embed";
        break;
      case blink::FrameOwnerElementType::kIframe:
+        destination = "iframe";
+        break;
      case blink::FrameOwnerElementType::kFrame:
+        destination = "frame";
+        break;
      case blink::FrameOwnerElementType::kPortal:
        // TODO(mkwst): "Portal"'s destination isn't actually defined at the
        // moment. Let's assume it'll be similar to a frame until we decide
        // otherwise.
-        destination = "nested-document";
+        // https://github.com/w3c/webappsec-fetch-metadata/issues/46
+        destination = "document";
+        break;
    }

    if (IsFetchMetadataDestinationEnabled()) {

--- a/third_party/blink/common/loader/request_destination.cc
+++ b/third_party/blink/common/loader/request_destination.cc
@@ -28,8 +28,10 @@ const char* GetRequestDestinationFromContext(
    case mojom::RequestContextType::FONT:
      return "font";
    case mojom::RequestContextType::FRAME:
-    case mojom::RequestContextType::HYPERLINK:
+      return "frame";
    case mojom::RequestContextType::IFRAME:
+      return "iframe";
+    case mojom::RequestContextType::HYPERLINK:
    case mojom::RequestContextType::LOCATION:
    case mojom::RequestContextType::FORM:
      return "document";

--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
@@ -353,7 +353,9 @@ void SetSecFetchHeaders(
      destination_value = "empty";

    // We'll handle adding these headers to navigations outside of Blink.
-    if (strncmp(destination_value, "document", 8) != 0 &&
+    if ((strncmp(destination_value, "document", 8) != 0 ||
+         strncmp(destination_value, "iframe", 6) != 0 ||
+         strncmp(destination_value, "frame", 5) != 0) &&
        request.GetRequestContext() != mojom::RequestContextType::INTERNAL) {
      if (blink::RuntimeEnabledFeatures::FetchMetadataDestinationEnabled()) {
        request.SetHttpHeaderField("Sec-Fetch-Dest", destination_value);

--- a/third_party/blink/web_tests/external/wpt/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html
+++ b/third_party/blink/web_tests/external/wpt/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/resources/testdriver.js></script>
+<script src=/resources/testdriver-vendor.js></script>
+<script src=/fetch/metadata/resources/helper.js></script>
+<script src=/common/utils.js></script>
+<body>
+<script>
+  const USER = true;
+  const FORCED = false;
+
+  function create_test(host, user_activated, expectations) {
+    async_test(t => {
+      let i = document.createElement('frame');
+      window.addEventListener('message', t.step_func(e => {
+        if (e.source != i.contentWindow)
+          return;
+
+        assert_header_dest_equals(e.data, expectations);
+        t.done();
+      }));
+
+      let url = `https://${host}/fetch/metadata/resources/post-to-owner.py`;
+      if (user_activated == FORCED) {
+        i.src = url;
+        document.body.appendChild(i);
+      } else if (user_activated == USER) {
+        let uuid = token();
+        i.name = uuid;
+        let a = document.createElement('a');
+        a.href = url;
+        a.target = uuid;
+        a.text = "This is a link!";
+
+        document.body.appendChild(i);
+        document.body.appendChild(a);
+
+        test_driver.click(a);
+      }
+    }, `{{host}} -> ${host} iframe: ${user_activated ? "user-activated" : "forced"}`);
+  }
+
+  create_test("{{host}}:{{ports[https][0]}}", FORCED, "frame");
+
+  create_test("{{hosts[][www]}}:{{ports[https][0]}}", FORCED, "frame");
+
+  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", FORCED, "frame");
+
+  create_test("{{host}}:{{ports[https][0]}}", USER, "frame");
+
+  create_test("{{hosts[][www]}}:{{ports[https][0]}}", USER, "frame");
+
+  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", USER, "frame");
+</script>
--- a/third_party/blink/web_tests/external/wpt/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html
+++ b/third_party/blink/web_tests/external/wpt/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/fetch/metadata/resources/helper.js></script>
+<body>
+<script>
+  async_test(t => {
+    let i = document.createElement('frame');
+    i.src = "http://{{host}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != i.contentWindow)
+        return;
+
+      assert_header_dest_equals(e.data, "");
+      t.done();
+    }));
+
+    document.body.appendChild(i);
+  }, "Non-secure same-origin iframe => No headers");
+
+  async_test(t => {
+    let i = document.createElement('frame');
+    i.src = "http://{{hosts[][www]}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != i.contentWindow)
+        return;
+
+      assert_header_dest_equals(e.data, "");
+      t.done();
+    }));
+
+    document.body.appendChild(i);
+  }, "Non-secure same-site iframe => No headers");
+
+  async_test(t => {
+    let i = document.createElement('frame');
+    i.src = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != i.contentWindow)
+        return;
+
+      assert_header_dest_equals(e.data, "");
+      t.done();
+    }));
+
+    document.body.appendChild(i);
+  }, "Non-secure cross-site iframe => No headers.");
+
+  async_test(t => {
+    let i = document.createElement('frame');
+    i.src = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py";
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != i.contentWindow)
+        return;
+
+      assert_header_dest_equals(e.data, "frame");
+      t.done();
+    }));
+
+    document.body.appendChild(i);
+  }, "Secure, cross-site (cross-scheme, same-host) frame");
+</script>
--- a/third_party/blink/web_tests/external/wpt/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html
+++ b/third_party/blink/web_tests/external/wpt/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html
@@ -41,15 +41,15 @@
    }, `{{host}} -> ${host} iframe: ${user_activated ? "user-activated" : "forced"}`);
  }

-  create_test("{{host}}:{{ports[https][0]}}", FORCED, "nested-document");
+  create_test("{{host}}:{{ports[https][0]}}", FORCED, "iframe");

-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", FORCED, "nested-document");
+  create_test("{{hosts[][www]}}:{{ports[https][0]}}", FORCED, "iframe");

-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", FORCED, "nested-document");
+  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", FORCED, "iframe");

-  create_test("{{host}}:{{ports[https][0]}}", USER, "nested-document");
+  create_test("{{host}}:{{ports[https][0]}}", USER, "iframe");

-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", USER, "nested-document");
+  create_test("{{hosts[][www]}}:{{ports[https][0]}}", USER, "iframe");

-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", USER, "nested-document");
+  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", USER, "iframe");
 </script>
--- a/third_party/blink/web_tests/external/wpt/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html
+++ b/third_party/blink/web_tests/external/wpt/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html
@@ -53,7 +53,7 @@
      if (e.source != i.contentWindow)
        return;

-      assert_header_dest_equals(e.data, "nested-document");
+      assert_header_dest_equals(e.data, "iframe");
      t.done();
    }));


--- a/third_party/blink/web_tests/http/tests/navigation/form-targets-cross-site-frame-get-expected.txt
+++ b/third_party/blink/web_tests/http/tests/navigation/form-targets-cross-site-frame-get-expected.txt
@@ -14,7 +14,7 @@ Http headers:
 HTTP_CONNECTION = keep-alive
 HTTP_HOST = localhost:8080
 HTTP_REFERER = http://127.0.0.1:8000/navigation/form-targets-cross-site-frame-get.html
-HTTP_SEC_FETCH_DEST = nested-document
+HTTP_SEC_FETCH_DEST = iframe
 HTTP_SEC_FETCH_MODE = nested-navigate
 HTTP_SEC_FETCH_SITE = cross-site
 HTTP_UPGRADE_INSECURE_REQUESTS = 1
--- a/third_party/blink/web_tests/http/tests/navigation/form-targets-cross-site-frame-no-referrer-expected.txt
+++ b/third_party/blink/web_tests/http/tests/navigation/form-targets-cross-site-frame-no-referrer-expected.txt
@@ -15,7 +15,7 @@ HTTP_CACHE_CONTROL = max-age=0
 HTTP_CONNECTION = keep-alive
 HTTP_HOST = localhost:8080
 HTTP_ORIGIN = null
-HTTP_SEC_FETCH_DEST = nested-document
+HTTP_SEC_FETCH_DEST = iframe
 HTTP_SEC_FETCH_MODE = nested-navigate
 HTTP_SEC_FETCH_SITE = cross-site
 HTTP_UPGRADE_INSECURE_REQUESTS = 1
--- a/third_party/blink/web_tests/http/tests/navigation/form-targets-cross-site-frame-post-expected.txt
+++ b/third_party/blink/web_tests/http/tests/navigation/form-targets-cross-site-frame-post-expected.txt
@@ -16,7 +16,7 @@ HTTP_CONNECTION = keep-alive
 HTTP_HOST = localhost:8080
 HTTP_ORIGIN = http://127.0.0.1:8000
 HTTP_REFERER = http://127.0.0.1:8000/navigation/form-targets-cross-site-frame-post.html
-HTTP_SEC_FETCH_DEST = nested-document
+HTTP_SEC_FETCH_DEST = iframe
 HTTP_SEC_FETCH_MODE = nested-navigate
 HTTP_SEC_FETCH_SITE = cross-site
 HTTP_UPGRADE_INSECURE_REQUESTS = 1
--- a/third_party/blink/web_tests/http/tests/navigation/form-with-enctype-targets-cross-site-frame-expected.txt
+++ b/third_party/blink/web_tests/http/tests/navigation/form-with-enctype-targets-cross-site-frame-expected.txt
@@ -16,7 +16,7 @@ HTTP_CONNECTION = keep-alive
 HTTP_HOST = localhost:8080
 HTTP_ORIGIN = http://127.0.0.1:8000
 HTTP_REFERER = http://127.0.0.1:8000/navigation/form-with-enctype-targets-cross-site-frame.html
-HTTP_SEC_FETCH_DEST = nested-document
+HTTP_SEC_FETCH_DEST = iframe
 HTTP_SEC_FETCH_MODE = nested-navigate
 HTTP_SEC_FETCH_SITE = cross-site
 HTTP_UPGRADE_INSECURE_REQUESTS = 1
--- a/third_party/blink/web_tests/http/tests/navigation/post-frames-expected.txt
+++ b/third_party/blink/web_tests/http/tests/navigation/post-frames-expected.txt
@@ -17,7 +17,7 @@ HTTP_CONNECTION = keep-alive
 HTTP_HOST = 127.0.0.1:8000
 HTTP_ORIGIN = http://127.0.0.1:8000
 HTTP_REFERER = http://127.0.0.1:8000/navigation/resources/page-that-posts.html
-HTTP_SEC_FETCH_DEST = nested-document
+HTTP_SEC_FETCH_DEST = iframe
 HTTP_SEC_FETCH_MODE = nested-navigate
 HTTP_SEC_FETCH_SITE = same-origin
 HTTP_UPGRADE_INSECURE_REQUESTS = 1

--- a/third_party/blink/web_tests/http/tests/navigation/post-frames-goback1-expected.txt
+++ b/third_party/blink/web_tests/http/tests/navigation/post-frames-goback1-expected.txt
@@ -16,7 +16,7 @@ HTTP_CONNECTION = keep-alive
 HTTP_HOST = 127.0.0.1:8000
 HTTP_ORIGIN = http://127.0.0.1:8000
 HTTP_REFERER = http://127.0.0.1:8000/navigation/post-frames-goback1.html
-HTTP_SEC_FETCH_DEST = nested-document
+HTTP_SEC_FETCH_DEST = iframe
 HTTP_SEC_FETCH_MODE = nested-navigate
 HTTP_SEC_FETCH_SITE = same-origin
 HTTP_UPGRADE_INSECURE_REQUESTS = 1

--- a/third_party/blink/web_tests/http/tests/navigation/rename-subframe-goback-expected.txt
+++ b/third_party/blink/web_tests/http/tests/navigation/rename-subframe-goback-expected.txt
@@ -20,7 +20,7 @@ HTTP_CONNECTION = keep-alive
 HTTP_HOST = 127.0.0.1:8000
 HTTP_ORIGIN = http://127.0.0.1:8000
 HTTP_REFERER = http://127.0.0.1:8000/navigation/resources/page-that-posts.html
-HTTP_SEC_FETCH_DEST = nested-document
+HTTP_SEC_FETCH_DEST = iframe
 HTTP_SEC_FETCH_MODE = nested-navigate
 HTTP_SEC_FETCH_SITE = same-origin
 HTTP_UPGRADE_INSECURE_REQUESTS = 1
--- a/third_party/blink/web_tests/http/tests/navigation/start-load-during-provisional-loader-detach-expected.txt
+++ b/third_party/blink/web_tests/http/tests/navigation/start-load-during-provisional-loader-detach-expected.txt
-We pass if we don't crash. 
+We pass if we don't crash.