<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[244325] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/244325">244325</a></dd>
<dt>Author</dt> <dd>wilander@apple.com</dd>
<dt>Date</dt> <dd>2019-04-15 21:24:23 -0700 (Mon, 15 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsadClickAttributionresourcesconversionFilePathphp">trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionFilePath.php</a></li>
<li><a href="#trunkLayoutTestshttptestsadClickAttributionresourcesconversionReportphp">trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionReport.php</a></li>
<li><a href="#trunkLayoutTestshttptestsadClickAttributionresourcesgetConversionDataphp">trunk/LayoutTests/http/tests/adClickAttribution/resources/getConversionData.php</a></li>
<li><a href="#trunkLayoutTestshttptestsadClickAttributionsendattributionconversionrequesthtml">trunk/LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderAdClickAttributioncpp">trunk/Source/WebCore/loader/AdClickAttribution.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244324 => 244325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-04-16 02:41:38 UTC (rev 244324)
+++ trunk/LayoutTests/ChangeLog 2019-04-16 04:24:23 UTC (rev 244325)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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:
+
</ins><span class="cx"> 2019-04-15  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: fake value descriptors for promises add a catch handler, preventing "rejectionhandled" events from being fired
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsadClickAttributionresourcesconversionFilePathphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionFilePath.php (244324 => 244325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionFilePath.php 2019-04-16 02:41:38 UTC (rev 244324)
+++ trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionFilePath.php    2019-04-16 04:24:23 UTC (rev 244325)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once '../../resources/portabilityLayer.php';
</span><span class="cx"> 
</span><del>-$conversionFilePath = sys_get_temp_dir() . "/adClickConversion.txt";
-
</del><ins>+if (isset($_GET["nonce"]))
+    $conversionFileName = "/adClickConversion" . $_GET["nonce"] . ".txt";
+else
+    $conversionFileName = "/adClickConversion.txt";
+$conversionFilePath = sys_get_temp_dir() . $conversionFileName;
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsadClickAttributionresourcesconversionReportphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionReport.php (244324 => 244325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionReport.php   2019-04-16 02:41:38 UTC (rev 244324)
+++ trunk/LayoutTests/http/tests/adClickAttribution/resources/conversionReport.php      2019-04-16 04:24:23 UTC (rev 244325)
</span><span class="lines">@@ -5,9 +5,16 @@
</span><span class="cx"> $httpHeaders = $_SERVER;
</span><span class="cx"> $cookiesFound = false;
</span><span class="cx"> foreach ($httpHeaders as $name => $value) {
</span><del>-    if ($name === "HTTP_HOST" || $name === "REQUEST_URI")
</del><ins>+    if ($name === "HTTP_HOST") {
</ins><span class="cx">         fwrite($conversionFile, "$name: $value\n");
</span><del>-    else if ($name === "HTTP_COOKIE") {
</del><ins>+    } 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") {
</ins><span class="cx">         fwrite($conversionFile, "Cookies in conversion request: $value\n");
</span><span class="cx">         $cookiesFound = true;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsadClickAttributionresourcesgetConversionDataphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/adClickAttribution/resources/getConversionData.php (244324 => 244325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/adClickAttribution/resources/getConversionData.php  2019-04-16 02:41:38 UTC (rev 244324)
+++ trunk/LayoutTests/http/tests/adClickAttribution/resources/getConversionData.php     2019-04-16 04:24:23 UTC (rev 244325)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">     fclose($conversionFile);
</span><span class="cx">     unlink($conversionFilePath);
</span><span class="cx"> } else {
</span><del>-    echo "Conversion not received - timed out.";
</del><ins>+    echo "Conversion not received - timed out.<br>";
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> if (isset($_GET['endTest'])) {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsadClickAttributionsendattributionconversionrequesthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html (244324 => 244325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html 2019-04-16 02:41:38 UTC (rev 244324)
+++ trunk/LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html    2019-04-16 04:24:23 UTC (rev 244325)
</span><span class="lines">@@ -10,12 +10,15 @@
</span><span class="cx"> <a id="targetLink" href="http://localhost:8000/adClickAttribution/send-attribution-conversion-request.html?stepTwo" adcampaignid="3" addestination="http://localhost:8000">Link</a><br>
</span><span class="cx"> <div id="output"></div>
</span><span class="cx"> <script>
</span><ins>+    const currentTimeMillis = (new Date()).getTime();
+    const highEntropyBits = currentTimeMillis - (Math.floor(currentTimeMillis / 1000000) * 1000000);
+    const nonce = highEntropyBits + "" + Math.floor(Math.random() * 100);
+
</ins><span class="cx">     if (window.testRunner) {
</span><span class="cx">         testRunner.waitUntilDone();
</span><span class="cx">         testRunner.dumpChildFramesAsText();
</span><span class="cx">         testRunner.setAllowsAnySSLCertificate(true);
</span><span class="cx">         testRunner.setAdClickAttributionOverrideTimerForTesting(true);
</span><del>-        testRunner.setAdClickAttributionConversionURLForTesting("http://127.0.0.1:8000/adClickAttribution/resources/conversionReport.php");
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     function activateElement(elementID) {
</span><span class="lines">@@ -38,7 +41,7 @@
</span><span class="cx">         document.body.removeChild(document.getElementById("pixel"));
</span><span class="cx"> 
</span><span class="cx">         let iframeElement = document.createElement("iframe");
</span><del>-        iframeElement.src = "http://127.0.0.1:8000/adClickAttribution/resources/getConversionData.php?endTest=true&timeout_ms=2000";
</del><ins>+        iframeElement.src = "http://127.0.0.1:8000/adClickAttribution/resources/getConversionData.php?endTest=true&timeout_ms=2000&nonce=" + nonce;
</ins><span class="cx">         document.body.appendChild(iframeElement);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -45,6 +48,7 @@
</span><span class="cx">     function runTest() {
</span><span class="cx">         if (window.testRunner) {
</span><span class="cx">             if (window.location.search === "?stepTwo") {
</span><ins>+                testRunner.setAdClickAttributionConversionURLForTesting("http://127.0.0.1:8000/adClickAttribution/resources/conversionReport.php?nonce=" + nonce);
</ins><span class="cx">                 let imageElement = document.createElement("img");
</span><span class="cx">                 imageElement.src = "https://127.0.0.1:8443/adClickAttribution/resources/redirectToConversion.php?conversionData=12";
</span><span class="cx">                 imageElement.id = "pixel";
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244324 => 244325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-16 02:41:38 UTC (rev 244324)
+++ trunk/Source/WebCore/ChangeLog      2019-04-16 04:24:23 UTC (rev 244325)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+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.
+
</ins><span class="cx"> 2019-04-15  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         URL set by document.open() is not communicated to the UIProcess
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderAdClickAttributioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/AdClickAttribution.cpp (244324 => 244325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/AdClickAttribution.cpp       2019-04-16 02:41:38 UTC (rev 244324)
+++ trunk/Source/WebCore/loader/AdClickAttribution.cpp  2019-04-16 04:24:23 UTC (rev 244325)
</span><span class="lines">@@ -141,6 +141,10 @@
</span><span class="cx">     builder.appendNumber(m_conversion.value().data);
</span><span class="cx">     builder.appendLiteral("&campaign=");
</span><span class="cx">     builder.appendNumber(m_campaign.id);
</span><ins>+    if (baseURL.hasQuery()) {
+        builder.append('&');
+        builder.append(baseURL.query());
+    }
</ins><span class="cx">     return URL(baseURL, builder.toString());
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>