<!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>[198551] 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/198551">198551</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-22 14:27:07 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSP: Should only execute <script> or apply <style> if its hash appears in all policies
https://bugs.webkit.org/show_bug.cgi?id=155709
<rdar://problem/25263368>
Reviewed by Darin Adler.
Source/WebCore:
Fixes an issue where a <script>/<style> was allowed to execute/be applied if its hash is listed
in at least one Content Security Policy (CSP) delivered with the page. We should only execute/apply
such a script/stylesheet if its hash is listed in all CSPs delivered with the page.
Tests: http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html
http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html
* page/csp/ContentSecurityPolicy.cpp:
(WebCore::isAllowedByAllWithHash): Added. Checks if the specified hash is allowed by all policies.
(WebCore::isAllowedByAllWithHashFromContent): Modified to call WebCore::isAllowedByAllWithHash()
to determine if the <script>/<style> is allowed by all CSPs delivered with the page.
LayoutTests:
Add tests to ensure that we only execute/apply a <script>/<style> if its hash is listed in all CSPs
delivered with the page.
* TestExpectations: Mark added tests as PASS so that we run them.
* http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies-expected.txt: Added.
* http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html: Added.
* http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies-expected.html: Added.
* http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicycpp">trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicy11scripthashmultiplepoliciesexpectedtxt">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicy11scripthashmultiplepolicieshtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicy11stylehashmultiplepoliciesexpectedhtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies-expected.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicy11stylehashmultiplepolicieshtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198550 => 198551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-22 21:15:37 UTC (rev 198550)
+++ trunk/LayoutTests/ChangeLog 2016-03-22 21:27:07 UTC (rev 198551)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-22 Daniel Bates <dabates@apple.com>
+
+ CSP: Should only execute <script> or apply <style> if its hash appears in all policies
+ https://bugs.webkit.org/show_bug.cgi?id=155709
+ <rdar://problem/25263368>
+
+ Reviewed by Darin Adler.
+
+ Add tests to ensure that we only execute/apply a <script>/<style> if its hash is listed in all CSPs
+ delivered with the page.
+
+ * TestExpectations: Mark added tests as PASS so that we run them.
+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies-expected.txt: Added.
+ * http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html: Added.
+ * http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies-expected.html: Added.
+ * http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html: Added.
+
</ins><span class="cx"> 2016-03-22 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Change "dialog" role description to "web dialog" so users can distinguish from native alerts
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (198550 => 198551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-03-22 21:15:37 UTC (rev 198550)
+++ trunk/LayoutTests/TestExpectations 2016-03-22 21:27:07 UTC (rev 198551)
</span><span class="lines">@@ -830,6 +830,7 @@
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/scripthash-default-src.html [ Pass ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/scripthash-ignore-unsafeinline.html [ Pass ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/scripthash-malformed.html [ Pass ]
</span><ins>+http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html [ Pass ]
</ins><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/scripthash-tests.html [ Pass ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/scripthash-unicode-normalization.html [ Pass ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/scriptnonce-allowed.html [ Pass ]
</span><span class="lines">@@ -847,6 +848,7 @@
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html [ Pass ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/stylehash-allowed.html [ Pass ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/stylehash-basic-blocked.html [ Pass ]
</span><ins>+http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html [ Pass ]
</ins><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed.html [ Pass ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/stylenonce-blocked.html [ Pass ]
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1/plugintypes-affects-child.html [ Pass ]
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicy11scripthashmultiplepoliciesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies-expected.txt (0 => 198551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies-expected.txt 2016-03-22 21:27:07 UTC (rev 198551)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+CONSOLE MESSAGE: line 13: Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'sha256-CYFBl0kdL4jzV5rJMIUoDtxfH9SQTP1JFh2GOcvAFGA=' 'sha256-F/ojdO7hFCTL+kP9GCfFTGQjf48FyI/WJIuqgntJh7Y='".
+
+CONSOLE MESSAGE: line 14: Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'sha256-CYFBl0kdL4jzV5rJMIUoDtxfH9SQTP1JFh2GOcvAFGA=' 'sha256-F/ojdO7hFCTL+kP9GCfFTGQjf48FyI/WJIuqgntJh7Y='".
+
+ALERT: PASS
+Tests that an inline script is allowed to execute only if its hash appears in all policies. This test PASSED if there are two console warnings and a JavaScript alert with message PASS. Otherwise, it FAILED.
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicy11scripthashmultiplepolicieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html (0 => 198551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html 2016-03-22 21:27:07 UTC (rev 198551)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<meta http-equiv="Content-Security-Policy" content="script-src 'sha256-CYFBl0kdL4jzV5rJMIUoDtxfH9SQTP1JFh2GOcvAFGA=' 'sha256-F/ojdO7hFCTL+kP9GCfFTGQjf48FyI/WJIuqgntJh7Y='">
+<meta http-equiv="Content-Security-Policy" content="script-src 'sha384-lGSUJY8XM9swnZ5dBAz++lf/CdJJiL5N12dIcSIwVFgJ0UWFEJKEAiqA9DE53c/r' 'sha256-F/ojdO7hFCTL+kP9GCfFTGQjf48FyI/WJIuqgntJh7Y='">
+</head>
+<body>
+<p>Tests that an inline script is allowed to execute only if its hash appears in all policies. This test PASSED if there are two console warnings and a JavaScript alert with message PASS. Otherwise, it FAILED.</p>
+<script>alert("FAIL did execute first script")</script> <!-- 'sha256-CYFBl0kdL4jzV5rJMIUoDtxfH9SQTP1JFh2GOcvAFGA=' -->
+<script>alert("FAIL did execute second script")</script> <!-- 'sha384-lGSUJY8XM9swnZ5dBAz++lf/CdJJiL5N12dIcSIwVFgJ0UWFEJKEAiqA9DE53c/r' -->
+<script>alert("PASS")</script> <!-- 'sha256-F/ojdO7hFCTL+kP9GCfFTGQjf48FyI/WJIuqgntJh7Y=' -->
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicy11stylehashmultiplepoliciesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies-expected.html (0 => 198551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies-expected.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies-expected.html 2016-03-22 21:27:07 UTC (rev 198551)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>Tests that an inline stylesheet is allowed to be applied only if its hash appears in all policies. This test PASSED if you see a green square below. Otherwise, it FAILED.</p>
+<div style="background-color: green; height: 128px; width: 128px"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicy11stylehashmultiplepolicieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html (0 => 198551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html 2016-03-22 21:27:07 UTC (rev 198551)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#test {
+ height: 128px;
+ width: 128px;
+}
+</style>
+<meta http-equiv="Content-Security-Policy" content="style-src 'sha256-UlHF+LyhzFszDEVcgrr4JNgh3h/eBWJs5r2HIcUgk74=' 'sha256-tzp0RMqnX/8k4uE4GZ9/3sxSZ1heLIfaPj6t+3ZLhLE='">
+<meta http-equiv="Content-Security-Policy" content="style-src 'sha384-7hEvQRmos3fV1heSS9e144eWoL63w9tye191zgxVJqikLbI9TjFHMU8d2LBAkHeP' 'sha256-tzp0RMqnX/8k4uE4GZ9/3sxSZ1heLIfaPj6t+3ZLhLE='">
+<style>#test { background-color: green !important; }</style> <!-- 'sha256-tzp0RMqnX/8k4uE4GZ9/3sxSZ1heLIfaPj6t+3ZLhLE=' -->
+<style>#test { background-color: red !important; } /* First stylesheet */</style> <!-- 'sha256-mRL83PV+VxdmTe3LECHAWjLIzcfUolip8jDpwc3qC38=' -->
+<style>#test { background-color: red !important; } /* Second stylesheet */</style> <!-- 'sha384-7hEvQRmos3fV1heSS9e144eWoL63w9tye191zgxVJqikLbI9TjFHMU8d2LBAkHeP' -->
+</head>
+<body>
+<p>Tests that an inline stylesheet is allowed to be applied only if its hash appears in all policies. This test PASSED if you see a green square below. Otherwise, it FAILED.</p>
+<div id="test"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198550 => 198551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-22 21:15:37 UTC (rev 198550)
+++ trunk/Source/WebCore/ChangeLog 2016-03-22 21:27:07 UTC (rev 198551)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-03-22 Daniel Bates <dabates@apple.com>
+
+ CSP: Should only execute <script> or apply <style> if its hash appears in all policies
+ https://bugs.webkit.org/show_bug.cgi?id=155709
+ <rdar://problem/25263368>
+
+ Reviewed by Darin Adler.
+
+ Fixes an issue where a <script>/<style> was allowed to execute/be applied if its hash is listed
+ in at least one Content Security Policy (CSP) delivered with the page. We should only execute/apply
+ such a script/stylesheet if its hash is listed in all CSPs delivered with the page.
+
+ Tests: http/tests/security/contentSecurityPolicy/1.1/scripthash-multiple-policies.html
+ http/tests/security/contentSecurityPolicy/1.1/stylehash-multiple-policies.html
+
+ * page/csp/ContentSecurityPolicy.cpp:
+ (WebCore::isAllowedByAllWithHash): Added. Checks if the specified hash is allowed by all policies.
+ (WebCore::isAllowedByAllWithHashFromContent): Modified to call WebCore::isAllowedByAllWithHash()
+ to determine if the <script>/<style> is allowed by all CSPs delivered with the page.
+
</ins><span class="cx"> 2016-03-18 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> CRASH in WebCore::MediaResourceLoader::requestResource + 698
</span></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp (198550 => 198551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp 2016-03-22 21:15:37 UTC (rev 198550)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp 2016-03-22 21:27:07 UTC (rev 198551)
</span><span class="lines">@@ -239,6 +239,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<bool (ContentSecurityPolicyDirectiveList::*allowed)(const ContentSecurityPolicyHash&) const>
</span><ins>+static bool isAllowedByAllWithHash(const CSPDirectiveListVector& policies, const ContentSecurityPolicyHash& hash)
+{
+ for (auto& policy : policies) {
+ if (!(policy.get()->*allowed)(hash))
+ return false;
+ }
+ return true;
+}
+
+template<bool (ContentSecurityPolicyDirectiveList::*allowed)(const ContentSecurityPolicyHash&) const>
</ins><span class="cx"> static bool isAllowedByAllWithHashFromContent(const CSPDirectiveListVector& policies, const String& content, const TextEncoding& encoding, OptionSet<ContentSecurityPolicyHashAlgorithm> algorithms)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Compute the digest with respect to the raw bytes received from the page.
</span><span class="lines">@@ -248,10 +258,8 @@
</span><span class="cx"> auto cryptoDigest = CryptoDigest::create(toCryptoDigestAlgorithm(algorithm));
</span><span class="cx"> cryptoDigest->addBytes(contentCString.data(), contentCString.length());
</span><span class="cx"> Vector<uint8_t> digest = cryptoDigest->computeHash();
</span><del>- for (auto& policy : policies) {
- if ((policy.get()->*allowed)(std::make_pair(algorithm, digest)))
- return true;
- }
</del><ins>+ if (isAllowedByAllWithHash<allowed>(policies, { algorithm, digest }))
+ return true;
</ins><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>