<!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>[185912] 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/185912">185912</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-24 08:54:23 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Content Security Policy error message when frame load is blocked does not read well
https://bugs.webkit.org/show_bug.cgi?id=146279
Reviewed by Csaba Osztrogonác.
Source/WebCore:
Substitute "Refused to load frame" for "Refused to frame" as the prefix of the error message
emitted when the Content Security Policy of the page blocks a frame load.
* page/ContentSecurityPolicy.cpp:
(WebCore::CSPDirectiveList::checkSourceAndReportViolation):
LayoutTests:
Update expected results.
* http/tests/security/contentSecurityPolicy/frame-src-blocked-expected.txt:
* http/tests/security/contentSecurityPolicy/frame-src-redirect-blocked-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyframesrcblockedexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-blocked-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyframesrcredirectblockedexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-redirect-blocked-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 (185911 => 185912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-24 15:32:32 UTC (rev 185911)
+++ trunk/LayoutTests/ChangeLog 2015-06-24 15:54:23 UTC (rev 185912)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-06-24 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ Content Security Policy error message when frame load is blocked does not read well
+ https://bugs.webkit.org/show_bug.cgi?id=146279
+
+ Reviewed by Csaba Osztrogonác.
+
+ Update expected results.
+
+ * http/tests/security/contentSecurityPolicy/frame-src-blocked-expected.txt:
+ * http/tests/security/contentSecurityPolicy/frame-src-redirect-blocked-expected.txt:
+
+2015-06-24 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> LayoutTests/http/tests/security/contentSecurityPolicy/media-src-track-block.html always passes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146272
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyframesrcblockedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-blocked-expected.txt (185911 => 185912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-blocked-expected.txt 2015-06-24 15:32:32 UTC (rev 185911)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-blocked-expected.txt 2015-06-24 15:54:23 UTC (rev 185912)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><del>-CONSOLE MESSAGE: Refused to frame 'http://127.0.0.1:8000/security/contentSecurityPolicy/resources/alert-fail.html' because it violates the following Content Security Policy directive: "frame-src 'none'".
</del><ins>+CONSOLE MESSAGE: Refused to load frame 'http://127.0.0.1:8000/security/contentSecurityPolicy/resources/alert-fail.html' because it violates the following Content Security Policy directive: "frame-src 'none'".
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyframesrcredirectblockedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-redirect-blocked-expected.txt (185911 => 185912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-redirect-blocked-expected.txt 2015-06-24 15:32:32 UTC (rev 185911)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/frame-src-redirect-blocked-expected.txt 2015-06-24 15:54:23 UTC (rev 185912)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><del>-CONSOLE MESSAGE: Refused to frame 'http://localhost:8000/security/contentSecurityPolicy/resources/alert-fail.html' because it violates the following Content Security Policy directive: "frame-src 127.0.0.1:8000".
</del><ins>+CONSOLE MESSAGE: Refused to load frame 'http://localhost:8000/security/contentSecurityPolicy/resources/alert-fail.html' because it violates the following Content Security Policy directive: "frame-src 127.0.0.1:8000".
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185911 => 185912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-24 15:32:32 UTC (rev 185911)
+++ trunk/Source/WebCore/ChangeLog 2015-06-24 15:54:23 UTC (rev 185912)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-06-24 Daniel Bates <dabates@apple.com>
+
+ Content Security Policy error message when frame load is blocked does not read well
+ https://bugs.webkit.org/show_bug.cgi?id=146279
+
+ Reviewed by Csaba Osztrogonác.
+
+ Substitute "Refused to load frame" for "Refused to frame" as the prefix of the error message
+ emitted when the Content Security Policy of the page blocks a frame load.
+
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::CSPDirectiveList::checkSourceAndReportViolation):
+
</ins><span class="cx"> 2015-06-11 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> intrinsic size keywords don't work for heights
</span></span></pre></div>
<a id="trunkSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (185911 => 185912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2015-06-24 15:32:32 UTC (rev 185911)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2015-06-24 15:54:23 UTC (rev 185912)
</span><span class="lines">@@ -971,7 +971,7 @@
</span><span class="cx"> else if (formAction == effectiveDirective)
</span><span class="cx"> prefix = "Refused to send form data to '";
</span><span class="cx"> else if (frameSrc == effectiveDirective)
</span><del>- prefix = "Refused to frame '";
</del><ins>+ prefix = "Refused to load frame '";
</ins><span class="cx"> else if (imgSrc == effectiveDirective)
</span><span class="cx"> prefix = "Refused to load the image '";
</span><span class="cx"> else if (mediaSrc == effectiveDirective)
</span></span></pre>
</div>
</div>
</body>
</html>