<!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>[214309] 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/214309">214309</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-23 12:06:31 -0700 (Thu, 23 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebSQL databases should not openable in private browsing.
<rdar://problem/30383335> and https://bugs.webkit.org/show_bug.cgi?id=170013
Reviewed by Alex Christensen.
Source/WebCore:
Test: storage/websql/private-browsing-open-disabled.html
* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::openDatabaseBackend):
(WebCore::DatabaseManager::tryToOpenDatabaseBackend): Throw an exception if in private browsing.
* Modules/webdatabase/DatabaseManager.h:
LayoutTests:
* storage/websql/private-browsing-open-disabled-expected.txt: Added.
* storage/websql/private-browsing-open-disabled.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="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstoragewebsqlprivatebrowsingopendisabledexpectedtxt">trunk/LayoutTests/storage/websql/private-browsing-open-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstoragewebsqlprivatebrowsingopendisabledhtml">trunk/LayoutTests/storage/websql/private-browsing-open-disabled.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214308 => 214309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-23 18:47:49 UTC (rev 214308)
+++ trunk/LayoutTests/ChangeLog 2017-03-23 19:06:31 UTC (rev 214309)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-23 Brady Eidson <beidson@apple.com>
+
+ WebSQL databases should not openable in private browsing.
+ <rdar://problem/30383335> and https://bugs.webkit.org/show_bug.cgi?id=170013
+
+ Reviewed by Alex Christensen.
+
+ * storage/websql/private-browsing-open-disabled-expected.txt: Added.
+ * storage/websql/private-browsing-open-disabled.html: Added.
+
</ins><span class="cx"> 2017-03-23 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove pass expectation for fast/forms/range/range-remove-on-drag.html as it relies on touch events.
</span></span></pre></div>
<a id="trunkLayoutTestsstoragewebsqlprivatebrowsingopendisabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/websql/private-browsing-open-disabled-expected.txt (0 => 214309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/websql/private-browsing-open-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/websql/private-browsing-open-disabled-expected.txt 2017-03-23 19:06:31 UTC (rev 214309)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Caught exception opening a WebSQL database in private browsing: SecurityError (DOM Exception 18): The operation is insecure.
</ins></span></pre></div>
<a id="trunkLayoutTestsstoragewebsqlprivatebrowsingopendisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/websql/private-browsing-open-disabled.html (0 => 214309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/websql/private-browsing-open-disabled.html (rev 0)
+++ trunk/LayoutTests/storage/websql/private-browsing-open-disabled.html 2017-03-23 19:06:31 UTC (rev 214309)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<body>
+<div id="logger"></div>
+<script>
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ testRunner.setPrivateBrowsingEnabled(true);
+}
+
+var logger = document.getElementById("logger");
+try {
+ openDatabase("PrivateBrowsingOpenDisabled", "1.0", "Test that you can't open databases in private browsing mode", 1);
+ logger.innerHTML = "Successfully opened a WebSQL database in private browsing"
+} catch(e) {
+ logger.innerHTML = "Caught exception opening a WebSQL database in private browsing: " + e;
+}
+
+if (window.testRunner)
+ testRunner.notifyDone();
+
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214308 => 214309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-23 18:47:49 UTC (rev 214308)
+++ trunk/Source/WebCore/ChangeLog 2017-03-23 19:06:31 UTC (rev 214309)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-23 Brady Eidson <beidson@apple.com>
+
+ WebSQL databases should not openable in private browsing.
+ <rdar://problem/30383335> and https://bugs.webkit.org/show_bug.cgi?id=170013
+
+ Reviewed by Alex Christensen.
+
+ Test: storage/websql/private-browsing-open-disabled.html
+
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::openDatabaseBackend):
+ (WebCore::DatabaseManager::tryToOpenDatabaseBackend): Throw an exception if in private browsing.
+ * Modules/webdatabase/DatabaseManager.h:
+
</ins><span class="cx"> 2017-03-22 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> NeverDestroyed<MediaQueryEvaluator> must explicitly construct with a String
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (214308 => 214309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2017-03-23 18:47:49 UTC (rev 214308)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2017-03-23 19:06:31 UTC (rev 214309)
</span><span class="lines">@@ -121,10 +121,8 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Ref<Database>> DatabaseManager::openDatabaseBackend(ScriptExecutionContext& context, const String& name, const String& expectedVersion, const String& displayName, unsigned estimatedSize, bool setVersionInNewDatabase)
</span><span class="cx"> {
</span><del>- auto databaseContext = this->databaseContext(context);
</del><ins>+ auto backend = tryToOpenDatabaseBackend(context, name, expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, FirstTryToOpenDatabase);
</ins><span class="cx">
</span><del>- auto backend = tryToOpenDatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, FirstTryToOpenDatabase);
-
</del><span class="cx"> if (backend.hasException()) {
</span><span class="cx"> if (backend.exception().code() == QUOTA_EXCEEDED_ERR) {
</span><span class="cx"> // Notify the client that we've exceeded the database quota.
</span><span class="lines">@@ -133,9 +131,9 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: What guarantees context.securityOrigin() is non-null?
</span><span class="cx"> ProposedDatabase proposedDatabase { *this, *context.securityOrigin(), name, displayName, estimatedSize };
</span><del>- databaseContext->databaseExceededQuota(name, proposedDatabase.details());
</del><ins>+ this->databaseContext(context)->databaseExceededQuota(name, proposedDatabase.details());
</ins><span class="cx"> }
</span><del>- backend = tryToOpenDatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, RetryOpenDatabase);
</del><ins>+ backend = tryToOpenDatabaseBackend(context, name, expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, RetryOpenDatabase);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -149,9 +147,22 @@
</span><span class="cx"> return backend;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<Database>> DatabaseManager::tryToOpenDatabaseBackend(DatabaseContext& backendContext, const String& name, const String& expectedVersion, const String& displayName, unsigned estimatedSize, bool setVersionInNewDatabase,
</del><ins>+ExceptionOr<Ref<Database>> DatabaseManager::tryToOpenDatabaseBackend(ScriptExecutionContext& scriptContext, const String& name, const String& expectedVersion, const String& displayName, unsigned estimatedSize, bool setVersionInNewDatabase,
</ins><span class="cx"> OpenAttempt attempt)
</span><span class="cx"> {
</span><ins>+ if (is<Document>(&scriptContext)) {
+ auto* page = downcast<Document>(scriptContext).page();
+ if (!page || page->usesEphemeralSession())
+ return Exception { SECURITY_ERR };
+ }
+
+ if (scriptContext.isWorkerGlobalScope()) {
+ ASSERT_NOT_REACHED();
+ return Exception { SECURITY_ERR };
+ }
+
+ auto backendContext = this->databaseContext(scriptContext);
+
</ins><span class="cx"> ExceptionOr<void> preflightResult;
</span><span class="cx"> switch (attempt) {
</span><span class="cx"> case FirstTryToOpenDatabase:
</span><span class="lines">@@ -171,7 +182,7 @@
</span><span class="cx"> return openResult.releaseException();
</span><span class="cx">
</span><span class="cx"> // FIXME: What guarantees backendContext.securityOrigin() is non-null?
</span><del>- DatabaseTracker::singleton().setDatabaseDetails(backendContext.securityOrigin(), name, displayName, estimatedSize);
</del><ins>+ DatabaseTracker::singleton().setDatabaseDetails(backendContext->securityOrigin(), name, displayName, estimatedSize);
</ins><span class="cx"> return WTFMove(database);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h (214308 => 214309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2017-03-23 18:47:49 UTC (rev 214308)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2017-03-23 19:06:31 UTC (rev 214309)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> enum OpenAttempt { FirstTryToOpenDatabase, RetryOpenDatabase };
</span><span class="cx"> ExceptionOr<Ref<Database>> openDatabaseBackend(ScriptExecutionContext&, const String& name, const String& expectedVersion, const String& displayName, unsigned estimatedSize, bool setVersionInNewDatabase);
</span><del>- static ExceptionOr<Ref<Database>> tryToOpenDatabaseBackend(DatabaseContext&, const String& name, const String& expectedVersion, const String& displayName, unsigned estimatedSize, bool setVersionInNewDatabase, OpenAttempt);
</del><ins>+ ExceptionOr<Ref<Database>> tryToOpenDatabaseBackend(ScriptExecutionContext&, const String& name, const String& expectedVersion, const String& displayName, unsigned estimatedSize, bool setVersionInNewDatabase, OpenAttempt);
</ins><span class="cx">
</span><span class="cx"> class ProposedDatabase;
</span><span class="cx"> void addProposedDatabase(ProposedDatabase&);
</span></span></pre>
</div>
</div>
</body>
</html>