Diff
Modified: trunk/Source/WebCore/ChangeLog (265148 => 265149)
--- trunk/Source/WebCore/ChangeLog 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Source/WebCore/ChangeLog 2020-07-31 17:44:19 UTC (rev 265149)
@@ -1,3 +1,22 @@
+2020-07-31 Sihui Liu <[email protected]>
+
+ -[WKWebsiteDataStore _renameOrigin:] needs to support IndexedDB renames
+ https://bugs.webkit.org/show_bug.cgi?id=214905
+ <rdar://problem/66247978>
+
+ Reviewed by Alex Christensen.
+
+ To do the renaming, we close all existing databases whose top origin is old origin, and move all files in
+ directory of old origin to that of new origin.
+
+ API test: WebKit.WebsiteDataStoreRenameOriginForIndexedDatabase
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::closeDatabasesForOrigins):
+ (WebCore::IDBServer::IDBServer::closeAndDeleteDatabasesForOrigins):
+ (WebCore::IDBServer::IDBServer::renameOrigin):
+ * Modules/indexeddb/server/IDBServer.h:
+
2020-07-31 Chris Fleizach <[email protected]>
AX: Inteterminate progressbar reading as 50% with Voiceover
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (265148 => 265149)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2020-07-31 17:44:19 UTC (rev 265149)
@@ -562,7 +562,7 @@
}
}
-void IDBServer::closeAndDeleteDatabasesForOrigins(const Vector<SecurityOriginData>& origins)
+void IDBServer::closeDatabasesForOrigins(const Vector<SecurityOriginData>& targetOrigins, Function<bool(const SecurityOriginData&, const ClientOrigin&)>&& filter)
{
ASSERT(!isMainThread());
ASSERT(m_lock.isHeld());
@@ -569,13 +569,12 @@
HashSet<UniqueIDBDatabase*> openDatabases;
for (auto& database : m_uniqueIDBDatabaseMap.values()) {
- const auto& identifier = database->identifier();
- for (auto& origin : origins) {
- if (identifier.isRelatedToOrigin(origin)) {
- openDatabases.add(database.get());
- break;
- }
- }
+ const auto& databaseOrigin = database->identifier().origin();
+ bool filtered = WTF::anyOf(targetOrigins, [&databaseOrigin, &filter](auto& targetOrigin) {
+ return filter(targetOrigin, databaseOrigin);
+ });
+ if (filtered)
+ openDatabases.add(database.get());
}
for (auto& database : openDatabases) {
@@ -582,7 +581,17 @@
database->immediateClose();
m_uniqueIDBDatabaseMap.remove(database->identifier());
}
+}
+void IDBServer::closeAndDeleteDatabasesForOrigins(const Vector<SecurityOriginData>& origins)
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_lock.isHeld());
+
+ closeDatabasesForOrigins(origins, [](const SecurityOriginData& origin, const ClientOrigin& databaseOrigin) -> bool {
+ return databaseOrigin.isRelated(origin);
+ });
+
if (!m_databaseDirectoryPath.isEmpty()) {
removeDatabasesWithOriginsForVersion(origins, "v0");
removeDatabasesWithOriginsForVersion(origins, "v1");
@@ -694,6 +703,20 @@
}
}
+void IDBServer::renameOrigin(const WebCore::SecurityOriginData& oldOrigin, const WebCore::SecurityOriginData& newOrigin)
+{
+ Vector<SecurityOriginData> targetOrigins = { oldOrigin };
+ closeDatabasesForOrigins(targetOrigins, [](const SecurityOriginData& targetOrigin, const ClientOrigin& databaseOrigin) -> bool {
+ return databaseOrigin.topOrigin == targetOrigin;
+ });
+
+ auto versionPath = FileSystem::pathByAppendingComponent(databaseDirectoryPathIsolatedCopy(), "v1");
+ auto oldOriginPath = FileSystem::pathByAppendingComponent(versionPath, oldOrigin.databaseIdentifier());
+ auto newOriginPath = FileSystem::pathByAppendingComponent(versionPath, newOrigin.databaseIdentifier());
+ if (FileSystem::fileExists(oldOriginPath))
+ FileSystem::moveFile(oldOriginPath, newOriginPath);
+}
+
StorageQuotaManager::Decision IDBServer::requestSpace(const ClientOrigin& origin, uint64_t taskSize)
{
ASSERT(!isMainThread());
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (265148 => 265149)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2020-07-31 17:44:19 UTC (rev 265149)
@@ -103,6 +103,8 @@
WEBCORE_EXPORT void closeAndDeleteDatabasesModifiedSince(WallTime);
WEBCORE_EXPORT void closeAndDeleteDatabasesForOrigins(const Vector<SecurityOriginData>&);
+ void closeDatabasesForOrigins(const Vector<SecurityOriginData>&, Function<bool(const SecurityOriginData&, const ClientOrigin&)>&&);
+ WEBCORE_EXPORT void renameOrigin(const WebCore::SecurityOriginData&, const WebCore::SecurityOriginData&);
StorageQuotaManager::Decision requestSpace(const ClientOrigin&, uint64_t taskSize);
WEBCORE_EXPORT static uint64_t diskUsage(const String& rootDirectory, const ClientOrigin&);
Modified: trunk/Source/WebKit/ChangeLog (265148 => 265149)
--- trunk/Source/WebKit/ChangeLog 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Source/WebKit/ChangeLog 2020-07-31 17:44:19 UTC (rev 265149)
@@ -1,3 +1,19 @@
+2020-07-31 Sihui Liu <[email protected]>
+
+ -[WKWebsiteDataStore _renameOrigin:] needs to support IndexedDB renames
+ https://bugs.webkit.org/show_bug.cgi?id=214905
+ <rdar://problem/66247978>
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/IndexedDB/WebIDBServer.cpp:
+ (WebKit::WebIDBServer::renameOrigin):
+ * NetworkProcess/IndexedDB/WebIDBServer.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::renameOriginInWebsiteData):
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _renameOrigin:to:forDataOfTypes:completionHandler:]):
+
2020-07-31 Ryan Haddad <[email protected]>
Unreviewed Catalyst build fix.
Modified: trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp (265148 => 265149)
--- trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp 2020-07-31 17:44:19 UTC (rev 265149)
@@ -89,6 +89,19 @@
});
}
+void WebIDBServer::renameOrigin(const WebCore::SecurityOriginData& oldOrigin, const WebCore::SecurityOriginData& newOrigin, CompletionHandler<void()>&& callback)
+{
+ ASSERT(RunLoop::isMain());
+
+ postTask([this, protectedThis = makeRef(*this), oldOrigin = oldOrigin.isolatedCopy(), newOrigin = newOrigin.isolatedCopy(), callback = WTFMove(callback)] () mutable {
+ ASSERT(!RunLoop::isMain());
+
+ LockHolder locker(m_server->lock());
+ m_server->renameOrigin(oldOrigin, newOrigin);
+ postTaskReply(CrossThreadTask(WTFMove(callback)));
+ });
+}
+
void WebIDBServer::suspend(ShouldForceStop shouldForceStop)
{
ASSERT(RunLoop::isMain());
Modified: trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h (265148 => 265149)
--- trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h 2020-07-31 17:44:19 UTC (rev 265149)
@@ -49,6 +49,7 @@
void closeAndDeleteDatabasesModifiedSince(WallTime, CompletionHandler<void()>&& callback);
void closeAndDeleteDatabasesForOrigins(const Vector<WebCore::SecurityOriginData>&, CompletionHandler<void()>&& callback);
+ void renameOrigin(const WebCore::SecurityOriginData&, const WebCore::SecurityOriginData&, CompletionHandler<void()>&&);
enum class ShouldForceStop : bool { No, Yes };
void suspend(ShouldForceStop);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (265148 => 265149)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2020-07-31 17:44:19 UTC (rev 265149)
@@ -2551,11 +2551,24 @@
void NetworkProcess::renameOriginInWebsiteData(PAL::SessionID sessionID, const URL& oldName, const URL& newName, OptionSet<WebsiteDataType> dataTypes, CompletionHandler<void()>&& completionHandler)
{
auto aggregator = CallbackAggregator::create(WTFMove(completionHandler));
+ auto oldOrigin = WebCore::SecurityOriginData::fromURL(oldName);
+ auto newOrigin = WebCore::SecurityOriginData::fromURL(newName);
+ if (oldOrigin.isEmpty() || newOrigin.isEmpty())
+ return;
+
if (dataTypes.contains(WebsiteDataType::LocalStorage)) {
if (m_storageManagerSet->contains(sessionID))
m_storageManagerSet->renameOrigin(sessionID, oldName, newName, [aggregator] { });
}
+
+#if ENABLE(INDEXED_DATABASE)
+ if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
+ auto path = m_idbDatabasePaths.get(sessionID);
+ if (!path.isEmpty())
+ webIDBServer(sessionID).renameOrigin(oldOrigin, newOrigin, [aggregator] { });
+ }
+#endif
}
#if ENABLE(SERVICE_WORKER)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (265148 => 265149)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2020-07-31 17:44:19 UTC (rev 265149)
@@ -608,8 +608,10 @@
if (!dataTypes.count)
return completionHandler();
- if (dataTypes.count > 1 || ![dataTypes containsObject:WKWebsiteDataTypeLocalStorage])
- [NSException raise:NSInvalidArgumentException format:@"_renameOrigin can only be called with WKWebsiteDataTypeLocalStorage right now."];
+ NSSet *supportedTypes = [NSSet setWithObjects:WKWebsiteDataTypeLocalStorage, WKWebsiteDataTypeIndexedDBDatabases, nil];
+ if (![dataTypes isSubsetOfSet:supportedTypes])
+ [NSException raise:NSInvalidArgumentException format:@"_renameOrigin can only be called with WKWebsiteDataTypeLocalStorage and WKWebsiteDataTypeIndexedDBDatabases right now."];
+
_websiteDataStore->renameOriginInWebsiteData(oldName, newName, WebKit::toWebsiteDataTypes(dataTypes), [completionHandler = makeBlockPtr(completionHandler)] {
completionHandler();
});
Modified: trunk/Tools/ChangeLog (265148 => 265149)
--- trunk/Tools/ChangeLog 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Tools/ChangeLog 2020-07-31 17:44:19 UTC (rev 265149)
@@ -1,3 +1,14 @@
+2020-07-31 Sihui Liu <[email protected]>
+
+ -[WKWebsiteDataStore _renameOrigin:] needs to support IndexedDB renames
+ https://bugs.webkit.org/show_bug.cgi?id=214905
+ <rdar://problem/66247978>
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+ (TEST):
+
2020-07-31 Jonathan Bedard <[email protected]>
[webkitcorepy] Changes to Tools/Scripts/libraries should trigger EWS
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm (265148 => 265149)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2020-07-31 17:27:47 UTC (rev 265148)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2020-07-31 17:44:19 UTC (rev 265149)
@@ -548,6 +548,72 @@
EXPECT_TRUE(dataStore._configuration.persistent);
}
+TEST(WebKit, WebsiteDataStoreRenameOriginForIndexedDatabase)
+{
+ // Reset defaultDataStore before test.
+ __block bool done = false;
+ [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
+ done = true;
+ }];
+ TestWebKitAPI::Util::run(&done);
+ done = false;
+
+ auto handler = adoptNS([[WebsiteDataStoreCustomPathsMessageHandler alloc] init]);
+ RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+ [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
+ auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+ NSString *testString = @"<script> \
+ var request = window.indexedDB.open('testDB'); \
+ var db; \
+ request._onupgradeneeded_ = function(event) { \
+ db = event.target.result; \
+ window.webkit.messageHandlers.testHandler.postMessage('database is created'); \
+ db._onclose_ = function(event) { \
+ window.webkit.messageHandlers.testHandler.postMessage('database is closed'); \
+ } \
+ }; \
+ request._onsuccess_ = function(event) { \
+ if (!db) { \
+ db = event.target.result; \
+ window.webkit.messageHandlers.testHandler.postMessage('database exists'); \
+ } \
+ }; \
+ request._onerror_ = function(event) { \
+ if (!db) { \
+ window.webkit.messageHandlers.testHandler.postMessage('database error: ' + event.target.error.name + ' - ' + event.target.error.message); \
+ } \
+ }; \
+ </script>";
+
+ NSURL *exampleURL = [NSURL URLWithString:@"http://example.com/"];
+ NSURL *webKitURL = [NSURL URLWithString:@"https://webkit.org/"];
+
+ [webView loadHTMLString:testString baseURL:exampleURL];
+ EXPECT_WK_STREQ("database is created", getNextMessage().body);
+
+ auto dataStore = webView.get().configuration.websiteDataStore;
+ auto indexedDBType = adoptNS([[NSSet alloc] initWithObjects:WKWebsiteDataTypeIndexedDBDatabases, nil]);
+ [dataStore _renameOrigin:exampleURL to:webKitURL forDataOfTypes:indexedDBType.get() completionHandler:^{
+ done = true;
+ }];
+ TestWebKitAPI::Util::run(&done);
+ done = false;
+ EXPECT_WK_STREQ("database is closed", getNextMessage().body);
+
+ [webView loadHTMLString:testString baseURL:webKitURL];
+ EXPECT_WK_STREQ("database exists", getNextMessage().body);
+
+ [webView loadHTMLString:testString baseURL:exampleURL];
+ EXPECT_WK_STREQ("database is created", getNextMessage().body);
+
+ // Clean up defaultDataStore after test.
+ [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
+ done = true;
+ }];
+ TestWebKitAPI::Util::run(&done);
+}
+
TEST(WebKit, WebsiteDataStoreRenameOrigin)
{
TestWKWebView *webView = [[[TestWKWebView alloc] init] autorelease];