Age out unconverted Ad Click Attributions after one week.

https://bugs.webkit.org/show_bug.cgi?id=197238
<rdar://problem/50177349>

Reviewed by Chris Dumez.

Source/WebCore:

This patch adds the two functions AdClickAttribution::markAsExpired()
and AdClickAttribution::hasExpired() which make use of the existing
m_timeOfAdClick member.

Test: http/tests/adClickAttribution/expired-attributions-removed.html

* loader/AdClickAttribution.cpp:
(WebCore::AdClickAttribution::markAsExpired):
(WebCore::AdClickAttribution::hasExpired const):
* loader/AdClickAttribution.h:

Source/WebKit:

AdClickAttributionManager::storeUnconverted() and
AdClickAttributionManager::convert() now start by calling the new
AdClickAttributionManager::clearExpired() function to remove any
expired, unconverted attributions before continuing.

The rest of the patch is infrastructure to allow tests to expire
all unconverted attributions early.

* NetworkProcess/AdClickAttributionManager.cpp:
(WebKit::AdClickAttributionManager::storeUnconverted):
(WebKit::AdClickAttributionManager::convert):
(WebKit::AdClickAttributionManager::clearExpired):
(WebKit::AdClickAttributionManager::markAllUnconvertedAsExpiredForTesting):
* NetworkProcess/AdClickAttributionManager.h:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::markAdClickAttributionsAsExpiredForTesting):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* NetworkProcess/NetworkSession.cpp:
(WebKit::NetworkSession::markAdClickAttributionsAsExpiredForTesting):
* NetworkProcess/NetworkSession.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageSetAdClickAttributionConversionURLForTesting):
(WKPageMarkAdClickAttributionsAsExpiredForTesting):
* UIProcess/API/C/WKPagePrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::markAdClickAttributionsAsExpiredForTesting):
* UIProcess/WebPageProxy.h:

Tools:

This patch adds infrastructure to allow tests to expire all unconverted
attributions early.

* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::markAdClickAttributionsAsExpiredForTesting):
* WebKitTestRunner/InjectedBundle/TestRunner.h:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::markAdClickAttributionsAsExpiredForTesting):
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):

LayoutTests:

* http/tests/adClickAttribution/expired-attributions-removed-expected.txt: Added.
* http/tests/adClickAttribution/expired-attributions-removed.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244614 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index abe3d64..f8123ec 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2019-04-24  John Wilander  <wilander@apple.com>
+
+        Age out unconverted Ad Click Attributions after one week.
+        https://bugs.webkit.org/show_bug.cgi?id=197238
+        <rdar://problem/50177349>
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/adClickAttribution/expired-attributions-removed-expected.txt: Added.
+        * http/tests/adClickAttribution/expired-attributions-removed.html: Added.
+
 2019-04-24  Simon Fraser  <simon.fraser@apple.com>
 
         REGRESSION (iOS 12.2): CSS perspective property value can only be set correctly once

diff --git a/LayoutTests/http/tests/adClickAttribution/expired-attributions-removed-expected.txt b/LayoutTests/http/tests/adClickAttribution/expired-attributions-removed-expected.txt
new file mode 100644 (file)
index 0000000..5e7aedd
--- /dev/null
+++ b/LayoutTests/http/tests/adClickAttribution/expired-attributions-removed-expected.txt
@@ -0,0 +1,5 @@
+Tests expiration of ad click attribution.
+
+
+
+No stored Ad Click Attribution data.

