[COOP] access reporting: expose the other window URL to ReportingObserver.

This makes network reports and ReportingObserver's report similar.

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

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

@@ -10,20 +10,76 @@ namespace blink {
 CoopAccessViolationReportBody::CoopAccessViolationReportBody(
     std::unique_ptr<SourceLocation> source_location,
     network::mojom::blink::CoopAccessReportType type,
-    const String& property)
+    const String& property,
+    const String& reported_url)
     : LocationReportBody(std::move(source_location)),
       type_(type),
-      property_(property) {}
+      property_(property),
+      reported_url_(reported_url) {}
 
 String CoopAccessViolationReportBody::type() const {
   return network::CoopAccessReportTypeToString(type_);
 }
 
+String CoopAccessViolationReportBody::openeeURL() const {
+  switch (type_) {
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOpenee:
+      return reported_url_;
+
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOpener:
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOpenee:
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOther:
+      NOTREACHED();
+      FALLTHROUGH;
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOpener:
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOther:
+      return String();
+  }
+}
+
+String CoopAccessViolationReportBody::openerURL() const {
+  switch (type_) {
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOpener:
+      return reported_url_;
+
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOpener:
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOpenee:
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOther:
+      NOTREACHED();
+      FALLTHROUGH;
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOpenee:
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOther:
+      return String();
+  }
+}
+
+String CoopAccessViolationReportBody::otherDocumentURL() const {
+  switch (type_) {
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOther:
+      return reported_url_;
+
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOpener:
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOpenee:
+    case network::mojom::CoopAccessReportType::kAccessToCoopPageFromOther:
+      NOTREACHED();
+      FALLTHROUGH;
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOpenee:
+    case network::mojom::CoopAccessReportType::kAccessFromCoopPageToOpener:
+      return String();
+  }
+}
+
 void CoopAccessViolationReportBody::BuildJSONValue(
     V8ObjectBuilder& builder) const {
   LocationReportBody::BuildJSONValue(builder);
   builder.AddString("type", type());
   builder.AddString("property", property());
+  if (String opener_url = openerURL())
+    builder.AddString("openerURL", opener_url);
+  if (String openee_url = openeeURL())
+    builder.AddString("openeeURL", openee_url);
+  if (String other_document_url = otherDocumentURL())
+    builder.AddString("otherDocumentURL", other_document_url);
 }
 
 }  // namespace blink

third_party/blink/renderer/core/frame/coop_access_violation_report_body.h

@@ -19,15 +19,20 @@ class CORE_EXPORT CoopAccessViolationReportBody : public LocationReportBody {
   CoopAccessViolationReportBody(
       std::unique_ptr<SourceLocation> source_location,
       network::mojom::blink::CoopAccessReportType type,
-      const String& property);
+      const String& property,
+      const String& reported_url);
   ~CoopAccessViolationReportBody() final = default;
   String type() const;
+  String openeeURL() const;
+  String openerURL() const;
+  String otherDocumentURL() const;
   const String& property() const { return property_; }
   void BuildJSONValue(V8ObjectBuilder& builder) const final;
 
  private:
   network::mojom::blink::CoopAccessReportType type_;
   const String property_;
+  const String reported_url_;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/frame/coop_access_violation_report_body.idl

@@ -12,5 +12,8 @@
   readonly attribute unsigned long? columnNumber;
   readonly attribute DOMString type;
   readonly attribute DOMString property;
+  readonly attribute DOMString? openeeURL;
+  readonly attribute DOMString? openerURL;
+  readonly attribute DOMString? otherDocumentURL;
   [CallWith=ScriptState] object toJSON();
 };

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

@@ -540,15 +540,13 @@ void DOMWindow::ReportCoopAccess(const char* property_name) {
                                       std::move(it->reported_window_url));
       // Send a coop-access-violation report.
       if (network::IsAccessFromCoopPage(it->report_type)) {
-        // TODO(arthursonzogni): Fill the openeeURL, openerURL and
-        // otherDocumentURL.
         ReportingContext::From(accessing_main_frame.DomWindow())
             ->QueueReport(MakeGarbageCollected<Report>(
                 ReportType::kCoopAccessViolation,
                 accessing_main_frame.GetDocument()->Url().GetString(),
                 MakeGarbageCollected<CoopAccessViolationReportBody>(
-                    std::move(location), it->report_type,
-                    String(property_name))));
+                    std::move(location), it->report_type, String(property_name),
+                    it->reported_window_url)));
       }
     }
 

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/reporting-observer.html

@@ -65,6 +65,9 @@ promise_test(async t => {
   assert_source_location_found(report_access_from[0])
   assert_equals(report_access_from[0].body.type,
                 "access-from-coop-page-to-openee");
+  assert_equals(report_access_from[0].body.openeeURL, openee_url);
+  assert_equals(report_access_from[0].body.openerURL, undefined);
+  assert_equals(report_access_from[0].body.otherDocumentURL, undefined);
 
   // 5. The openee tries to access its opener. No reports for blocked access
   //    to the COOP page should be dispatched.
@@ -122,6 +125,9 @@ promise_test(async t => {
   assert_source_location_found(report_access_from[0])
   assert_equals(report_access_from[0].body.type,
                 "access-from-coop-page-to-opener");
+  assert_equals(report_access_from[0].body.openeeURL, undefined);
+  assert_equals(report_access_from[0].body.openerURL, opener_url);
+  assert_equals(report_access_from[0].body.otherDocumentURL, undefined);
 
   // 4. The opener tries to access its openee. No reports for blocked access
   //    to the COOP page should be dispatched.
@@ -198,6 +204,9 @@ promise_test(async t => {
   assert_source_location_found(reports[0]);
   assert_equals(reports[0].body.type,
                 "access-from-coop-page-to-openee");
+  assert_equals(reports[0].body.openeeURL, openee_url);
+  assert_equals(reports[0].body.openerURL, undefined);
+  assert_equals(reports[0].body.otherDocumentURL, undefined);
 }, "Access from same-origin iframe")
 
 promise_test(async t => {