Changeset 252817 in webkit

Timestamp:

Nov 22, 2019 4:42:28 PM (4 years ago)

Author:

Kate Cheney

Message:

ITP Database crashes if table schema is not correct
​https://bugs.webkit.org/show_bug.cgi?id=204458
<rdar://problem/57399084>

Reviewed by Brent Fulgham.

ITP database was crashing if the table schema wasn't correct. This
should instead be handled by re-opening a new database with a correct
schema to allow for future schema updates.

• NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:

(WebKit::ResourceLoadStatisticsDatabaseStore::isCorrectTableSchema):
(WebKit::ResourceLoadStatisticsDatabaseStore::openAndDropOldDatabaseIfNecessary):

• NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp (modified) (3 diffs)
• NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-22  Kate Cheney  <katherine_cheney@apple.com>
+
+        ITP Database crashes if table schema is not correct
+        https://bugs.webkit.org/show_bug.cgi?id=204458
+        <rdar://problem/57399084>
+        
+        Reviewed by Brent Fulgham.
+
+        ITP database was crashing if the table schema wasn't correct. This
+        should instead be handled by re-opening a new database with a correct
+        schema to allow for future schema updates.
+
+        * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:
+        (WebKit::ResourceLoadStatisticsDatabaseStore::isCorrectTableSchema):
+        (WebKit::ResourceLoadStatisticsDatabaseStore::openAndDropOldDatabaseIfNecessary):
+        * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
+
 2019-11-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp

@@ -122 +122 @@
 constexpr auto getResourceDataByDomainNameQuery = "SELECT * FROM ObservedDomains WHERE registrableDomain = ?";
 constexpr auto getAllDomainsQuery = "SELECT registrableDomain FROM ObservedDomains"_s;
+
+const char* tables[] = {
+    "ObservedDomains",
+    "TopLevelDomains",
+    "StorageAccessUnderTopFrameDomains",
+    "TopFrameUniqueRedirectsTo",
+    "TopFrameUniqueRedirectsFrom",
+    "TopFrameLinkDecorationsFrom",
+    "TopFrameLoadedThirdPartyScripts",
+    "SubframeUnderTopFrameDomains",
+    "SubresourceUnderTopFrameDomains",
+    "SubresourceUniqueRedirectsTo",
+    "SubresourceUniqueRedirectsFrom"
+};
 
 // CREATE TABLE Queries
@@ -289 +303 @@
 }
 
+static void resetStatement(SQLiteStatement& statement)
+{
+    int resetResult = statement.reset();
+    ASSERT_UNUSED(resetResult, resetResult == SQLITE_OK);
+}
+
+bool ResourceLoadStatisticsDatabaseStore::isCorrectTableSchema()
+{
+    SQLiteStatement statement(m_database, "SELECT 1 from sqlite_master WHERE type='table' and tbl_name=?");
+    if (statement.prepare() != SQLITE_OK) {
+        RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::isCorrectTableSchema failed to prepare, error message: %{public}s", this, m_database.lastErrorMsg());
+        return false;
+    }
+
+    bool hasAllTables = true;
+    for (auto table : tables) {
+        if (statement.bindText(1, table) != SQLITE_OK) {
+            RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::isCorrectTableSchema failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
+            return false;
+        }
+        if (statement.step() != SQLITE_ROW) {
+            RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::isCorrectTableSchema schema is missing table: %s", this, table);
+            hasAllTables = false;
+        }
+        resetStatement(statement);
+    }
+    return hasAllTables;
+}
+
 void ResourceLoadStatisticsDatabaseStore::openAndDropOldDatabaseIfNecessary()
 {
     openITPDatabase();
+
+    if (!isCorrectTableSchema()) {
+        m_database.close();
+        // FIXME: Migrate existing data to new database file instead of deleting it (204482).
+        FileSystem::deleteFile(m_storageDirectoryPath);
+        openITPDatabase();
+        return;
+    }
 
     String currentSchema;
@@ -323 +374 @@
         openITPDatabase();
     }
-}
-
-static void resetStatement(SQLiteStatement& statement)
-{
-    int resetResult = statement.reset();
-    ASSERT_UNUSED(resetResult, resetResult == SQLITE_OK);
 }
 

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h

@@ -137 +137 @@
 private:
     void openITPDatabase();
+    bool isCorrectTableSchema();
     void openAndDropOldDatabaseIfNecessary();
     String getDomainStringFromDomainID(unsigned) const;