diff --git a/LayoutTests/http/tests/adClickAttribution/expired-attributions-removed.html b/LayoutTests/http/tests/adClickAttribution/expired-attributions-removed.html
new file mode 100644 (file)
index 0000000..7a35931
--- /dev/null
+++ b/LayoutTests/http/tests/adClickAttribution/expired-attributions-removed.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <script src="/js-test-resources/ui-helper.js"></script>
+    <script src="resources/util.js"></script>
+</head>
+<body onload="setTimeout(runTest, 0)">
+<div id="description">Tests expiration of ad click attribution.</div>
+<a id="targetLink" href="http://localhost:8000/adClickAttribution/expired-attributions-removed.html?stepTwo" adcampaignid="3" addestination="http://localhost:8000">Link</a><br>
+<div id="output"></div>
+<script>
+    prepareTest();
+
+    function activateElement(elementID) {
+        var element = document.getElementById(elementID);
+        var centerX = element.offsetLeft + element.offsetWidth / 2;
+        var centerY = element.offsetTop + element.offsetHeight / 2;
+        UIHelper.activateAt(centerX, centerY).then(
+            function () {
+            },
+            function () {
+                document.getElementById("output").innerText = "FAIL Promise rejected.";
+                tearDownAndFinish();
+            }
+        );
+    }
+
+    function runTest() {
+        if (window.testRunner) {
+            if (window.location.search === "?stepTwo") {
+                testRunner.markAdClickAttributionsAsExpiredForTesting();
+                let imageElement = document.createElement("img");
+                imageElement.src = "https://127.0.0.1:8443/adClickAttribution/resources/redirectToConversion.php?conversionData=12";
+                imageElement.id = "pixel";
+                imageElement.onerror = function() {
+                    testRunner.dumpAdClickAttribution();
+                    document.body.removeChild(document.getElementById("targetLink"));
+                    document.body.removeChild(document.getElementById("pixel"));
+                    tearDownAndFinish();
+                };
+                document.body.appendChild(imageElement);
+            } else {
+                activateElement("targetLink");
+            }
+        } else {
+            document.getElementById("output").innerText = "FAIL No testRunner.";
+        }
+    }
+</script>
+</body>
+</html>

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4e0bc60..013d3b9 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2019-04-24  John Wilander  <wilander@apple.com>
+
+        Age out unconverted Ad Click Attributions after one week.
+        https://bugs.webkit.org/show_bug.cgi?id=197238
+        <rdar://problem/50177349>
+
+        Reviewed by Chris Dumez.
+
+        This patch adds the two functions AdClickAttribution::markAsExpired()
+        and AdClickAttribution::hasExpired() which make use of the existing
+        m_timeOfAdClick member.
+
+        Test: http/tests/adClickAttribution/expired-attributions-removed.html
+
+        * loader/AdClickAttribution.cpp:
+        (WebCore::AdClickAttribution::markAsExpired):
+        (WebCore::AdClickAttribution::hasExpired const):
+        * loader/AdClickAttribution.h:
+
 2019-04-24  Simon Fraser  <simon.fraser@apple.com>
 
         REGRESSION (iOS 12.2): CSS perspective property value can only be set correctly once

diff --git a/Source/WebCore/loader/AdClickAttribution.cpp b/Source/WebCore/loader/AdClickAttribution.cpp
index 3222c89..5810094 100644 (file)
--- a/Source/WebCore/loader/AdClickAttribution.cpp
+++ b/Source/WebCore/loader/AdClickAttribution.cpp
@@ -36,6 +36,7 @@ namespace WebCore {
 static const char adClickAttributionPathPrefix[] = "/.well-known/ad-click-attribution/";
 const size_t adClickConversionDataPathSegmentSize = 2;
 const size_t adClickPriorityPathSegmentSize = 2;
+const Seconds maxAge { 24_h * 7 };
 
 bool AdClickAttribution::isValid() const
 {
@@ -93,6 +94,16 @@ Optional<Seconds> AdClickAttribution::convertAndGetEarliestTimeToSend(Conversion
     return seconds;
 }
 
+void AdClickAttribution::markAsExpired()
+{
+    m_timeOfAdClick = { };
+}
+
+bool AdClickAttribution::hasExpired() const
+{
+    return WallTime::now() > m_timeOfAdClick + maxAge;
+}
+
 bool AdClickAttribution::hasHigherPriorityThan(const AdClickAttribution& other) const
 {
     if (!other.m_conversion)

diff --git a/Source/WebCore/loader/AdClickAttribution.h b/Source/WebCore/loader/AdClickAttribution.h
index 5c67938..3e1ac74 100644 (file)
--- a/Source/WebCore/loader/AdClickAttribution.h
+++ b/Source/WebCore/loader/AdClickAttribution.h
@@ -248,6 +248,8 @@ public:
     const Source& source() const { return m_source; };
     const Destination& destination() const { return m_destination; };
     Optional<WallTime> earliestTimeToSend() const { return m_earliestTimeToSend; };
+    WEBCORE_EXPORT void markAsExpired();
+    WEBCORE_EXPORT bool hasExpired() const;
     WEBCORE_EXPORT void markConversionAsSent();
     WEBCORE_EXPORT bool wasConversionSent() const;
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 8e8baa8..6808668 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,40 @@
+2019-04-24  John Wilander  <wilander@apple.com>
+
+        Age out unconverted Ad Click Attributions after one week.
+        https://bugs.webkit.org/show_bug.cgi?id=197238
+        <rdar://problem/50177349>
+
+        Reviewed by Chris Dumez.
+
+        AdClickAttributionManager::storeUnconverted() and
+        AdClickAttributionManager::convert() now start by calling the new
+        AdClickAttributionManager::clearExpired() function to remove any
+        expired, unconverted attributions before continuing.
+
+        The rest of the patch is infrastructure to allow tests to expire
+        all unconverted attributions early.
+
+        * NetworkProcess/AdClickAttributionManager.cpp:
+        (WebKit::AdClickAttributionManager::storeUnconverted):
+        (WebKit::AdClickAttributionManager::convert):
+        (WebKit::AdClickAttributionManager::clearExpired):
+        (WebKit::AdClickAttributionManager::markAllUnconvertedAsExpiredForTesting):
+        * NetworkProcess/AdClickAttributionManager.h:
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::markAdClickAttributionsAsExpiredForTesting):
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkProcess.messages.in:
+        * NetworkProcess/NetworkSession.cpp:
+        (WebKit::NetworkSession::markAdClickAttributionsAsExpiredForTesting):
+        * NetworkProcess/NetworkSession.h:
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetAdClickAttributionConversionURLForTesting):
+        (WKPageMarkAdClickAttributionsAsExpiredForTesting):
+        * UIProcess/API/C/WKPagePrivate.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::markAdClickAttributionsAsExpiredForTesting):
+        * UIProcess/WebPageProxy.h:
+
 2019-04-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Plumb the navigation's request when determining recommended compatibility mode

