<!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>[129168] 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/129168">129168</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2012-09-20 14:25:09 -0700 (Thu, 20 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>CSP reports should send an empty &quot;blocked-uri&quot; rather than nothing.
https://bugs.webkit.org/show_bug.cgi?id=97256

Patch by Mike West &lt;mkwst@chromium.org&gt; on 2012-09-20
Reviewed by Adam Barth.

Source/WebCore:

In cases where a Content Security Policy violation report is generated
without blocking a resource at a particular URI (inline scripts, for
example), we currently leave the &quot;blocked-uri&quot; attribute out of the
report entirely. For the same reason that we included the &quot;referrer&quot;
attribute in webkit.org/b/97233, we should include an explicitly empty
&quot;blocked-uri&quot; in these cases.

This new behavior is covered by updates to existing test expectations
around the reporting functionality.

* page/ContentSecurityPolicy.cpp:
(WebCore::ContentSecurityPolicy::reportViolation):
    If the 'blocked-uri' is invalid, add a &quot;blocked-uri&quot; attribute that
    is explicitly empty.

LayoutTests:

* http/tests/security/contentSecurityPolicy/report-and-enforce-expected.txt:
* http/tests/security/contentSecurityPolicy/report-only-expected.txt:
* http/tests/security/contentSecurityPolicy/report-only-from-header-expected.txt:
* http/tests/security/contentSecurityPolicy/report-uri-expected.txt:
* http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt:
    Updating test expectations to include an explicitly empty
    &quot;blocked-uri&quot; as opposed to leaving it off entirely.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyreportandenforceexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-and-enforce-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyreportonlyexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-only-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyreportonlyfromheaderexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-only-from-header-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyreporturiexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyreporturifromchildframeexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageContentSecurityPolicycpp">trunk/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (129167 => 129168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2012-09-20 21:16:54 UTC (rev 129167)
