[COOP] access reporting: Extend report.body.type values.

Split the report.body.type:

From:
  access-to-coop-page
  access-from-coop-page

To:
  access-from-coop-page-to-opener
  access-from-coop-page-to-openee
  access-from-coop-page-to-other
  access-to-coop-page-from-opener
  access-to-coop-page-from-openee
  access-to-coop-page-from-other

to match with the new specification updates.

Bug: 1090273
Change-Id: Ia8b9af6b2751ba5154f1c56793d01542cd736bad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2356404Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Camille Lamy <clamy@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800157}

content/browser/net/cross_origin_opener_policy_reporter.cc

@@ -53,10 +53,18 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
 
 const char* ToString(network::mojom::CoopAccessReportType report_type) {
   switch (report_type) {
-    case network::mojom::CoopAccessReportType::kReportAccessTo:
-      return "access-to-coop-page";
-    case network::mojom::CoopAccessReportType::kReportAccessFrom:
-      return "access-from-coop-page";
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOpener:
+      return "access-from-coop-page-to-opener";
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOpenee:
+      return "access-from-coop-page-to-openee";
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOther:
+      return "access-from-coop-page-to-other";
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOpener:
+      return "access-to-coop-page-from-opener";
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOpenee:
+      return "access-to-coop-page-from-openee";
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOther:
+      return "access-to-coop-page-from-other";
   }
 }
 
@@ -100,6 +108,11 @@ std::vector<FrameTreeNode*> CollectOtherWindowForCoopAccess(
   return out;
 }
 
+FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) {
+  FrameTreeNode* opener = frame->original_opener();
+  return opener ? opener->frame_tree()->root() : nullptr;
+}
+
 }  // namespace
 
 CrossOriginOpenerPolicyReporter::CrossOriginOpenerPolicyReporter(
@@ -188,8 +201,8 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
                      ToString(coop_.report_only_value));
   body.SetStringPath(kProperty, property);
   // TODO(arthursonzogni): Fill "blocked-window-url".
-  if (source_location->url != "" &&
-      report_type == network::mojom::CoopAccessReportType::kReportAccessFrom) {
+  if (network::IsAccessFromCoopPage(report_type) &&
+      source_location->url != "") {
     body.SetStringPath(kSourceFile, source_location->url);
     body.SetIntPath(kLineNumber, source_location->line);
     body.SetIntPath(kColumnNumber, source_location->column);
@@ -278,10 +291,26 @@ void CrossOriginOpenerPolicyReporter::MonitorAccesses(
       remote_reporter;
   Clone(remote_reporter.InitWithNewPipeAndPassReceiver());
 
-  network::mojom::CoopAccessReportType report_type =
-      accessing_node->current_frame_host()->coop_reporter() == this
-          ? network::mojom::CoopAccessReportType::kReportAccessFrom
-          : network::mojom::CoopAccessReportType::kReportAccessTo;
+  bool access_from_coop_page =
+      this == accessing_node->current_frame_host()->coop_reporter();
+
+  using network::mojom::CoopAccessReportType;
+  CoopAccessReportType report_type;
+  if (access_from_coop_page) {
+    if (accessing_node == TopLevelOpener(accessed_node))
+      report_type = CoopAccessReportType::kAccessFromCoopPageToOpenee;
+    else if (accessed_node == TopLevelOpener(accessing_node))
+      report_type = CoopAccessReportType::kAccessFromCoopPageToOpener;
+    else
+      report_type = CoopAccessReportType::kAccessFromCoopPageToOther;
+  } else {
+    if (accessed_node == TopLevelOpener(accessing_node))
+      report_type = CoopAccessReportType::kAccessToCoopPageFromOpenee;
+    else if (accessing_node == TopLevelOpener(accessed_node))
+      report_type = CoopAccessReportType::kAccessToCoopPageFromOpener;
+    else
+      report_type = CoopAccessReportType::kAccessToCoopPageFromOther;
+  }
 
   accessing_rfh->GetAssociatedLocalMainFrame()->InstallCoopAccessMonitor(
       report_type, accessed_window_token, std::move(remote_reporter));

services/network/public/cpp/cross_origin_opener_policy.cc

@@ -25,4 +25,17 @@ bool CrossOriginOpenerPolicy::operator==(
          report_only_reporting_endpoint == other.report_only_reporting_endpoint;
 }
 
+bool IsAccessFromCoopPage(mojom::CoopAccessReportType type) {
+  switch (type) {
+    case mojom::CoopAccessReportType::kAccessFromCoopPageToOpener:
+    case mojom::CoopAccessReportType::kAccessFromCoopPageToOpenee:
+    case mojom::CoopAccessReportType::kAccessFromCoopPageToOther:
+      return true;
+    case mojom::CoopAccessReportType::kAccessToCoopPageFromOpener:
+    case mojom::CoopAccessReportType::kAccessToCoopPageFromOpenee:
+    case mojom::CoopAccessReportType::kAccessToCoopPageFromOther:
+      return false;
+  }
+}
+
 }  // namespace network

services/network/public/cpp/cross_origin_opener_policy.h

@@ -31,6 +31,9 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) CrossOriginOpenerPolicy final {
   base::Optional<std::string> report_only_reporting_endpoint;
 };
 
+COMPONENT_EXPORT(NETWORK_CPP_BASE)
+bool IsAccessFromCoopPage(mojom::CoopAccessReportType);
+
 }  // namespace network
 
 #endif  // SERVICES_NETWORK_PUBLIC_CPP_CROSS_ORIGIN_OPENER_POLICY_H_

