Changeset 287970 in webkit

Timestamp:

Jan 12, 2022, 7:23:40 PM (5 years ago)

Author:

wilander@apple.com

Message:

PCM: Same-site triggering events should support ephemeral measurement
​https://bugs.webkit.org/show_bug.cgi?id=235160
<rdar://87423294>

Reviewed by Alex Christensen.

Source/WebCore:

We added ephemeral measurement for direct response advertising in ​https://bugs.webkit.org/show_bug.cgi?id=228984.
We added support for same-site triggering events in ​https://bugs.webkit.org/show_bug.cgi?id=233173.
These two features should work together.

The bug was that WebKit::NetworkSession::handlePrivateClickMeasurementConversion()
only checked for cross-site triggering events when handling ephemeral measurements.

Test: http/tests/privateClickMeasurement/triggering-event-with-attribution-source-through-fetch-keepalive-ephemeral.html

• loader/PrivateClickMeasurement.cpp:

(WebCore::PrivateClickMeasurement::isNeitherSameSiteNorCrossSiteTriggeringEvent):

New convenience function to enhance readability in
WebKit::NetworkSession::handlePrivateClickMeasurementConversion().

• loader/PrivateClickMeasurement.h:

Source/WebKit:

We added ephemeral measurement for direct response advertising in ​https://bugs.webkit.org/show_bug.cgi?id=228984.
We added support for same-site triggering events in ​https://bugs.webkit.org/show_bug.cgi?id=233173.
These two features should work together.

• NetworkProcess/NetworkSession.cpp:

(WebKit::NetworkSession::handlePrivateClickMeasurementConversion):

This function previously only checked for cross-site triggering events when
handling ephemeral measurements. Now it also checks for same-site triggering
events.

LayoutTests:

• http/tests/privateClickMeasurement/triggering-event-with-attribution-source-through-fetch-keepalive-ephemeral-expected.txt: Added.
• http/tests/privateClickMeasurement/triggering-event-with-attribution-source-through-fetch-keepalive-ephemeral.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/privateClickMeasurement/triggering-event-with-attribution-source-through-fetch-keepalive-ephemeral-expected.txt (added)
• LayoutTests/http/tests/privateClickMeasurement/triggering-event-with-attribution-source-through-fetch-keepalive-ephemeral.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/PrivateClickMeasurement.cpp (modified) (1 diff)
• Source/WebCore/loader/PrivateClickMeasurement.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkSession.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-01-12  John Wilander  <wilander@apple.com>
+
+        PCM: Same-site triggering events should support ephemeral measurement
+        https://bugs.webkit.org/show_bug.cgi?id=235160
+        <rdar://87423294>
+
+        Reviewed by Alex Christensen.
+
+        * http/tests/privateClickMeasurement/triggering-event-with-attribution-source-through-fetch-keepalive-ephemeral-expected.txt: Added.
+        * http/tests/privateClickMeasurement/triggering-event-with-attribution-source-through-fetch-keepalive-ephemeral.html: Added.
+
 2022-01-12  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-12  John Wilander  <wilander@apple.com>
+
+        PCM: Same-site triggering events should support ephemeral measurement
+        https://bugs.webkit.org/show_bug.cgi?id=235160
+        <rdar://87423294>
+
+        Reviewed by Alex Christensen.
+
+        We added ephemeral measurement for direct response advertising in https://bugs.webkit.org/show_bug.cgi?id=228984.
+        We added support for same-site triggering events in https://bugs.webkit.org/show_bug.cgi?id=233173.
+        These two features should work together.
+
+        The bug was that WebKit::NetworkSession::handlePrivateClickMeasurementConversion()
+        only checked for cross-site triggering events when handling ephemeral measurements.
+
+        Test: http/tests/privateClickMeasurement/triggering-event-with-attribution-source-through-fetch-keepalive-ephemeral.html
+
+        * loader/PrivateClickMeasurement.cpp:
+        (WebCore::PrivateClickMeasurement::isNeitherSameSiteNorCrossSiteTriggeringEvent):
+            New convenience function to enhance readability in
+            WebKit::NetworkSession::handlePrivateClickMeasurementConversion().
+        * loader/PrivateClickMeasurement.h:
+
 2022-01-12  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/loader/PrivateClickMeasurement.cpp

@@ -125 +125 @@
 }
 
+bool PrivateClickMeasurement::isNeitherSameSiteNorCrossSiteTriggeringEvent(const RegistrableDomain& redirectDomain, const URL& firstPartyURL, const AttributionTriggerData& attributionTriggerData)
+{
+    auto isSameSiteTriggeringEvent = redirectDomain.matches(firstPartyURL) && attributionTriggerData.sourceRegistrableDomain;
+    if (isSameSiteTriggeringEvent)
+        return false;
+    auto isCrossSiteTriggeringEvent = sourceSite().registrableDomain == redirectDomain && !attributionTriggerData.sourceRegistrableDomain;
+    return !isCrossSiteTriggeringEvent;
+}
+
 Expected<PrivateClickMeasurement::AttributionTriggerData, String> PrivateClickMeasurement::parseAttributionRequestQuery(const URL& redirectURL)
 {

trunk/Source/WebCore/loader/PrivateClickMeasurement.h

@@ -379 +379 @@
 
     WEBCORE_EXPORT static const Seconds maxAge();
+    WEBCORE_EXPORT bool isNeitherSameSiteNorCrossSiteTriggeringEvent(const RegistrableDomain& redirectDomain, const URL& firstPartyURL, const AttributionTriggerData&);
     WEBCORE_EXPORT static Expected<AttributionTriggerData, String> parseAttributionRequest(const URL& redirectURL);
     WEBCORE_EXPORT AttributionSecondsUntilSendData attributeAndGetEarliestTimeToSend(AttributionTriggerData&&, IsRunningLayoutTest);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-12  John Wilander  <wilander@apple.com>
+
+        PCM: Same-site triggering events should support ephemeral measurement
+        https://bugs.webkit.org/show_bug.cgi?id=235160
+        <rdar://87423294>
+
+        Reviewed by Alex Christensen.
+
+        We added ephemeral measurement for direct response advertising in https://bugs.webkit.org/show_bug.cgi?id=228984.
+        We added support for same-site triggering events in https://bugs.webkit.org/show_bug.cgi?id=233173.
+        These two features should work together.
+
+        * NetworkProcess/NetworkSession.cpp:
+        (WebKit::NetworkSession::handlePrivateClickMeasurementConversion):
+            This function previously only checked for cross-site triggering events when
+            handling ephemeral measurements. Now it also checks for same-site triggering
+            events.
+
 2022-01-12  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp

@@ -373 +373 @@
 
         // Ephemeral measurement can only have one pending click.
-        if (ephemeralMeasurement.sourceSite().registrableDomain != redirectDomain)
+        if (ephemeralMeasurement.isNeitherSameSiteNorCrossSiteTriggeringEvent(redirectDomain, firstPartyForCookies, attributionTriggerData))
             return;
         if (ephemeralMeasurement.destinationSite().registrableDomain != RegistrableDomain(firstPartyForCookies))