<!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>[207318] trunk/Source/WebCore</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/207318">207318</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-10-13 18:14:05 -0700 (Thu, 13 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Support Web Archive previews generated by QuickLook
https://bugs.webkit.org/show_bug.cgi?id=162951
<rdar://problem/28607920>
Reviewed by Brady Eidson.
QuickLook might generate a Web Archive preview for some resource types, but WebKit would
refuse to load it due to the prohibition on loading remote Web Archives. Even though the
original resource might be from a remote origin, the QuickLook-generated preview is a
trusted local resource, so allow it to be loaded.
No test possible.
* loader/DocumentLoader.cpp:
(WebCore::isRemoteWebArchive): Added. Moved the remote web archive check from
continueAfterContentPolicy() to here, and added a check for responses containing the
QuickLook preview protocol.
(WebCore::DocumentLoader::continueAfterContentPolicy): Called isRemoteWebArchive().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207317 => 207318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-14 01:10:30 UTC (rev 207317)
+++ trunk/Source/WebCore/ChangeLog 2016-10-14 01:14:05 UTC (rev 207318)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-13 Andy Estes <aestes@apple.com>
+
+ [iOS] Support Web Archive previews generated by QuickLook
+ https://bugs.webkit.org/show_bug.cgi?id=162951
+ <rdar://problem/28607920>
+
+ Reviewed by Brady Eidson.
+
+ QuickLook might generate a Web Archive preview for some resource types, but WebKit would
+ refuse to load it due to the prohibition on loading remote Web Archives. Even though the
+ original resource might be from a remote origin, the QuickLook-generated preview is a
+ trusted local resource, so allow it to be loaded.
+
+ No test possible.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::isRemoteWebArchive): Added. Moved the remote web archive check from
+ continueAfterContentPolicy() to here, and added a check for responses containing the
+ QuickLook preview protocol.
+ (WebCore::DocumentLoader::continueAfterContentPolicy): Called isRemoteWebArchive().
+
</ins><span class="cx"> 2016-10-13 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> CSS parsing should use Color not RGBA32
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (207317 => 207318)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-10-14 01:10:30 UTC (rev 207317)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-10-14 01:14:05 UTC (rev 207318)
</span><span class="lines">@@ -81,6 +81,10 @@
</span><span class="cx"> #include "ContentFilter.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+#include "QuickLook.h"
+#endif
+
</ins><span class="cx"> #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - DocumentLoader::" fmt, this, ##__VA_ARGS__)
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -744,6 +748,32 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isRemoteWebArchive(const DocumentLoader& documentLoader)
+{
+ using MIMETypeHashSet = HashSet<String, ASCIICaseInsensitiveHash>;
+ static NeverDestroyed<MIMETypeHashSet> webArchiveMIMETypes {
+ MIMETypeHashSet {
+ ASCIILiteral("application/x-webarchive"),
+ ASCIILiteral("application/x-mimearchive"),
+ ASCIILiteral("multipart/related"),
+#if PLATFORM(GTK)
+ ASCIILiteral("message/rfc822"),
+#endif
+ }
+ };
+
+ const ResourceResponse& response = documentLoader.response();
+ if (!webArchiveMIMETypes.get().contains(response.mimeType()))
+ return false;
+
+#if USE(QUICK_LOOK)
+ if (response.url().protocolIs(QLPreviewProtocol()))
+ return false;
+#endif
+
+ return !documentLoader.substituteData().isValid() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(documentLoader.request().url().protocol());
+}
+
</ins><span class="cx"> void DocumentLoader::continueAfterContentPolicy(PolicyAction policy)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_waitingForContentPolicy);
</span><span class="lines">@@ -751,20 +781,10 @@
</span><span class="cx"> if (isStopping())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- URL url = m_request.url();
- const String& mimeType = m_response.mimeType();
-
</del><span class="cx"> switch (policy) {
</span><span class="cx"> case PolicyUse: {
</span><span class="cx"> // Prevent remote web archives from loading because they can claim to be from any domain and thus avoid cross-domain security checks (4120255).
</span><del>- bool isRemoteWebArchive = (equalLettersIgnoringASCIICase(mimeType, "application/x-webarchive")
- || equalLettersIgnoringASCIICase(mimeType, "application/x-mimearchive")
-#if PLATFORM(GTK)
- || equalLettersIgnoringASCIICase(mimeType, "message/rfc822")
-#endif
- || equalLettersIgnoringASCIICase(mimeType, "multipart/related"))
- && !m_substituteData.isValid() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol());
- if (!frameLoader()->client().canShowMIMEType(mimeType) || isRemoteWebArchive) {
</del><ins>+ if (!frameLoader()->client().canShowMIMEType(m_response.mimeType()) || isRemoteWebArchive(*this)) {
</ins><span class="cx"> frameLoader()->policyChecker().cannotShowMIMEType(m_response);
</span><span class="cx"> // Check reachedTerminalState since the load may have already been canceled inside of _handleUnimplementablePolicyWithErrorCode::.
</span><span class="cx"> stopLoadingForPolicyChange();
</span></span></pre>
</div>
</div>
</body>
</html>