services/network/public/mojom/cross_origin_opener_policy.mojom

@@ -9,8 +9,12 @@ import "mojo/public/mojom/base/unguessable_token.mojom";
 import "services/network/public/mojom/source_location.mojom";
 
 enum CoopAccessReportType {
-  kReportAccessFrom, // The reports are sent to the 'accessing window'.
-  kReportAccessTo,   // The reports are sent to the 'accessed window'.
+  kAccessFromCoopPageToOpener,
+  kAccessFromCoopPageToOpenee,
+  kAccessFromCoopPageToOther,
+  kAccessToCoopPageFromOpener,
+  kAccessToCoopPageFromOpenee,
+  kAccessToCoopPageFromOther,
 };
 
 // Reports potential COOP violations. Implemented in the browser process.

third_party/blink/renderer/core/frame/dom_window.cc

@@ -501,8 +501,7 @@ void DOMWindow::ReportCoopAccess(const char* property_name) {
     // TODO(arthursonzogni): Dispatch a console error/warning message.
 
     // Send a coop-access-violation report.
-    if (it->report_type ==
-        network::mojom::CoopAccessReportType::kReportAccessFrom) {
+    if (network::IsAccessFromCoopPage(it->report_type)) {
       ReportingContext::From(accessing_main_frame.DomWindow())
           ->QueueReport(MakeGarbageCollected<Report>(
               ReportType::kCoopAccessViolation,

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_openee-coop-ro.https.html

@@ -39,11 +39,11 @@ promise_test(async t => {
   tryAccess(openee);
 
   // 3. Check a report is sent to the openee.
-  let report = await receiveReport(report_token, "access-to-coop-page")
+  let report =
+    await receiveReport(report_token, "access-to-coop-page-from-opener")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
   assert_equals(report.url, openee_url.replace(/"/g, '%22'));
-  assert_equals(report.body.type, "access-to-coop-page");
   assert_equals(report.body.disposition, "reporting");
   assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
   assert_equals(report.body.property, "blur");

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop-ro.https.html

@@ -58,11 +58,11 @@ promise_test(async t => {
   `);
 
   // 5. Check a report sent to the opener.
-  let report = await receiveReport(opener_report_token, "access-from-coop-page")
+  let report =
+    await receiveReport(opener_report_token, "access-from-coop-page-to-openee")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
   assert_equals(report.url, opener_url.replace(/"/g, '%22'));
-  assert_equals(report.body.type, "access-from-coop-page");
   assert_equals(report.body.disposition, "reporting");
   assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
   assert_equals(report.body.property, "blur");

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_openee-coop-ro.https.html

@@ -33,11 +33,11 @@ promise_test(async t => {
   `);
 
   // 2. Check a report is sent to the openee.
-  let report = await receiveReport(report_token, "access-from-coop-page")
+  let report =
+    await receiveReport(report_token, "access-from-coop-page-to-opener")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
   assert_equals(report.url, openee_url.replace(/"/g, '%22'));
-  assert_equals(report.body.type, "access-from-coop-page");
   assert_equals(report.body.disposition, "reporting");
   assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
   assert_equals(report.body.property, "blur");

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop-ro.https.html

@@ -52,11 +52,11 @@ promise_test(async t => {
   `);
 
   // 4. Check a report sent to the opener.
-  let report = await receiveReport(opener_report_token, "access-to-coop-page")
+  let report =
+    await receiveReport(opener_report_token, "access-to-coop-page-from-openee")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
   assert_equals(report.url, opener_url.replace(/"/g, '%22'));
-  assert_equals(report.body.type, "access-to-coop-page");
   assert_equals(report.body.disposition, "reporting");
   assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
   assert_equals(report.body.property, "blur");