<!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>[198439] 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/198439">198439</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-03-18 12:46:38 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Local file restrictions should not block sessionStorage access
https://bugs.webkit.org/show_bug.cgi?id=155609
<rdar://problem/25229461>
Reviewed by Andy Estes.
Source/WebCore:
Use of 'sesssionStorage' is governed by SecurityOrigin with third party access
set to 'ShouldAllowFromThirdParty::AlwaysAllowFromThirdParty'. We should not
reject local files for this combination of arguments.
Test: storage/domstorage/sessionstorage/blocked-file-access.html
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::canAccessStorage): For the case of sessionStorage,
allow local file access.
LayoutTests:
* storage/domstorage/sessionstorage/blocked-file-access-expected.txt: Added.
* storage/domstorage/sessionstorage/blocked-file-access.html: Added.
* storage/domstorage/sessionstorage/resources/blocked-example.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="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstoragedomstoragesessionstorageblockedfileaccessexpectedtxt">trunk/LayoutTests/storage/domstorage/sessionstorage/blocked-file-access-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstoragedomstoragesessionstorageblockedfileaccesshtml">trunk/LayoutTests/storage/domstorage/sessionstorage/blocked-file-access.html</a></li>
<li><a href="#trunkLayoutTestsstoragedomstoragesessionstorageresourcesblockedexamplehtml">trunk/LayoutTests/storage/domstorage/sessionstorage/resources/blocked-example.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198438 => 198439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-18 19:44:25 UTC (rev 198438)
+++ trunk/LayoutTests/ChangeLog 2016-03-18 19:46:38 UTC (rev 198439)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-18 Brent Fulgham <bfulgham@apple.com>
+
+ Local file restrictions should not block sessionStorage access
+ https://bugs.webkit.org/show_bug.cgi?id=155609
+ <rdar://problem/25229461>
+
+ Reviewed by Andy Estes.
+
+ * storage/domstorage/sessionstorage/blocked-file-access-expected.txt: Added.
+ * storage/domstorage/sessionstorage/blocked-file-access.html: Added.
+ * storage/domstorage/sessionstorage/resources/blocked-example.html: Added.
+
</ins><span class="cx"> 2016-03-18 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline inspector/model/remote-object.html for mac after r198435
</span></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragesessionstorageblockedfileaccessexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/domstorage/sessionstorage/blocked-file-access-expected.txt (0 => 198439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/sessionstorage/blocked-file-access-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/domstorage/sessionstorage/blocked-file-access-expected.txt 2016-03-18 19:46:38 UTC (rev 198439)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+CONSOLE MESSAGE: line 10: PASS: window.sessionStorage was accessible
+
+Test that we are permitted access to sessionStorage from a file URL if universal access is turned off.
</ins></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragesessionstorageblockedfileaccesshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/domstorage/sessionstorage/blocked-file-access.html (0 => 198439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/sessionstorage/blocked-file-access.html (rev 0)
+++ trunk/LayoutTests/storage/domstorage/sessionstorage/blocked-file-access.html 2016-03-18 19:46:38 UTC (rev 198439)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.setAllowUniversalAccessFromFileURLs(false);
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<body>
+<iframe src="resources/blocked-example.html"></iframe>
+<div id="results"></div>
+Test that we are permitted access to sessionStorage from a file URL if universal access is turned off.
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragesessionstorageresourcesblockedexamplehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/domstorage/sessionstorage/resources/blocked-example.html (0 => 198439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/sessionstorage/resources/blocked-example.html (rev 0)
+++ trunk/LayoutTests/storage/domstorage/sessionstorage/resources/blocked-example.html 2016-03-18 19:46:38 UTC (rev 198439)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="resources/clearSessionStorage.js"></script>
+<script>
+function runTest()
+{
+ try {
+ if (window.sessionStorage)
+ console.log("PASS: window.sessionStorage was accessible");
+ } catch (e) {
+ console.log("FAIL: window.sessionStorage was not accessible");
+ console.log("Exception: " + e.message);
+ }
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+</head>
+<body onload="runTest();">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198438 => 198439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-18 19:44:25 UTC (rev 198438)
+++ trunk/Source/WebCore/ChangeLog 2016-03-18 19:46:38 UTC (rev 198439)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-03-18 Brent Fulgham <bfulgham@apple.com>
+
+ Local file restrictions should not block sessionStorage access
+ https://bugs.webkit.org/show_bug.cgi?id=155609
+ <rdar://problem/25229461>
+
+ Reviewed by Andy Estes.
+
+ Use of 'sesssionStorage' is governed by SecurityOrigin with third party access
+ set to 'ShouldAllowFromThirdParty::AlwaysAllowFromThirdParty'. We should not
+ reject local files for this combination of arguments.
+
+ Test: storage/domstorage/sessionstorage/blocked-file-access.html
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::canAccessStorage): For the case of sessionStorage,
+ allow local file access.
+
</ins><span class="cx"> 2016-03-18 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> CachedResource::MediaResource types shouldn't be blocked due to mixed-content.
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (198438 => 198439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2016-03-18 19:44:25 UTC (rev 198438)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2016-03-18 19:46:38 UTC (rev 198439)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> if (m_storageBlockingPolicy == BlockAllStorage)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (isLocal() && !m_universalAccess)
</del><ins>+ if (isLocal() && !m_universalAccess && shouldAllowFromThirdParty != AlwaysAllowFromThirdParty)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // FIXME: This check should be replaced with an ASSERT once we can guarantee that topOrigin is not null.
</span></span></pre>
</div>
</div>
</body>
</html>