Changeset 283593 in webkit

Timestamp:

Oct 5, 2021 5:46:43 PM (10 months ago)

Author:

wilander@apple.com

Message:

PCM: Allow measurement of links in nested, cross-site iframes
​https://bugs.webkit.org/show_bug.cgi?id=229204
<rdar://problem/82310386>

Reviewed by Alex Christensen.

Developers have said it would be great to allow measurement of links served in
nested, cross-site iframes on the click source. The click still count as if it
happened on the first party click source site, and any attribution report still
goes to that first party. This change enables the *serving* of measurable links
in nested, cross-site iframes.

The standards issue where this was discussed:
​https://github.com/privacycg/private-click-measurement/issues/7

Source/WebCore:

Test: http/tests/privateClickMeasurement/store-private-click-measurement-nested.html

• html/HTMLAnchorElement.cpp:

(WebCore::HTMLAnchorElement::parsePrivateClickMeasurement const):

Removed the block for nested, cross-site iframes.

LayoutTests:

• http/tests/privateClickMeasurement/resources/nestedTargetLink.html: Added.
• http/tests/privateClickMeasurement/store-private-click-measurement-nested-expected.txt: Added.
• http/tests/privateClickMeasurement/store-private-click-measurement-nested.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/privateClickMeasurement/resources/nestedTargetLink.html (added)
• LayoutTests/http/tests/privateClickMeasurement/store-private-click-measurement-nested-expected.txt (added)
• LayoutTests/http/tests/privateClickMeasurement/store-private-click-measurement-nested.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLAnchorElement.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-05  John Wilander  <wilander@apple.com>
+
+        PCM: Allow measurement of links in nested, cross-site iframes
+        https://bugs.webkit.org/show_bug.cgi?id=229204
+        <rdar://problem/82310386>
+
+        Reviewed by Alex Christensen.
+
+        Developers have said it would be great to allow measurement of links served in
+        nested, cross-site iframes on the click source. The click still count as if it
+        happened on the first party click source site, and any attribution report still
+        goes to that first party. This change enables the *serving* of measurable links
+        in nested, cross-site iframes.
+
+        The standards issue where this was discussed:
+        https://github.com/privacycg/private-click-measurement/issues/7
+
+        * http/tests/privateClickMeasurement/resources/nestedTargetLink.html: Added.
+        * http/tests/privateClickMeasurement/store-private-click-measurement-nested-expected.txt: Added.
+        * http/tests/privateClickMeasurement/store-private-click-measurement-nested.html: Added.
+
 2021-10-05  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-05  John Wilander  <wilander@apple.com>
+
+        PCM: Allow measurement of links in nested, cross-site iframes
+        https://bugs.webkit.org/show_bug.cgi?id=229204
+        <rdar://problem/82310386>
+
+        Reviewed by Alex Christensen.
+
+        Developers have said it would be great to allow measurement of links served in
+        nested, cross-site iframes on the click source. The click still count as if it
+        happened on the first party click source site, and any attribution report still
+        goes to that first party. This change enables the *serving* of measurable links
+        in nested, cross-site iframes.
+
+        The standards issue where this was discussed:
+        https://github.com/privacycg/private-click-measurement/issues/7
+
+        Test: http/tests/privateClickMeasurement/store-private-click-measurement-nested.html
+
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::parsePrivateClickMeasurement const):
+            Removed the block for nested, cross-site iframes.
+
 2021-10-05  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/html/HTMLAnchorElement.cpp

@@ -403 +403 @@
     using AttributionDestinationSite = PrivateClickMeasurement::AttributionDestinationSite;
 
+    RefPtr<Frame> frame = document().frame();
     auto* page = document().page();
-    if (!page || page->sessionID().isEphemeral()
+    if (!frame ||!page || page->sessionID().isEphemeral()
         || !document().settings().privateClickMeasurementEnabled()
         || !UserGestureIndicator::processingUserGesture())
@@ -422 +423 @@
     }
 
-    RefPtr<Frame> frame = document().frame();
-    if (!frame || !frame->isMainFrame()) {
-        document().addConsoleMessage(MessageSource::Other, MessageLevel::Warning, "Private Click Measurement is only supported in the main frame."_s);
-        return std::nullopt;
-    }
-    
     auto attributionSourceID = parseHTMLNonNegativeInteger(attributionSourceIDAttr);
     if (!attributionSourceID) {
@@ -445 +440 @@
     }
 
-    RegistrableDomain documentRegistrableDomain { document().url() };
-    if (documentRegistrableDomain.matches(destinationURL)) {
+    RegistrableDomain mainDocumentRegistrableDomain;
+    if (auto mainDocument = frame->mainFrame().document())
+        mainDocumentRegistrableDomain = RegistrableDomain { mainDocument->url() };
+    else {
+        document().addConsoleMessage(MessageSource::Other, MessageLevel::Warning, "Could not find a main document to use as source site for Private Click Measurement."_s);
+        return std::nullopt;
+    }
+
+    if (mainDocumentRegistrableDomain.matches(destinationURL)) {
         document().addConsoleMessage(MessageSource::Other, MessageLevel::Warning, "attributiondestination can not be the same site as the current website."_s);
         return std::nullopt;
@@ -456 +458 @@
     String bundleID;
 #endif
-    auto privateClickMeasurement = PrivateClickMeasurement { SourceID(attributionSourceID.value()), SourceSite(WTFMove(documentRegistrableDomain)), AttributionDestinationSite(destinationURL), bundleID, WallTime::now(), PrivateClickMeasurement::AttributionEphemeral::No };
+    auto privateClickMeasurement = PrivateClickMeasurement { SourceID(attributionSourceID.value()), SourceSite(WTFMove(mainDocumentRegistrableDomain)), AttributionDestinationSite(destinationURL), bundleID, WallTime::now(), PrivateClickMeasurement::AttributionEphemeral::No };
 
     auto attributionSourceNonceAttr = attributeWithoutSynchronization(attributionsourcenonceAttr);