<!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>[204041] 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/204041">204041</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-08-02 14:28:12 -0700 (Tue, 02 Aug 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Removing IndexedDB WebsiteData can fail for some users.
https://bugs.webkit.org/show_bug.cgi?id=160463

Reviewed by Alex Christensen.

Source/WebCore:

Covered by changes to API test IndexedDB.StoreBlobThenDelete.

For a few months in trunk WebKit, deleting an IndexedDB using WebsiteDataStore API would only
delete the &quot;IndexedDB.sqlite3&quot; file, but would leave the &quot;-wal&quot; and &quot;-shm&quot; files behind.

We'd then fail to delete the directory itself, tricking API clients to think there are still
databases in the given origin.

Furthermore, the code to delete a database first checks for the existence of &quot;IndexedDB.sqlite3&quot;
then refuses to do any further cleanup if it doesn't exist.

We should just always run the entire delete procedure even if IndexedDB.sqlite does not exist.

* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::removeAllDatabasesForOriginPath):

* platform/sql/SQLiteFileSystem.cpp:
(WebCore::SQLiteFileSystem::deleteDatabaseFile):

Tools:

* TestWebKitAPI/Tests/WebKit2Cocoa/StoreBlobThenDelete.mm:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteFileSystemcpp">trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaStoreBlobThenDeletemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/StoreBlobThenDelete.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204040 => 204041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-08-02 21:17:37 UTC (rev 204040)
+++ trunk/Source/WebCore/ChangeLog        2016-08-02 21:28:12 UTC (rev 204041)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-08-02  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Removing IndexedDB WebsiteData can fail for some users.
+        https://bugs.webkit.org/show_bug.cgi?id=160463
+
+        Reviewed by Alex Christensen.
+
+        Covered by changes to API test IndexedDB.StoreBlobThenDelete.
+
+        For a few months in trunk WebKit, deleting an IndexedDB using WebsiteDataStore API would only
+        delete the &quot;IndexedDB.sqlite3&quot; file, but would leave the &quot;-wal&quot; and &quot;-shm&quot; files behind.
+        
+        We'd then fail to delete the directory itself, tricking API clients to think there are still
+        databases in the given origin.
+        
+        Furthermore, the code to delete a database first checks for the existence of &quot;IndexedDB.sqlite3&quot;
+        then refuses to do any further cleanup if it doesn't exist.
+        
+        We should just always run the entire delete procedure even if IndexedDB.sqlite does not exist.
+        
+        * Modules/indexeddb/server/IDBServer.cpp:
+        (WebCore::IDBServer::removeAllDatabasesForOriginPath):
+
+        * platform/sql/SQLiteFileSystem.cpp:
+        (WebCore::SQLiteFileSystem::deleteDatabaseFile):
+
</ins><span class="cx"> 2016-08-02  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix Mac CMake build.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (204040 => 204041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp        2016-08-02 21:17:37 UTC (rev 204040)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp        2016-08-02 21:28:12 UTC (rev 204041)
</span><span class="lines">@@ -543,10 +543,7 @@
</span><span class="cx">     for (auto&amp; databasePath : databasePaths) {
</span><span class="cx">         String databaseFile = pathByAppendingComponent(databasePath, &quot;IndexedDB.sqlite3&quot;);
</span><span class="cx"> 
</span><del>-        if (!fileExists(databaseFile))
-            continue;
-
-        if (modifiedSince &gt; std::chrono::system_clock::time_point::min()) {
</del><ins>+        if (modifiedSince &gt; std::chrono::system_clock::time_point::min() &amp;&amp; fileExists(databaseFile)) {
</ins><span class="cx">             time_t modificationTime;
</span><span class="cx">             if (!getFileModificationTime(databaseFile, modificationTime))
</span><span class="cx">                 continue;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteFileSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp (204040 => 204041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp        2016-08-02 21:17:37 UTC (rev 204040)
+++ trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp        2016-08-02 21:28:12 UTC (rev 204041)
</span><span class="lines">@@ -88,15 +88,13 @@
</span><span class="cx">     String walFileName = makeString(fileName, ASCIILiteral(&quot;-wal&quot;));
</span><span class="cx">     String shmFileName = makeString(fileName, ASCIILiteral(&quot;-shm&quot;));
</span><span class="cx"> 
</span><del>-    if (!deleteFile(fileName))
-        return false;
-
-    // Try to delete both the wal and shm files, whether or not they are actually there.
</del><ins>+    // Try to delete all three files whether or not they are there.
+    deleteFile(fileName);
</ins><span class="cx">     deleteFile(walFileName);
</span><span class="cx">     deleteFile(shmFileName);
</span><span class="cx"> 
</span><del>-    // If either the wal or shm files remain after the delete attempt, the overall delete operation failed.
-    return !fileExists(walFileName) &amp;&amp; !fileExists(shmFileName);
</del><ins>+    // If any of the wal or shm files remain after the delete attempt, the overall delete operation failed.
+    return !fileExists(fileName) &amp;&amp; !fileExists(walFileName) &amp;&amp; !fileExists(shmFileName);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204040 => 204041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-08-02 21:17:37 UTC (rev 204040)
+++ trunk/Tools/ChangeLog        2016-08-02 21:28:12 UTC (rev 204041)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-02  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Removing IndexedDB WebsiteData can fail for some users.
+        https://bugs.webkit.org/show_bug.cgi?id=160463
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/StoreBlobThenDelete.mm:
+
</ins><span class="cx"> 2016-08-01  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         _WKDownloadDelegate.didReceiveResponse should be called before decideDestinationWithSuggestedFilename
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaStoreBlobThenDeletemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/StoreBlobThenDelete.mm (204040 => 204041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/StoreBlobThenDelete.mm        2016-08-02 21:17:37 UTC (rev 204040)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/StoreBlobThenDelete.mm        2016-08-02 21:28:12 UTC (rev 204041)
</span><span class="lines">@@ -74,6 +74,18 @@
</span><span class="cx">     EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:blobFilePath]);
</span><span class="cx">     EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:databaseFilePath]);
</span><span class="cx"> 
</span><ins>+    // To make sure that the -wal and -shm files for a database are deleted even if the sqlite3 file is already missing,
+    // we need to:
+    // 1 - Create the path for a fake database that won't actively be in use
+    // 2 - Move -wal and -shm files into that directory
+    // 3 - Make sure the entire directory is deleted
+    NSString *fakeDatabasePath = [@&quot;~/Library/WebKit/TestWebKitAPI/WebsiteData/IndexedDB/file__0/FakeDatabasePath&quot; stringByExpandingTildeInPath];
+    NSString *fakeShmPath = [@&quot;~/Library/WebKit/TestWebKitAPI/WebsiteData/IndexedDB/file__0/FakeDatabasePath/IndexedDB.sqlite3-wal&quot; stringByExpandingTildeInPath];
+    NSString *fakeWalPath = [@&quot;~/Library/WebKit/TestWebKitAPI/WebsiteData/IndexedDB/file__0/FakeDatabasePath/IndexedDB.sqlite3-shm&quot; stringByExpandingTildeInPath];
+    [[NSFileManager defaultManager] createDirectoryAtPath:fakeDatabasePath withIntermediateDirectories:NO attributes:nil error:nil];
+    [[NSFileManager defaultManager] copyItemAtPath:databaseFilePath toPath:fakeShmPath error:nil];
+    [[NSFileManager defaultManager] copyItemAtPath:databaseFilePath toPath:fakeWalPath error:nil];
+
</ins><span class="cx">     // Make some other .blob files in the database directory to later validate that only appropriate files are deleted.
</span><span class="cx">     NSString *otherBlob1 = [@&quot;~/Library/WebKit/TestWebKitAPI/WebsiteData/IndexedDB/file__0/StoreBlobToBeDeleted/7182.blob&quot; stringByExpandingTildeInPath];
</span><span class="cx">     NSString *otherBlob2 = [@&quot;~/Library/WebKit/TestWebKitAPI/WebsiteData/IndexedDB/file__0/StoreBlobToBeDeleted/1a.blob&quot; stringByExpandingTildeInPath];
</span><span class="lines">@@ -97,6 +109,11 @@
</span><span class="cx">         EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:otherBlob3]);
</span><span class="cx">         EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:otherBlob4]);
</span><span class="cx"> 
</span><ins>+        // Make sure everything related to the fake database is gone.
+        EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:fakeShmPath]);
+        EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:fakeWalPath]);
+        EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:fakeDatabasePath]);
+
</ins><span class="cx">         // Now delete them so we're not leaving files around.
</span><span class="cx">         [[NSFileManager defaultManager] removeItemAtPath:otherBlob2 error:nil];
</span><span class="cx">         [[NSFileManager defaultManager] removeItemAtPath:otherBlob3 error:nil];
</span></span></pre>
</div>
</div>

</body>
</html>