diff --git a/Source/WebKit/NetworkProcess/AdClickAttributionManager.cpp b/Source/WebKit/NetworkProcess/AdClickAttributionManager.cpp
index b6ed422..08b00fb 100644 (file)
--- a/Source/WebKit/NetworkProcess/AdClickAttributionManager.cpp
+++ b/Source/WebKit/NetworkProcess/AdClickAttributionManager.cpp
@@ -45,6 +45,8 @@ using Conversion = AdClickAttribution::Conversion;
 
 void AdClickAttributionManager::storeUnconverted(AdClickAttribution&& attribution)
 {
+    clearExpired();
+    
     m_unconvertedAdClickAttributionMap.set(std::make_pair(attribution.source(), attribution.destination()), WTFMove(attribution));
 }
 
@@ -55,6 +57,8 @@ void AdClickAttributionManager::startTimer(Seconds seconds)
 
 void AdClickAttributionManager::convert(const Source& source, const Destination& destination, Conversion&& conversion)
 {
+    clearExpired();
+
     if (!conversion.isValid())
         return;
 
@@ -187,6 +191,13 @@ void AdClickAttributionManager::clearForRegistrableDomain(const RegistrableDomai
     });
 }
 
+void AdClickAttributionManager::clearExpired()
+{
+    m_unconvertedAdClickAttributionMap.removeIf([](auto& keyAndValue) {
+        return keyAndValue.value.hasExpired();
+    });
+}
+
 void AdClickAttributionManager::toString(CompletionHandler<void(String)>&& completionHandler) const
 {
     if (m_unconvertedAdClickAttributionMap.isEmpty() && m_convertedAdClickAttributionMap.isEmpty())
@@ -230,4 +241,10 @@ void AdClickAttributionManager::setConversionURLForTesting(URL&& testURL)
         m_conversionBaseURLForTesting = WTFMove(testURL);
 }
 
+void AdClickAttributionManager::markAllUnconvertedAsExpiredForTesting()
+{
+    for (auto& attribution : m_unconvertedAdClickAttributionMap.values())
+        attribution.markAsExpired();
+}
+
 } // namespace WebKit