+++ trunk/LayoutTests/ChangeLog        2012-09-20 21:25:09 UTC (rev 129168)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2012-09-20  Mike West  &lt;mkwst@chromium.org&gt;
+
+        CSP reports should send an empty &quot;blocked-uri&quot; rather than nothing.
+        https://bugs.webkit.org/show_bug.cgi?id=97256
+
+        Reviewed by Adam Barth.
+
+        * http/tests/security/contentSecurityPolicy/report-and-enforce-expected.txt:
+        * http/tests/security/contentSecurityPolicy/report-only-expected.txt:
+        * http/tests/security/contentSecurityPolicy/report-only-from-header-expected.txt:
+        * http/tests/security/contentSecurityPolicy/report-uri-expected.txt:
+        * http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt:
+            Updating test expectations to include an explicitly empty
+            &quot;blocked-uri&quot; as opposed to leaving it off entirely.
+
</ins><span class="cx"> 2012-09-20  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         media/track/track-cue-rendering-inner-timestamps.html times out.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyreportandenforceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-and-enforce-expected.txt (129167 => 129168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-and-enforce-expected.txt        2012-09-20 21:16:54 UTC (rev 129167)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-and-enforce-expected.txt        2012-09-20 21:25:09 UTC (rev 129168)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> HTTP_REFERER: http://127.0.0.1:8000/security/contentSecurityPolicy/report-and-enforce.html
</span><span class="cx"> REQUEST_METHOD: POST
</span><span class="cx"> === POST DATA ===
</span><del>-{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-and-enforce.html&quot;,&quot;referrer&quot;:&quot;&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri resources/save-report.php&quot;}}
</del><ins>+{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-and-enforce.html&quot;,&quot;referrer&quot;:&quot;&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri resources/save-report.php&quot;,&quot;blocked-uri&quot;:&quot;&quot;}}
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyreportonlyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-only-expected.txt (129167 => 129168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-only-expected.txt        2012-09-20 21:16:54 UTC (rev 129167)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-only-expected.txt        2012-09-20 21:25:09 UTC (rev 129168)
</span><span class="lines">@@ -6,4 +6,4 @@
</span><span class="cx"> HTTP_REFERER: http://127.0.0.1:8000/security/contentSecurityPolicy/report-only.html
</span><span class="cx"> REQUEST_METHOD: POST
</span><span class="cx"> === POST DATA ===
</span><del>-{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-only.html&quot;,&quot;referrer&quot;:&quot;&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri resources/save-report.php&quot;}}
</del><ins>+{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-only.html&quot;,&quot;referrer&quot;:&quot;&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri resources/save-report.php&quot;,&quot;blocked-uri&quot;:&quot;&quot;}}
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyreportonlyfromheaderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-only-from-header-expected.txt (129167 => 129168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-only-from-header-expected.txt        2012-09-20 21:16:54 UTC (rev 129167)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-only-from-header-expected.txt        2012-09-20 21:25:09 UTC (rev 129168)
</span><span class="lines">@@ -6,4 +6,4 @@
</span><span class="cx"> HTTP_REFERER: http://127.0.0.1:8000/security/contentSecurityPolicy/report-only-from-header.php
</span><span class="cx"> REQUEST_METHOD: POST
</span><span class="cx"> === POST DATA ===
</span><del>-{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-only-from-header.php&quot;,&quot;referrer&quot;:&quot;&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri resources/save-report.php&quot;}}
</del><ins>+{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-only-from-header.php&quot;,&quot;referrer&quot;:&quot;&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri resources/save-report.php&quot;,&quot;blocked-uri&quot;:&quot;&quot;}}
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyreporturiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-expected.txt (129167 => 129168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-expected.txt        2012-09-20 21:16:54 UTC (rev 129167)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-expected.txt        2012-09-20 21:25:09 UTC (rev 129168)
</span><span class="lines">@@ -5,4 +5,4 @@
</span><span class="cx"> HTTP_REFERER: http://127.0.0.1:8000/security/contentSecurityPolicy/report-uri.html
</span><span class="cx"> REQUEST_METHOD: POST
</span><span class="cx"> === POST DATA ===
</span><del>-{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-uri.html&quot;,&quot;referrer&quot;:&quot;&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri resources/save-report.php&quot;}}
</del><ins>+{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-uri.html&quot;,&quot;referrer&quot;:&quot;&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri resources/save-report.php&quot;,&quot;blocked-uri&quot;:&quot;&quot;}}
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyreporturifromchildframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt (129167 => 129168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt        2012-09-20 21:16:54 UTC (rev 129167)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-uri-from-child-frame-expected.txt        2012-09-20 21:25:09 UTC (rev 129168)
</span><span class="lines">@@ -10,4 +10,4 @@
</span><span class="cx"> HTTP_REFERER: http://127.0.0.1:8000/security/contentSecurityPolicy/resources/generate-csp-report.html
</span><span class="cx"> REQUEST_METHOD: POST
</span><span class="cx"> === POST DATA ===
</span><del>-{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/resources/generate-csp-report.html&quot;,&quot;referrer&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-uri-from-child-frame.html&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri save-report.php&quot;}}
</del><ins>+{&quot;csp-report&quot;:{&quot;document-uri&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/resources/generate-csp-report.html&quot;,&quot;referrer&quot;:&quot;http://127.0.0.1:8000/security/contentSecurityPolicy/report-uri-from-child-frame.html&quot;,&quot;violated-directive&quot;:&quot;script-src 'self'&quot;,&quot;original-policy&quot;:&quot;script-src 'self'; report-uri save-report.php&quot;,&quot;blocked-uri&quot;:&quot;&quot;}}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (129167 => 129168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2012-09-20 21:16:54 UTC (rev 129167)
+++ trunk/Source/WebCore/ChangeLog        2012-09-20 21:25:09 UTC (rev 129168)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2012-09-20  Mike West  &lt;mkwst@chromium.org&gt;
+
+        CSP reports should send an empty &quot;blocked-uri&quot; rather than nothing.
+        https://bugs.webkit.org/show_bug.cgi?id=97256
+
+        Reviewed by Adam Barth.
+
+        In cases where a Content Security Policy violation report is generated
+        without blocking a resource at a particular URI (inline scripts, for
+        example), we currently leave the &quot;blocked-uri&quot; attribute out of the
+        report entirely. For the same reason that we included the &quot;referrer&quot;
+        attribute in webkit.org/b/97233, we should include an explicitly empty
+        &quot;blocked-uri&quot; in these cases.
+
+        This new behavior is covered by updates to existing test expectations
+        around the reporting functionality.
+
+        * page/ContentSecurityPolicy.cpp:
+        (WebCore::ContentSecurityPolicy::reportViolation):
+            If the 'blocked-uri' is invalid, add a &quot;blocked-uri&quot; attribute that
+            is explicitly empty.
+
</ins><span class="cx"> 2012-09-20  Patrick Gansterer  &lt;paroga@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Add String::numberToFixedPrecisionString()
</span></span></pre></div>
<a id="trunkSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (129167 => 129168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp        2012-09-20 21:16:54 UTC (rev 129167)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp        2012-09-20 21:25:09 UTC (rev 129168)
</span><span class="lines">@@ -1527,6 +1527,8 @@
</span><span class="cx">     cspReport-&gt;setString(&quot;original-policy&quot;, header);
</span><span class="cx">     if (blockedURL.isValid())
</span><span class="cx">         cspReport-&gt;setString(&quot;blocked-uri&quot;, document-&gt;securityOrigin()-&gt;canRequest(blockedURL) ? blockedURL.strippedForUseAsReferrer() : SecurityOrigin::create(blockedURL)-&gt;toString());
</span><ins>+    else
+        cspReport-&gt;setString(&quot;blocked-uri&quot;, String());
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;InspectorObject&gt; reportObject = InspectorObject::create();
</span><span class="cx">     reportObject-&gt;setObject(&quot;csp-report&quot;, cspReport.release());
</span></span></pre>
</div>
</div>

</body>
</html>