Changeset 244325 in webkit

Timestamp:

Apr 15, 2019, 9:24:23 PM (7 years ago)

Author:

wilander@apple.com

Message:

Add a query string nonce to LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html to address flakiness
​https://bugs.webkit.org/show_bug.cgi?id=196955

Source/WebCore:

Unreviewed test gardening. The WebCore change is only in a dedicated
test function.

No new tests. Existing test updated.

• loader/AdClickAttribution.cpp:

(WebCore::AdClickAttribution::urlForTesting const):

Now preserves the query string in the test URL.

LayoutTests:

Unreviewed test gardening.

• http/tests/adClickAttribution/resources/conversionFilePath.php:
• http/tests/adClickAttribution/resources/conversionReport.php:
• http/tests/adClickAttribution/resources/getConversionData.php:
• http/tests/adClickAttribution/send-attribution-conversion-request.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/adClickAttribution/resources/conversionFilePath.php (modified) (1 diff)
• LayoutTests/http/tests/adClickAttribution/resources/conversionReport.php (modified) (1 diff)
• LayoutTests/http/tests/adClickAttribution/resources/getConversionData.php (modified) (1 diff)
• LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/AdClickAttribution.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-15  John Wilander  <wilander@apple.com>
+
+        Add a query string nonce to LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html to address flakiness
+        https://bugs.webkit.org/show_bug.cgi?id=196955
+
+        Unreviewed test gardening.
+
+        * http/tests/adClickAttribution/resources/conversionFilePath.php:
+        * http/tests/adClickAttribution/resources/conversionReport.php:
+        * http/tests/adClickAttribution/resources/getConversionData.php:
+        * http/tests/adClickAttribution/send-attribution-conversion-request.html:
+
 2019-04-15  Devin Rousso  <drousso@apple.com>
 

trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionFilePath.php

@@ -2 +2 @@
 require_once '../../resources/portabilityLayer.php';
 
-$conversionFilePath = sys_get_temp_dir() . "/adClickConversion.txt";
-
+if (isset($_GET["nonce"]))
+    $conversionFileName = "/adClickConversion" . $_GET["nonce"] . ".txt";
+else
+    $conversionFileName = "/adClickConversion.txt";
+$conversionFilePath = sys_get_temp_dir() . $conversionFileName;
 ?>

trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionReport.php

@@ -6 +6 @@
 $cookiesFound = false;
 foreach ($httpHeaders as $name => $value) {
-    if ($name === "HTTP_HOST" || $name === "REQUEST_URI")
+    if ($name === "HTTP_HOST") {
         fwrite($conversionFile, "$name: $value\n");
-    else if ($name === "HTTP_COOKIE") {
+    } else if ($name === "REQUEST_URI") {
+        $positionOfNonce = strpos($value, "&nonce=");
+        if ($positionOfNonce === false)
+            $outputURL = $value;
+        else
+            $outputURL = substr($value, 0, $positionOfNonce);
+        fwrite($conversionFile, "$name: $outputURL\n");
+    } else if ($name === "HTTP_COOKIE") {
         fwrite($conversionFile, "Cookies in conversion request: $value\n");
         $cookiesFound = true;

trunk/LayoutTests/http/tests/adClickAttribution/resources/getConversionData.php

@@ -37 +37 @@
     unlink($conversionFilePath);
 } else {
-    echo "Conversion not received - timed out.";
+    echo "Conversion not received - timed out.<br>";
 }
 

trunk/LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html

@@ -11 +11 @@
 <div id="output"></div>
 <script>
+    const currentTimeMillis = (new Date()).getTime();
+    const highEntropyBits = currentTimeMillis - (Math.floor(currentTimeMillis / 1000000) * 1000000);
+    const nonce = highEntropyBits + "" + Math.floor(Math.random() * 100);
+
     if (window.testRunner) {
         testRunner.waitUntilDone();
@@ -16 +20 @@
         testRunner.setAllowsAnySSLCertificate(true);
         testRunner.setAdClickAttributionOverrideTimerForTesting(true);
-        testRunner.setAdClickAttributionConversionURLForTesting("http://127.0.0.1:8000/adClickAttribution/resources/conversionReport.php");
     }
 
@@ -39 +42 @@
 
         let iframeElement = document.createElement("iframe");
-        iframeElement.src = "http://127.0.0.1:8000/adClickAttribution/resources/getConversionData.php?endTest=true&timeout_ms=2000";
+        iframeElement.src = "http://127.0.0.1:8000/adClickAttribution/resources/getConversionData.php?endTest=true&timeout_ms=2000&nonce=" + nonce;
         document.body.appendChild(iframeElement);
     }
@@ -46 +49 @@
         if (window.testRunner) {
             if (window.location.search === "?stepTwo") {
+                testRunner.setAdClickAttributionConversionURLForTesting("http://127.0.0.1:8000/adClickAttribution/resources/conversionReport.php?nonce=" + nonce);
                 let imageElement = document.createElement("img");
                 imageElement.src = "https://127.0.0.1:8443/adClickAttribution/resources/redirectToConversion.php?conversionData=12";

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-15  John Wilander  <wilander@apple.com>
+
+        Add a query string nonce to LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html to address flakiness
+        https://bugs.webkit.org/show_bug.cgi?id=196955
+
+        Unreviewed test gardening. The WebCore change is only in a dedicated
+        test function.
+
+        No new tests. Existing test updated.
+
+        * loader/AdClickAttribution.cpp:
+        (WebCore::AdClickAttribution::urlForTesting const):
+            Now preserves the query string in the test URL.
+
 2019-04-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/loader/AdClickAttribution.cpp

@@ -142 +142 @@
     builder.appendLiteral("&campaign=");
     builder.appendNumber(m_campaign.id);
+    if (baseURL.hasQuery()) {
+        builder.append('&');
+        builder.append(baseURL.query());
+    }
     return URL(baseURL, builder.toString());
 }