<!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>[163823] 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/163823">163823</a></dd>
<dt>Author</dt> <dd>jpfau@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 14:55:47 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable access to application cache when in private browsing
https://bugs.webkit.org/show_bug.cgi?id=128426
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Tests: http/tests/security/appcache-in-private-browsing.html
http/tests/security/appcache-switching-private-browsing.html
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::cacheForMainRequest):
(WebCore::ApplicationCacheGroup::selectCache):
(WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL):
(WebCore::ApplicationCacheGroup::update):
* loader/appcache/ApplicationCacheHost.cpp:
(WebCore::ApplicationCacheHost::isApplicationCacheEnabled):
LayoutTests:
* http/tests/security/appcache-in-private-browsing-expected.txt: Added.
* http/tests/security/appcache-in-private-browsing.html: Added.
* http/tests/security/appcache-switching-private-browsing-expected.txt: Added.
* http/tests/security/appcache-switching-private-browsing.html: Added.
* http/tests/security/resources/frame-for-appcache-in-private-browsing.html: Added.</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="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecurityappcacheinprivatebrowsingexpectedtxt">trunk/LayoutTests/http/tests/security/appcache-in-private-browsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityappcacheinprivatebrowsinghtml">trunk/LayoutTests/http/tests/security/appcache-in-private-browsing.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityappcacheswitchingprivatebrowsingexpectedtxt">trunk/LayoutTests/http/tests/security/appcache-switching-private-browsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityappcacheswitchingprivatebrowsinghtml">trunk/LayoutTests/http/tests/security/appcache-switching-private-browsing.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityresourcesframeforappcacheinprivatebrowsinghtml">trunk/LayoutTests/http/tests/security/resources/frame-for-appcache-in-private-browsing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163822 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-10 22:46:40 UTC (rev 163822)
+++ trunk/LayoutTests/ChangeLog 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-07 Jeffrey Pfau <jpfau@apple.com>
+
+ Disable access to application cache when in private browsing
+ https://bugs.webkit.org/show_bug.cgi?id=128426
+
+ Reviewed by Alexey Proskuryakov.
+
+ * http/tests/security/appcache-in-private-browsing-expected.txt: Added.
+ * http/tests/security/appcache-in-private-browsing.html: Added.
+ * http/tests/security/appcache-switching-private-browsing-expected.txt: Added.
+ * http/tests/security/appcache-switching-private-browsing.html: Added.
+ * http/tests/security/resources/frame-for-appcache-in-private-browsing.html: Added.
+
</ins><span class="cx"> 2014-02-10 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Move animation tests that have similar failing behavior in debug builds together,
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityappcacheinprivatebrowsingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/appcache-in-private-browsing-expected.txt (0 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/appcache-in-private-browsing-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/appcache-in-private-browsing-expected.txt 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+CONSOLE MESSAGE: line 31: Application cache not loaded
+This test passes if the application cache does not load while in private browsing
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityappcacheinprivatebrowsinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/appcache-in-private-browsing.html (0 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/appcache-in-private-browsing.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/appcache-in-private-browsing.html 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ testRunner.waitUntilDone();
+}
+
+function finishTest(frame) {
+ if (window.testRunner) {
+ testRunner.setPrivateBrowsingEnabled(false);
+ testRunner.notifyDone();
+ }
+}
+
+function enterPrivateBrowsing(frame) {
+ if (window.testRunner)
+ testRunner.setPrivateBrowsingEnabled(true);
+ frame.onload = finishTest;
+ frame.contentWindow.location.reload();
+}
+</script>
+</head>
+<body>
+<p>This test passes if the application cache does not load while in private browsing</p>
+<iframe src="resources/frame-for-appcache-in-private-browsing.html" onload="enterPrivateBrowsing(this)"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityappcacheswitchingprivatebrowsingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/appcache-switching-private-browsing-expected.txt (0 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/appcache-switching-private-browsing-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/appcache-switching-private-browsing-expected.txt 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+CONSOLE MESSAGE: line 8: Test started
+CONSOLE MESSAGE: line 18: PASS
+This test passes if the application cache does not load while in private browsing
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityappcacheswitchingprivatebrowsinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/appcache-switching-private-browsing.html (0 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/appcache-switching-private-browsing.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/appcache-switching-private-browsing.html 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ testRunner.waitUntilDone();
+ console.log('Test started');
+}
+
+function enterPrivateBrowsing(frame) {
+ if (window.testRunner)
+ testRunner.setPrivateBrowsingEnabled(true);
+ frame.contentWindow.appCacheCallback = function(result) {
+ frame.contentWindow.updateAppCache(function(result) {
+ if (window.testRunner)
+ testRunner.setPrivateBrowsingEnabled(false);
+ console.log(result ? 'FAIL' : 'PASS');
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+ }
+}
+</script>
+</head>
+<body>
+<p>This test passes if the application cache does not load while in private browsing</p>
+<iframe src="resources/frame-for-appcache-in-private-browsing.html" onload="enterPrivateBrowsing(this)"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityresourcesframeforappcacheinprivatebrowsinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/resources/frame-for-appcache-in-private-browsing.html (0 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/resources/frame-for-appcache-in-private-browsing.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/resources/frame-for-appcache-in-private-browsing.html 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<html manifest="manifest-for-appcache.manifest">
+<head>
+<script>
+function updateAppCache(callback) {
+ appCacheCallback = callback;
+ window.applicationCache.update();
+}
+
+window.applicationCache.onnoupdate = function(e) {
+ console.log("Application cache loaded");
+ if (window.appCacheCallback) {
+ appCacheCallback(true);
+ }
+}
+
+window.applicationCache.oncached = function(e) {
+ console.log("Application cache loaded");
+ if (window.appCacheCallback) {
+ appCacheCallback(true);
+ }
+}
+
+window.applicationCache.onupdateready = function(e) {
+ console.log("Application cache loaded");
+ if (window.appCacheCallback) {
+ appCacheCallback(true);
+ }
+}
+
+window.applicationCache.onerror = function(e) {
+ console.log("Application cache not loaded");
+ if (window.appCacheCallback) {
+ appCacheCallback(false);
+ }
+}
+</script>
+</head>
+<body>
+<img src="abe.png">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163822 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-10 22:46:40 UTC (rev 163822)
+++ trunk/Source/WebCore/ChangeLog 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-07 Jeffrey Pfau <jpfau@apple.com>
+
+ Disable access to application cache when in private browsing
+ https://bugs.webkit.org/show_bug.cgi?id=128426
+
+ Reviewed by Alexey Proskuryakov.
+
+ Tests: http/tests/security/appcache-in-private-browsing.html
+ http/tests/security/appcache-switching-private-browsing.html
+
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::cacheForMainRequest):
+ (WebCore::ApplicationCacheGroup::selectCache):
+ (WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL):
+ (WebCore::ApplicationCacheGroup::update):
+ * loader/appcache/ApplicationCacheHost.cpp:
+ (WebCore::ApplicationCacheHost::isApplicationCacheEnabled):
+
</ins><span class="cx"> 2014-02-10 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Fix layering violations in MediaSource
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (163822 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-02-10 22:46:40 UTC (rev 163822)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> cacheStorage().cacheGroupDestroyed(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ApplicationCache* ApplicationCacheGroup::cacheForMainRequest(const ResourceRequest& request, DocumentLoader*)
</del><ins>+ApplicationCache* ApplicationCacheGroup::cacheForMainRequest(const ResourceRequest& request, DocumentLoader* documentLoader)
</ins><span class="cx"> {
</span><span class="cx"> if (!ApplicationCache::requestIsHTTPOrHTTPSGet(request))
</span><span class="cx"> return 0;
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> if (url.hasFragmentIdentifier())
</span><span class="cx"> url.removeFragmentIdentifier();
</span><span class="cx">
</span><ins>+ if (documentLoader->frame() && documentLoader->frame()->settings().privateBrowsingEnabled())
+ return 0;
+
</ins><span class="cx"> if (ApplicationCacheGroup* group = cacheStorage().cacheGroupForURL(url)) {
</span><span class="cx"> ASSERT(group->newestCache());
</span><span class="cx"> ASSERT(!group->isObsolete());
</span><span class="lines">@@ -152,6 +155,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Don't access anything on disk if private browsing is enabled.
+ if (frame->settings().privateBrowsingEnabled()) {
+ postListenerTask(ApplicationCacheHost::CHECKING_EVENT, documentLoader);
+ postListenerTask(ApplicationCacheHost::ERROR_EVENT, documentLoader);
+ return;
+ }
+
</ins><span class="cx"> URL manifestURL(passedManifestURL);
</span><span class="cx"> if (manifestURL.hasFragmentIdentifier())
</span><span class="cx"> manifestURL.removeFragmentIdentifier();
</span><span class="lines">@@ -195,13 +205,6 @@
</span><span class="cx"> if (!protocolHostAndPortAreEqual(manifestURL, request.url()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Don't change anything on disk if private browsing is enabled.
- if (frame->settings().privateBrowsingEnabled()) {
- postListenerTask(ApplicationCacheHost::CHECKING_EVENT, documentLoader);
- postListenerTask(ApplicationCacheHost::ERROR_EVENT, documentLoader);
- return;
- }
-
</del><span class="cx"> ApplicationCacheGroup* group = cacheStorage().findOrCreateCacheGroup(manifestURL);
</span><span class="cx">
</span><span class="cx"> documentLoader->applicationCacheHost()->setCandidateApplicationCacheGroup(group);
</span><span class="lines">@@ -223,6 +226,13 @@
</span><span class="cx"> DocumentLoader* documentLoader = frame->loader().documentLoader();
</span><span class="cx"> ASSERT(!documentLoader->applicationCacheHost()->applicationCache());
</span><span class="cx">
</span><ins>+ // Don't access anything on disk if private browsing is enabled.
+ if (frame->settings().privateBrowsingEnabled()) {
+ postListenerTask(ApplicationCacheHost::CHECKING_EVENT, documentLoader);
+ postListenerTask(ApplicationCacheHost::ERROR_EVENT, documentLoader);
+ return;
+ }
+
</ins><span class="cx"> ApplicationCache* mainResourceCache = documentLoader->applicationCacheHost()->mainResourceApplicationCache();
</span><span class="cx">
</span><span class="cx"> if (mainResourceCache) {
</span><span class="lines">@@ -431,13 +441,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Don't change anything on disk if private browsing is enabled.
</del><ins>+ // Don't access anything on disk if private browsing is enabled.
</ins><span class="cx"> if (frame->settings().privateBrowsingEnabled()) {
</span><span class="cx"> ASSERT(m_pendingMasterResourceLoaders.isEmpty());
</span><span class="cx"> ASSERT(m_pendingEntries.isEmpty());
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated);
</span><span class="cx"> postListenerTask(ApplicationCacheHost::CHECKING_EVENT, frame->loader().documentLoader());
</span><del>- postListenerTask(ApplicationCacheHost::NOUPDATE_EVENT, frame->loader().documentLoader());
</del><ins>+ postListenerTask(ApplicationCacheHost::ERROR_EVENT, frame->loader().documentLoader());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp (163822 => 163823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2014-02-10 22:46:40 UTC (rev 163822)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2014-02-10 22:55:47 UTC (rev 163823)
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx">
</span><span class="cx"> bool ApplicationCacheHost::isApplicationCacheEnabled()
</span><span class="cx"> {
</span><del>- return m_documentLoader->frame() && m_documentLoader->frame()->settings().offlineWebApplicationCacheEnabled();
</del><ins>+ return m_documentLoader->frame() && m_documentLoader->frame()->settings().offlineWebApplicationCacheEnabled() && !m_documentLoader->frame()->settings().privateBrowsingEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>