<!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>[202155] 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/202155">202155</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2016-06-16 20:51:00 -0700 (Thu, 16 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSP: Content Security Policy should allow '*' to match the originating page's scheme
https://bugs.webkit.org/show_bug.cgi?id=158811
<rdar://problem/26819568>
Reviewed by Daniel Bates.
Source/WebCore:
Tests: security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star.html
security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star.html
security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star.html
security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html
* page/csp/ContentSecurityPolicySourceList.cpp:
(WebCore::ContentSecurityPolicySourceList::isProtocolAllowedByStar):
LayoutTests:
* security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-expected.html: Added.
* security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star.html: Added.
* security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html: Removed.
* security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html: Removed.
* security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-expected.html: Added.
* security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star.html: Added.
* security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html: Removed.
* security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html: Removed.
* security/contentSecurityPolicy/resources/alert-pass.js: Added.
* security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star-expected.txt: Added.
* security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star.html: Added.
* security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-expected.html: Copied from LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html.
* security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html: Renamed from LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html.
* security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicySourceListcpp">trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyimagewithfileurlallowedbyimgsrcstarexpectedhtml">trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-expected.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyimagewithfileurlallowedbyimgsrcstarhtml">trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicylinkwithfileurlallowedbystylesrcstarexpectedhtml">trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-expected.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicylinkwithfileurlallowedbystylesrcstarhtml">trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyresourcesalertpassjs">trunk/LayoutTests/security/contentSecurityPolicy/resources/alert-pass.js</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyscriptwithfileurlallowedbyscriptsrcstarexpectedtxt">trunk/LayoutTests/security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star-expected.txt</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyscriptwithfileurlallowedbyscriptsrcstarhtml">trunk/LayoutTests/security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlallowedbymediasrcstarexpectedhtml">trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-expected.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlallowedbymediasrcstarhtml">trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyimagewithfileurlblockedbyimgsrcstarexpectedhtml">trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyimagewithfileurlblockedbyimgsrcstarhtml">trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicylinkwithfileurlblockedbystylesrcstarexpectedhtml">trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicylinkwithfileurlblockedbystylesrcstarhtml">trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlblockedbymediasrcstarexpectedhtml">trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html</a></li>
<li><a href="#trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlblockedbymediasrcstarhtml">trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/LayoutTests/ChangeLog 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-06-16 Jiewen Tan <jiewen_tan@apple.com>
+
+ CSP: Content Security Policy should allow '*' to match the originating page's scheme
+ https://bugs.webkit.org/show_bug.cgi?id=158811
+ <rdar://problem/26819568>
+
+ Reviewed by Daniel Bates.
+
+ * security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-expected.html: Added.
+ * security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star.html: Added.
+ * security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html: Removed.
+ * security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html: Removed.
+ * security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-expected.html: Added.
+ * security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star.html: Added.
+ * security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html: Removed.
+ * security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html: Removed.
+ * security/contentSecurityPolicy/resources/alert-pass.js: Added.
+ * security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star-expected.txt: Added.
+ * security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star.html: Added.
+ * security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-expected.html: Copied from LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html.
+ * security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html: Renamed from LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html.
+ * security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html: Removed.
+
</ins><span class="cx"> 2016-06-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: console.profile should use the new Sampling Profiler
</span></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyimagewithfileurlallowedbyimgsrcstarexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-expected.html (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-expected.html (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-expected.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests that loading image with a file URL is allowed when the page that is loaded from file URL has Content Security Policy &quot;image-src *&quot;. This test PASSED if you see a green square below. Otherwise, it FAILED.</p>
+<img src="../../fast/dom/HTMLImageElement/resources/green.png" width="128" height="128">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyimagewithfileurlallowedbyimgsrcstarhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star.html (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star.html (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Security-Policy" content="img-src *">
+</head>
+<body>
+<p>This tests that loading image with a file URL is allowed when the page that is loaded from file URL has Content Security Policy &quot;image-src *&quot;. This test PASSED if you see a green square below. Otherwise, it FAILED.</p>
+<img src="../../fast/dom/HTMLImageElement/resources/green.png" width="128" height="128">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyimagewithfileurlblockedbyimgsrcstarexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<body>
-<p>This tests that loading image with a file URL is blocked when the page has Content Security Policy &quot;image-src *&quot;. This test PASSED if you see the word PASS below. Otherwise, it FAILED.</p>
-<img src="" width="128" height="128" alt="PASS">
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyimagewithfileurlblockedbyimgsrcstarhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="img-src *">
-</head>
-<body>
-<p>This tests that loading image with a file URL is blocked when the page has Content Security Policy &quot;image-src *&quot;. This test PASSED if you see the word PASS below. Otherwise, it FAILED.</p>
-<img src="resources/green.png" width="128" height="128" alt="PASS">
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicylinkwithfileurlallowedbystylesrcstarexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-expected.html (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-expected.html (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-expected.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests that loading a stylesheet with a file URL is allowed when the page that is loaded from file URL has Content Security Policy &quot;style-src *&quot;. 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="trunkLayoutTestssecuritycontentSecurityPolicylinkwithfileurlallowedbystylesrcstarhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star.html (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star.html (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#test {
+ background-color: red;
+ height: 128px;
+ width: 128px;
+}
+</style>
+<meta http-equiv="Content-Security-Policy" content="style-src *">
+<link rel="stylesheet" href="../../fast/dom/HTMLLinkElement/resources/green-background-color.css">
+</head>
+<body>
+<p>This tests that loading a stylesheet with a file URL is allowed when the page that is loaded from file URL has Content Security Policy &quot;style-src *&quot;. 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="trunkLayoutTestssecuritycontentSecurityPolicylinkwithfileurlblockedbystylesrcstarexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<body>
-<p>This tests that loading a stylesheet with a file URL is blocked when the page has Content Security Policy &quot;style-src *&quot;. 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>
</del></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicylinkwithfileurlblockedbystylesrcstarhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#test {
- background-color: green;
- height: 128px;
- width: 128px;
-}
-</style>
-<meta http-equiv="Content-Security-Policy" content="style-src *">
-<link rel="stylesheet" href="resources/red-background-color.css">
-</head>
-<body>
-<p>This tests that loading a stylesheet with a file URL is blocked when the page has Content Security Policy &quot;style-src *&quot;. This test PASSED if you see a green square below. Otherwise, it FAILED.</p>
-<div id="test"></div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyresourcesalertpassjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/security/contentSecurityPolicy/resources/alert-pass.js (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/resources/alert-pass.js (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/resources/alert-pass.js 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+alert("PASS");
</ins></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyscriptwithfileurlallowedbyscriptsrcstarexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star-expected.txt (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star-expected.txt (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star-expected.txt 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+ALERT: PASS
+Test passes if the JavaScript script is loaded.
</ins></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyscriptwithfileurlallowedbyscriptsrcstarhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star.html (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star.html (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<meta http-equiv="Content-Security-Policy" content="script-src *">
+</head>
+<body>
+<p>Test passes if the JavaScript script is loaded.</p>
+<script src="resources/alert-pass.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlallowedbymediasrcstarexpectedhtmlfromrev202154trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlblockedbymediasrcstarhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-expected.html (from rev 202154, trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html) (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-expected.html (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-expected.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+video {
+ background-color: red;
+ width: 128px;
+ height: 128px;
+}
+</style>
+<script src="../../media/media-file.js"></script>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function testFinished()
+{
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+ window.onload = function ()
+{
+ var video = document.getElementById("video");
+ video.oncanplaythrough = function () {
+ // Use a zero timer to ensure that the first frame of the video is drawn.
+ window.setTimeout(testFinished, 0);
+ }
+ video.onerror = testFinished;
+ video.src = "../../media/" + findMediaFile("video", "content/test");
+}
+</script>
+</head>
+<body>
+<p>This tests that loading a video with a file URL is allowed when the page that is loaded from file URL has Content Security Policy &quot;media-src *&quot;. This test PASSED if you don't see a solid red square. Otherwise, it FAILED.</p>
+<video id="video"></video>
</ins></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlallowedbymediasrcstarhtmlfromrev202154trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlblockedbymediasrcstarhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html (from rev 202154, trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html) (0 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html (rev 0)
+++ trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Security-Policy" content="media-src *">
+<style>
+video {
+ background-color: red;
+ width: 128px;
+ height: 128px;
+}
+</style>
+<script src="../../media/media-file.js"></script>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function testFinished()
+{
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+ window.onload = function ()
+{
+ var video = document.getElementById("video");
+ video.oncanplaythrough = function () {
+ // Use a zero timer to ensure that the first frame of the video is drawn.
+ window.setTimeout(testFinished, 0);
+ }
+ video.onerror = testFinished;
+ video.src = "../../media/" + findMediaFile("video", "content/test");
+}
+</script>
+</head>
+<body>
+<p>This tests that loading a video with a file URL is allowed when the page that is loaded from file URL has Content Security Policy &quot;media-src *&quot;. This test PASSED if you don't see a solid red square. Otherwise, it FAILED.</p>
+<video id="video"></video>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlblockedbymediasrcstarexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#equivalent-expected-result {
- background-color: green;
- width: 128px;
- height: 128px;
-}
-</style>
-</head>
-<body>
-<p>This tests that loading a video with a file URL is blocked when the page has Content Security Policy &quot;media-src *&quot;. This test PASSED if you see a solid green square. Otherwise, it FAILED.</p>
-<div id="equivalent-expected-result"></div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestssecuritycontentSecurityPolicyvideowithfileurlblockedbymediasrcstarhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Security-Policy" content="media-src *">
-<style>
-video {
- background-color: green;
- width: 128px;
- height: 128px;
-}
-</style>
-<script src="../../media/media-file.js"></script>
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-
-function testFinished()
-{
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-window.onload = function ()
-{
- var video = document.getElementById("video");
- video.oncanplaythrough = function () {
- // Use a zero timer to ensure that the first frame of the video is drawn.
- window.setTimeout(testFinished, 0);
- }
- video.onerror = testFinished;
- video.src = "../../media/" + findMediaFile("video", "content/test");
-}
-</script>
-</head>
-<body>
-<p>This tests that loading a video with a file URL is blocked when the page has Content Security Policy &quot;media-src *&quot;. This test PASSED if you see a solid green square. Otherwise, it FAILED.</p>
-<video id="video"></video>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/Source/WebCore/ChangeLog 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-16 Jiewen Tan <jiewen_tan@apple.com>
+
+ CSP: Content Security Policy should allow '*' to match the originating page's scheme
+ https://bugs.webkit.org/show_bug.cgi?id=158811
+ <rdar://problem/26819568>
+
+ Reviewed by Daniel Bates.
+
+ Tests: security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star.html
+ security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star.html
+ security/contentSecurityPolicy/script-with-file-url-allowed-by-script-src-star.html
+ security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star.html
+
+ * page/csp/ContentSecurityPolicySourceList.cpp:
+ (WebCore::ContentSecurityPolicySourceList::isProtocolAllowedByStar):
+
</ins><span class="cx"> 2016-06-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add HTTPHeaderMap::set() overload taking a NSString*
</span></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicySourceListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp (202154 => 202155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp 2016-06-17 02:50:30 UTC (rev 202154)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp 2016-06-17 03:51:00 UTC (rev 202155)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> // Although not allowed by the Content Security Policy Level 3 spec., we allow a data URL to match
</span><span class="cx"> // "img-src *" and either a data URL or blob URL to match "media-src *" for web compatibility.
</span><del>- bool isAllowed = url.protocolIsInHTTPFamily();
</del><ins>+ bool isAllowed = url.protocolIsInHTTPFamily() || m_policy.protocolMatchesSelf(url);
</ins><span class="cx"> if (equalIgnoringASCIICase(m_directiveName, ContentSecurityPolicyDirectiveNames::imgSrc))
</span><span class="cx"> isAllowed |= url.protocolIsData();
</span><span class="cx"> else if (equalIgnoringASCIICase(m_directiveName, ContentSecurityPolicyDirectiveNames::mediaSrc))
</span></span></pre>
</div>
</div>
</body>
</html>