<!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>[194209] 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/194209">194209</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-12-16 21:53:40 -0800 (Wed, 16 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Block loading external stylesheets in the Content-Disposition: attachment sandbox
https://bugs.webkit.org/show_bug.cgi?id=152375
<rdar://problem/22020902>
Reviewed by Darin Adler.
Source/WebCore:
Tests: http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled.html
http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled.html
http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled.html
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::canRequest): Moved handling of CachedResource::MainResource to canRequestInContentDispositionAttachmentSandbox().
(WebCore::CachedResourceLoader::canRequestInContentDispositionAttachmentSandbox): In addition to handling CachedResource::MainResource,
added handling for CachedResource::CSSStyleSheet. Added a FIXME asking whether we should handle other types of resources, too.
* loader/cache/CachedResourceLoader.h:
LayoutTests:
* http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled-expected.txt: Added.
* http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled.html: Added.
* http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt:
* http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled-expected.txt: Added.
* http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled.html: Added.
* http/tests/contentdispositionattachmentsandbox/resources/at-import-stylesheets-frame.php: Added.
* http/tests/contentdispositionattachmentsandbox/resources/external-stylesheets-frame.php: Added.
* http/tests/contentdispositionattachmentsandbox/resources/xml-stylesheet-processing-instructions-frame.php: Added.
* http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled-expected.txt: Added.
* http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxcrossoriginframesdisabledexpectedtxt">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxatimportstylesheetsdisabledexpectedtxt">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxatimportstylesheetsdisabledhtml">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxexternalstylesheetsdisabledexpectedtxt">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxexternalstylesheetsdisabledhtml">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled.html</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcesatimportstylesheetsframephp">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/at-import-stylesheets-frame.php</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcesexternalstylesheetsframephp">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/external-stylesheets-frame.php</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcesxmlstylesheetprocessinginstructionsframephp">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/xml-stylesheet-processing-instructions-frame.php</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxxmlstylesheetprocessinginstructionsdisabledexpectedtxt">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscontentdispositionattachmentsandboxxmlstylesheetprocessinginstructionsdisabledhtml">trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194208 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-17 05:02:49 UTC (rev 194208)
+++ trunk/LayoutTests/ChangeLog 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-16 Andy Estes <aestes@apple.com>
+
+ [iOS] Block loading external stylesheets in the Content-Disposition: attachment sandbox
+ https://bugs.webkit.org/show_bug.cgi?id=152375
+ <rdar://problem/22020902>
+
+ Reviewed by Darin Adler.
+
+ * http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled-expected.txt: Added.
+ * http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled.html: Added.
+ * http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt:
+ * http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled-expected.txt: Added.
+ * http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled.html: Added.
+ * http/tests/contentdispositionattachmentsandbox/resources/at-import-stylesheets-frame.php: Added.
+ * http/tests/contentdispositionattachmentsandbox/resources/external-stylesheets-frame.php: Added.
+ * http/tests/contentdispositionattachmentsandbox/resources/xml-stylesheet-processing-instructions-frame.php: Added.
+ * http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled-expected.txt: Added.
+ * http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled.html: Added.
+
</ins><span class="cx"> 2015-12-16 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Adding timout expectation to one more wpt test that I missed in the last commit.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxatimportstylesheetsdisabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled-expected.txt (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled-expected.txt 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+CONSOLE MESSAGE: line 4: Unsafe attempt to load URL data:text/css,body::after { content: 'FAIL'; } from document with Content-Disposition: attachment at URL http://127.0.0.1:8000/contentdispositionattachmentsandbox/resources/at-import-stylesheets-frame.php.
+This test verifies that @imported stylesheets are disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxatimportstylesheetsdisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled.html (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled.html 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+if (window.internals)
+ internals.settings.setContentDispositionAttachmentSandboxEnabled(true);
+</script>
+<p>This test verifies that @imported stylesheets are disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.</p>
+<iframe src="resources/at-import-stylesheets-frame.php"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxcrossoriginframesdisabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt (194208 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt 2015-12-17 05:02:49 UTC (rev 194208)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/cross-origin-frames-disabled-expected.txt 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-CONSOLE MESSAGE: Unsafe attempt to load URL data:text/html,FAIL.
</del><ins>+CONSOLE MESSAGE: line 2: Unsafe attempt to load URL data:text/html,FAIL from document with Content-Disposition: attachment at URL http://127.0.0.1:8000/contentdispositionattachmentsandbox/resources/cross-origin-frames-frame.php.
</ins><span class="cx"> This test verifies that cross-origin frames are disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxexternalstylesheetsdisabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled-expected.txt (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled-expected.txt 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+CONSOLE MESSAGE: line 2: Unsafe attempt to load URL data:text/css,body::after { content: 'FAIL'; } from document with Content-Disposition: attachment at URL http://127.0.0.1:8000/contentdispositionattachmentsandbox/resources/external-stylesheets-frame.php.
+This test verifies that external stylesheets are disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxexternalstylesheetsdisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled.html (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled.html 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+if (window.internals)
+ internals.settings.setContentDispositionAttachmentSandboxEnabled(true);
+</script>
+<p>This test verifies that external stylesheets are disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.</p>
+<iframe src="resources/external-stylesheets-frame.php"></iframe>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcesatimportstylesheetsframephp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/at-import-stylesheets-frame.php (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/at-import-stylesheets-frame.php (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/at-import-stylesheets-frame.php 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?php
+header("Content-Disposition: attachment; filename=test.html");
+header("Content-Type: text/html");
+?>
+<!DOCTYPE html>
+<style>
+@import url("data:text/css,body::after { content: 'FAIL'; }");
+</style>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcesexternalstylesheetsframephp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/external-stylesheets-frame.php (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/external-stylesheets-frame.php (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/external-stylesheets-frame.php 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?php
+header("Content-Disposition: attachment; filename=test.html");
+header("Content-Type: text/html");
+?>
+<!DOCTYPE html>
+<link rel="stylesheet" href="data:text/css,body::after { content: 'FAIL'; }">
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxresourcesxmlstylesheetprocessinginstructionsframephp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/xml-stylesheet-processing-instructions-frame.php (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/xml-stylesheet-processing-instructions-frame.php (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/resources/xml-stylesheet-processing-instructions-frame.php 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?php
+header("Content-Disposition: attachment; filename=test.xhtml");
+header("Content-Type: application/xhtml+xml");
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
+echo "<?xml-stylesheet href=\"data:text/css,body::after { content: 'FAIL'; }\" ?>\n";
+echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+echo "<body></body>\n";
+echo "</html>\n";
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxxmlstylesheetprocessinginstructionsdisabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled-expected.txt (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled-expected.txt 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+CONSOLE MESSAGE: line 2: Unsafe attempt to load URL data:text/css,body::after { content: 'FAIL'; } from document with Content-Disposition: attachment at URL http://127.0.0.1:8000/contentdispositionattachmentsandbox/resources/xml-stylesheet-processing-instructions-frame.php.
+This test verifies that xml-stylesheet processing instructions are disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscontentdispositionattachmentsandboxxmlstylesheetprocessinginstructionsdisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled.html (0 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled.html 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+if (window.internals)
+ internals.settings.setContentDispositionAttachmentSandboxEnabled(true);
+</script>
+<p>This test verifies that xml-stylesheet processing instructions are disabled when 'Content-Disposition: attachment' sandboxing is enabled. A security error will be logged to the console if the test passes.</p>
+<iframe src="resources/xml-stylesheet-processing-instructions-frame.php"></iframe>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194208 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-17 05:02:49 UTC (rev 194208)
+++ trunk/Source/WebCore/ChangeLog 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-16 Andy Estes <aestes@apple.com>
+
+ [iOS] Block loading external stylesheets in the Content-Disposition: attachment sandbox
+ https://bugs.webkit.org/show_bug.cgi?id=152375
+ <rdar://problem/22020902>
+
+ Reviewed by Darin Adler.
+
+ Tests: http/tests/contentdispositionattachmentsandbox/at-import-stylesheets-disabled.html
+ http/tests/contentdispositionattachmentsandbox/external-stylesheets-disabled.html
+ http/tests/contentdispositionattachmentsandbox/xml-stylesheet-processing-instructions-disabled.html
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::canRequest): Moved handling of CachedResource::MainResource to canRequestInContentDispositionAttachmentSandbox().
+ (WebCore::CachedResourceLoader::canRequestInContentDispositionAttachmentSandbox): In addition to handling CachedResource::MainResource,
+ added handling for CachedResource::CSSStyleSheet. Added a FIXME asking whether we should handle other types of resources, too.
+ * loader/cache/CachedResourceLoader.h:
+
</ins><span class="cx"> 2015-12-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> ViewportConfiguration functions should return a bool to say if anything changed
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (194208 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-12-17 05:02:49 UTC (rev 194208)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -374,13 +374,6 @@
</span><span class="cx"> // any URL.
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CachedResource::MainResource:
</span><del>- if (HTMLFrameOwnerElement* ownerElement = frame() ? frame()->ownerElement() : nullptr) {
- if (ownerElement->document().shouldEnforceContentDispositionAttachmentSandbox() && !ownerElement->document().securityOrigin()->canRequest(url)) {
- printAccessDeniedMessage(url);
- return false;
- }
- }
- FALLTHROUGH;
</del><span class="cx"> case CachedResource::ImageResource:
</span><span class="cx"> case CachedResource::CSSStyleSheet:
</span><span class="cx"> case CachedResource::Script:
</span><span class="lines">@@ -463,6 +456,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!canRequestInContentDispositionAttachmentSandbox(type, url))
+ return false;
+
</ins><span class="cx"> // Last of all, check for insecure content. We do this last so that when
</span><span class="cx"> // folks block insecure content with a CSP policy, they don't get a warning.
</span><span class="cx"> // They'll still get a warning in the console about CSP blocking the load.
</span><span class="lines">@@ -474,6 +470,33 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool CachedResourceLoader::canRequestInContentDispositionAttachmentSandbox(CachedResource::Type type, const URL& url) const
+{
+ Document* document;
+
+ // FIXME: Do we want to expand this to all resource types that the mixed content checker would consider active content?
+ switch (type) {
+ case CachedResource::MainResource:
+ if (auto ownerElement = frame() ? frame()->ownerElement() : nullptr) {
+ document = &ownerElement->document();
+ break;
+ }
+ return true;
+ case CachedResource::CSSStyleSheet:
+ document = m_document;
+ break;
+ default:
+ return true;
+ }
+
+ if (!document->shouldEnforceContentDispositionAttachmentSandbox() || document->securityOrigin()->canRequest(url))
+ return true;
+
+ String message = "Unsafe attempt to load URL " + url.stringCenterEllipsizedToLength() + " from document with Content-Disposition: attachment at URL " + document->url().stringCenterEllipsizedToLength() + ".";
+ document->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
+ return false;
+}
+
</ins><span class="cx"> bool CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest& request, CachedResource* resource)
</span><span class="cx"> {
</span><span class="cx"> if (!resource || !frame() || resource->status() != CachedResource::Cached)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (194208 => 194209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2015-12-17 05:02:49 UTC (rev 194208)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2015-12-17 05:53:40 UTC (rev 194209)
</span><span class="lines">@@ -157,6 +157,8 @@
</span><span class="cx">
</span><span class="cx"> bool clientDefersImage(const URL&) const;
</span><span class="cx"> void reloadImagesIfNotDeferred();
</span><ins>+
+ bool canRequestInContentDispositionAttachmentSandbox(CachedResource::Type, const URL&) const;
</ins><span class="cx">
</span><span class="cx"> HashSet<String> m_validatedURLs;
</span><span class="cx"> mutable DocumentResourceMap m_documentResources;
</span></span></pre>
</div>
</div>
</body>
</html>