diff --git a/Source/WebKit/NetworkProcess/AdClickAttributionManager.h b/Source/WebKit/NetworkProcess/AdClickAttributionManager.h
index 7ddd1fa..250748c 100644 (file)
--- a/Source/WebKit/NetworkProcess/AdClickAttributionManager.h
+++ b/Source/WebKit/NetworkProcess/AdClickAttributionManager.h
@@ -63,11 +63,13 @@ public:
     void setPingLoadFunction(Function<void(NetworkResourceLoadParameters&&, CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&)>&&)>&& pingLoadFunction) { m_pingLoadFunction = WTFMove(pingLoadFunction); }
     void setOverrideTimerForTesting(bool value) { m_isRunningTest = value; }
     void setConversionURLForTesting(URL&&);
+    void markAllUnconvertedAsExpiredForTesting();
 
 private:
     void startTimer(Seconds);
     void fireConversionRequest(const AdClickAttribution&);
     void firePendingConversionRequests();
+    void clearExpired();
 
     HashMap<std::pair<Source, Destination>, AdClickAttribution> m_unconvertedAdClickAttributionMap;
     HashMap<std::pair<Source, Destination>, AdClickAttribution> m_convertedAdClickAttributionMap;

diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
index 28078f4..930b183 100644 (file)
--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
@@ -2548,4 +2548,12 @@ void NetworkProcess::setAdClickAttributionConversionURLForTesting(PAL::SessionID
     completionHandler();
 }
 
+void NetworkProcess::markAdClickAttributionsAsExpiredForTesting(PAL::SessionID sessionID, CompletionHandler<void()>&& completionHandler)
+{
+    if (auto* session = networkSession(sessionID))
+        session->markAdClickAttributionsAsExpiredForTesting();
+
+    completionHandler();
+}
+
 } // namespace WebKit

diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
index d234be3..1324212 100644 (file)
--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
@@ -330,6 +330,7 @@ public:
     void clearAdClickAttribution(PAL::SessionID, CompletionHandler<void()>&&);
     void setAdClickAttributionOverrideTimerForTesting(PAL::SessionID, bool value, CompletionHandler<void()>&&);
     void setAdClickAttributionConversionURLForTesting(PAL::SessionID, URL&&, CompletionHandler<void()>&&);
+    void markAdClickAttributionsAsExpiredForTesting(PAL::SessionID, CompletionHandler<void()>&&);
 
     WebCore::StorageQuotaManager& storageQuotaManager(PAL::SessionID, const WebCore::ClientOrigin&);
 

diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
index 568dbf8..962ae2e 100644 (file)
--- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
+++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
@@ -171,5 +171,6 @@ messages -> NetworkProcess LegacyReceiver {
     ClearAdClickAttribution(PAL::SessionID sessionID) -> () Async
     SetAdClickAttributionOverrideTimerForTesting(PAL::SessionID sessionID, bool value) -> () Async
     SetAdClickAttributionConversionURLForTesting(PAL::SessionID sessionID, URL url) -> () Async
+    MarkAdClickAttributionsAsExpiredForTesting(PAL::SessionID sessionID) -> () Async
     RemoveCredential(WebCore::Credential credential, WebCore::ProtectionSpace protectionSpace) -> () Async
 }

diff --git a/Source/WebKit/NetworkProcess/NetworkSession.cpp b/Source/WebKit/NetworkProcess/NetworkSession.cpp
index 337ad91..4261b6a 100644 (file)
--- a/Source/WebKit/NetworkProcess/NetworkSession.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkSession.cpp
@@ -178,4 +178,9 @@ void NetworkSession::setAdClickAttributionConversionURLForTesting(URL&& url)
     m_adClickAttribution->setConversionURLForTesting(WTFMove(url));
 }
 
+void NetworkSession::markAdClickAttributionsAsExpiredForTesting()
+{
+    m_adClickAttribution->markAllUnconvertedAsExpiredForTesting();
+}
+
 } // namespace WebKit

diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h
index 4141349..32e1522 100644 (file)
--- a/Source/WebKit/NetworkProcess/NetworkSession.h
+++ b/Source/WebKit/NetworkProcess/NetworkSession.h
@@ -86,6 +86,7 @@ public:
     void clearAdClickAttributionForRegistrableDomain(WebCore::RegistrableDomain&&);
     void setAdClickAttributionOverrideTimerForTesting(bool value);
     void setAdClickAttributionConversionURLForTesting(URL&&);
+    void markAdClickAttributionsAsExpiredForTesting();
 
 protected:
     NetworkSession(NetworkProcess&, PAL::SessionID);

diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
index 414dc49..ed86358 100644 (file)
--- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
@@ -2746,9 +2746,16 @@ void WKPageSetAdClickAttributionOverrideTimerForTesting(WKPageRef page, bool val
     });
 }
 
-void WKPageSetAdClickAttributionConversionURLForTesting(WKPageRef page, WKURLRef URLRef, WKPageSetAdClickAttributionOverrideTimerForTestingFunction callback, void* callbackContext)
+void WKPageSetAdClickAttributionConversionURLForTesting(WKPageRef page, WKURLRef URLRef, WKPageSetAdClickAttributionConversionURLForTestingFunction callback, void* callbackContext)
 {
     toImpl(page)->setAdClickAttributionConversionURLForTesting(URL(URL(), toWTFString(URLRef)), [callbackContext, callback] () {
         callback(callbackContext);
     });
 }
+
+void WKPageMarkAdClickAttributionsAsExpiredForTesting(WKPageRef page, WKPageMarkAdClickAttributionsAsExpiredForTestingFunction callback, void* callbackContext)
+{
+    toImpl(page)->markAdClickAttributionsAsExpiredForTesting([callbackContext, callback] () {
+        callback(callbackContext);
+    });
+}

diff --git a/Source/WebKit/UIProcess/API/C/WKPagePrivate.h b/Source/WebKit/UIProcess/API/C/WKPagePrivate.h
index c99f732..3d959ff 100644 (file)
--- a/Source/WebKit/UIProcess/API/C/WKPagePrivate.h
+++ b/Source/WebKit/UIProcess/API/C/WKPagePrivate.h
@@ -191,6 +191,8 @@ typedef void (*WKPageSetAdClickAttributionOverrideTimerForTestingFunction)(void*
 WK_EXPORT void WKPageSetAdClickAttributionOverrideTimerForTesting(WKPageRef page, bool value, WKPageSetAdClickAttributionOverrideTimerForTestingFunction callback, void* callbackContext);
 typedef void (*WKPageSetAdClickAttributionConversionURLForTestingFunction)(void* functionContext);
 WK_EXPORT void WKPageSetAdClickAttributionConversionURLForTesting(WKPageRef page, WKURLRef urlString, WKPageSetAdClickAttributionConversionURLForTestingFunction callback, void* callbackContext);
+typedef void (*WKPageMarkAdClickAttributionsAsExpiredForTestingFunction)(void* functionContext);
+WK_EXPORT void WKPageMarkAdClickAttributionsAsExpiredForTesting(WKPageRef page, WKPageMarkAdClickAttributionsAsExpiredForTestingFunction callback, void* callbackContext);
 
 #ifdef __cplusplus
 }

diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
index c48adcd..c56d661 100644 (file)
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -8946,6 +8946,17 @@ void WebPageProxy::setAdClickAttributionConversionURLForTesting(const URL& url,
     }
 }
 
+void WebPageProxy::markAdClickAttributionsAsExpiredForTesting(CompletionHandler<void()>&& completionHandler)
+{
+    if (auto* networkProcess = m_process->processPool().networkProcess()) {
+        if (!networkProcess->canSendMessage()) {
+            completionHandler();
+            return;
+        }
+        networkProcess->sendWithAsyncReply(Messages::NetworkProcess::MarkAdClickAttributionsAsExpiredForTesting(m_websiteDataStore->sessionID()), WTFMove(completionHandler));
+    }
+}
+
 #if ENABLE(SPEECH_SYNTHESIS)
 WebPageProxy::SpeechSynthesisData& WebPageProxy::speechSynthesisData()
 {

diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
index 3c54aa9..44fc8a0 100644 (file)
--- a/Source/WebKit/UIProcess/WebPageProxy.h
+++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -1507,6 +1507,7 @@ public:
     void clearAdClickAttribution(CompletionHandler<void()>&&);
     void setAdClickAttributionOverrideTimerForTesting(bool value, CompletionHandler<void()>&&);
     void setAdClickAttributionConversionURLForTesting(const URL&, CompletionHandler<void()>&&);
+    void markAdClickAttributionsAsExpiredForTesting(CompletionHandler<void()>&&);
 
 #if ENABLE(SPEECH_SYNTHESIS)
     void speechSynthesisVoiceList(CompletionHandler<void(Vector<WebSpeechSynthesisVoice>&&)>&&);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a5f487c..028717e 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,24 @@
+2019-04-24  John Wilander  <wilander@apple.com>
+
+        Age out unconverted Ad Click Attributions after one week.
+        https://bugs.webkit.org/show_bug.cgi?id=197238
+        <rdar://problem/50177349>
+
+        Reviewed by Chris Dumez.
+
+        This patch adds infrastructure to allow tests to expire all unconverted
+        attributions early.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::markAdClickAttributionsAsExpiredForTesting):
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::markAdClickAttributionsAsExpiredForTesting):
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
+
 2019-04-24  Chris Dumez  <cdumez@apple.com>
 
         Fix flaky crashes in a couple of PSON API tests

diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
index 6f2cda6..ce6c0ff 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
@@ -397,4 +397,5 @@ interface TestRunner {
     void clearAdClickAttributionsThroughWebsiteDataRemoval();
     void setAdClickAttributionOverrideTimerForTesting(boolean value);
     void setAdClickAttributionConversionURLForTesting(DOMString url);
+    void markAdClickAttributionsAsExpiredForTesting();
 };

diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
index 4e34fc1..e9cc27c 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
@@ -2872,4 +2872,10 @@ void TestRunner::setAdClickAttributionConversionURLForTesting(JSStringRef urlStr
     WKBundlePagePostSynchronousMessageForTesting(InjectedBundle::singleton().page()->page(), messageName.get(), messageBody.get(), nullptr);
 }
 
+void TestRunner::markAdClickAttributionsAsExpiredForTesting()
+{
+    WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("MarkAdClickAttributionsAsExpiredForTesting"));
+    WKBundlePagePostSynchronousMessageForTesting(InjectedBundle::singleton().page()->page(), messageName.get(), nullptr, nullptr);
+}
+
 } // namespace WTR

diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
index 5e3718d..c72be18 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
@@ -506,6 +506,7 @@ public:
     void clearAdClickAttributionsThroughWebsiteDataRemoval();
     void setAdClickAttributionOverrideTimerForTesting(bool value);
     void setAdClickAttributionConversionURLForTesting(JSStringRef);
+    void markAdClickAttributionsAsExpiredForTesting();
 
 private:
     TestRunner();

diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index b811e59..0e1573b 100644 (file)
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -3627,4 +3627,11 @@ void TestController::setAdClickAttributionConversionURLForTesting(WKURLRef url)
     runUntil(callbackContext.done, noTimeout);
 }
 
+void TestController::markAdClickAttributionsAsExpiredForTesting()
+{
+    AdClickAttributionVoidCallbackContext callbackContext(*this);
+    WKPageMarkAdClickAttributionsAsExpiredForTesting(m_mainWebView->page(), adClickAttributionVoidCallback, &callbackContext);
+    runUntil(callbackContext.done, noTimeout);
+}
+
 } // namespace WTR

diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
index f269b39..0bc10a2 100644 (file)
--- a/Tools/WebKitTestRunner/TestController.h
+++ b/Tools/WebKitTestRunner/TestController.h
@@ -317,6 +317,7 @@ public:
     void clearAdClickAttributionsThroughWebsiteDataRemoval();
     void setAdClickAttributionOverrideTimerForTesting(bool value);
     void setAdClickAttributionConversionURLForTesting(WKURLRef);
+    void markAdClickAttributionsAsExpiredForTesting();
 
 private:
     WKRetainPtr<WKPageConfigurationRef> generatePageConfiguration(const TestOptions&);

diff --git a/Tools/WebKitTestRunner/TestInvocation.cpp b/Tools/WebKitTestRunner/TestInvocation.cpp
index 862b9a5..6ffab3a 100644 (file)
--- a/Tools/WebKitTestRunner/TestInvocation.cpp
+++ b/Tools/WebKitTestRunner/TestInvocation.cpp
@@ -1662,7 +1662,12 @@ WKRetainPtr<WKTypeRef> TestInvocation::didReceiveSynchronousMessageFromInjectedB
         TestController::singleton().setAdClickAttributionConversionURLForTesting(url);
         return nullptr;
     }
-    
+
+    if (WKStringIsEqualToUTF8CString(messageName, "MarkAdClickAttributionsAsExpiredForTesting")) {
+        TestController::singleton().markAdClickAttributionsAsExpiredForTesting();
+        return nullptr;
+    }
+
     ASSERT_NOT_REACHED();
     return nullptr;
 }