Changeset 136958 in webkit

Timestamp:

Dec 7, 2012, 9:52:36 AM (12 years ago)

Author:

jsbell@chromium.org

Message:

IndexedDB: Check SSV version when opening database
​https://bugs.webkit.org/show_bug.cgi?id=102243

Reviewed by Tony Chang.

Ensure that the data format (SerializedScriptValue) isn't "from the future" when opening
a backing store. Treat an unknown version the same as an unknown schema version.

Chromium-side test at ​https://codereview.chromium.org/11470013/ (same as other schema version tests)

• Modules/indexeddb/IDBBackingStore.cpp:

(WebCore):
(WebCore::isSchemaKnown): Check data version as well.
(WebCore::setUpMetadata): Ensure data version is recorded; bump schema version.

• Modules/indexeddb/IDBLevelDBCoding.cpp: Encoding for "DataVersion" global metadata entry.

(IDBLevelDBCoding):
(WebCore::IDBLevelDBCoding::compare):
(WebCore::IDBLevelDBCoding::DataVersionKey::encode):

• Modules/indexeddb/IDBLevelDBCoding.h:

(DataVersionKey):
(IDBLevelDBCoding):

• bindings/js/SerializedScriptValue.cpp:

(SerializedScriptValue::wireFormatVersion): New method (JSC side).

• bindings/js/SerializedScriptValue.h:
• bindings/v8/SerializedScriptValue.cpp:

(WebCore::SerializedScriptValue::wireFormatVersion): New method (V8 side).
(WebCore):

• bindings/v8/SerializedScriptValue.h:

(SerializedScriptValue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBBackingStore.cpp (modified) (2 diffs)
• Modules/indexeddb/IDBLevelDBCoding.cpp (modified) (3 diffs)
• Modules/indexeddb/IDBLevelDBCoding.h (modified) (1 diff)
• bindings/js/SerializedScriptValue.cpp (modified) (1 diff)
• bindings/js/SerializedScriptValue.h (modified) (1 diff)
• bindings/v8/SerializedScriptValue.cpp (modified) (1 diff)
• bindings/v8/SerializedScriptValue.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-07  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Check SSV version when opening database
+        https://bugs.webkit.org/show_bug.cgi?id=102243
+
+        Reviewed by Tony Chang.
+
+        Ensure that the data format (SerializedScriptValue) isn't "from the future" when opening
+        a backing store. Treat an unknown version the same as an unknown schema version.
+
+        Chromium-side test at https://codereview.chromium.org/11470013/ (same as other schema version tests)
+
+        * Modules/indexeddb/IDBBackingStore.cpp:
+        (WebCore):
+        (WebCore::isSchemaKnown): Check data version as well.
+        (WebCore::setUpMetadata): Ensure data version is recorded; bump schema version.
+        * Modules/indexeddb/IDBLevelDBCoding.cpp: Encoding for "DataVersion" global metadata entry.
+        (IDBLevelDBCoding):
+        (WebCore::IDBLevelDBCoding::compare):
+        (WebCore::IDBLevelDBCoding::DataVersionKey::encode):
+        * Modules/indexeddb/IDBLevelDBCoding.h:
+        (DataVersionKey):
+        (IDBLevelDBCoding):
+        * bindings/js/SerializedScriptValue.cpp:
+        (SerializedScriptValue::wireFormatVersion): New method (JSC side).
+        * bindings/js/SerializedScriptValue.h:
+        * bindings/v8/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValue::wireFormatVersion): New method (V8 side).
+        (WebCore):
+        * bindings/v8/SerializedScriptValue.h:
+        (SerializedScriptValue):
+
 2012-12-07  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp

@@ -182 +182 @@
 };
 
-const int64_t latestSchemaVersion = 1;
+// 0 - Initial version.
+// 1 - Adds UserIntVersion to DatabaseMetaData.
+// 2 - Adds DataVersion to to global metadata.
+const int64_t latestKnownSchemaVersion = 2;
 static bool isSchemaKnown(LevelDBDatabase* db)
 {
-    int64_t schemaVersion = 0;
-    const Vector<char> metaDataKey = SchemaVersionKey::encode();
-    if (!getInt(db, metaDataKey, schemaVersion))
+    int64_t dbSchemaVersion = 0;
+    if (!getInt(db, SchemaVersionKey::encode(), dbSchemaVersion))
         return true;
-    return schemaVersion <= latestSchemaVersion;
+    if (dbSchemaVersion > latestKnownSchemaVersion)
+        return false;
+
+    const uint32_t latestKnownDataVersion = SerializedScriptValue::wireFormatVersion();
+    int64_t dbDataVersion = 0;
+    if (!getInt(db, DataVersionKey::encode(), dbDataVersion))
+        return true;
+
+    if (dbDataVersion > latestKnownDataVersion)
+        return false;
+
+    return true;
 }
 
 static bool setUpMetadata(LevelDBDatabase* db, const String& origin)
 {
-    const Vector<char> metaDataKey = SchemaVersionKey::encode();
+    const uint32_t latestKnownDataVersion = SerializedScriptValue::wireFormatVersion();
+    const Vector<char> schemaVersionKey = SchemaVersionKey::encode();
+    const Vector<char> dataVersionKey = DataVersionKey::encode();
+
     RefPtr<LevelDBTransaction> transaction = LevelDBTransaction::create(db);
 
-    int64_t schemaVersion = 0;
-    if (!getInt(transaction.get(), metaDataKey, schemaVersion)) {
-        schemaVersion = latestSchemaVersion;
-        putInt(transaction.get(), metaDataKey, latestSchemaVersion);
+    int64_t dbSchemaVersion = 0;
+    int64_t dbDataVersion = 0;
+    if (!getInt(transaction.get(), schemaVersionKey, dbSchemaVersion)) {
+        // Initialize new backing store.
+        dbSchemaVersion = latestKnownSchemaVersion;
+        putInt(transaction.get(), schemaVersionKey, dbSchemaVersion);
+        dbDataVersion = latestKnownDataVersion;
+        putInt(transaction.get(), dataVersionKey, dbDataVersion);
     } else {
-        ASSERT(schemaVersion <= latestSchemaVersion);
-        if (!schemaVersion) {
-            schemaVersion = latestSchemaVersion;
-            putInt(transaction.get(), metaDataKey, schemaVersion);
+        // Upgrade old backing store.
+        ASSERT(dbSchemaVersion <= latestKnownSchemaVersion);
+        if (dbSchemaVersion < 1) {
+            dbSchemaVersion = 1;
+            putInt(transaction.get(), schemaVersionKey, dbSchemaVersion);
             const Vector<char> startKey = DatabaseNameKey::encodeMinKeyForOrigin(origin);
             const Vector<char> stopKey = DatabaseNameKey::encodeStopKeyForOrigin(origin);
@@ -219 +240 @@
             }
         }
-    }
-
-    ASSERT(schemaVersion == latestSchemaVersion);
+        if (dbSchemaVersion < 2) {
+            dbSchemaVersion = 2;
+            putInt(transaction.get(), schemaVersionKey, dbSchemaVersion);
+            dbDataVersion = SerializedScriptValue::wireFormatVersion();
+            putInt(transaction.get(), dataVersionKey, dbDataVersion);
+        }
+    }
+
+    // All new values will be written using this serialization version.
+    if (!getInt(transaction.get(), dataVersionKey, dbDataVersion)) {
+        InternalError(IDBLevelDBBackingStoreReadError);
+        return false;
+    }
+    if (dbDataVersion < latestKnownDataVersion) {
+        dbDataVersion = latestKnownDataVersion;
+        putInt(transaction.get(), dataVersionKey, dbDataVersion);
+    }
+
+    ASSERT(dbSchemaVersion == latestKnownSchemaVersion);
+    ASSERT(dbDataVersion == latestKnownDataVersion);
+
     if (!transaction->commit()) {
         InternalError(IDBLevelDBBackingStoreWriteError);

trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp

@@ -48 +48 @@
 // Global meta-data have keys with prefix (0,0,0), followed by a type byte:
 //
-//     <0, 0, 0, 0>                                           => IndexedDB/LevelDB schema version (0 for now) [SchemaVersionKey]
+//     <0, 0, 0, 0>                                           => IndexedDB/LevelDB schema version [SchemaVersionKey]
 //     <0, 0, 0, 1>                                           => The maximum database id ever allocated [MaxDatabaseIdKey]
+//     <0, 0, 0, 2>                                           => SerializedScriptValue version [DataVersionKey]
 //     <0, 0, 0, 100, database id>                            => Existence implies the database id is in the free list [DatabaseFreeListKey]
 //     <0, 0, 0, 201, utf16 origin name, utf16 database name> => Database id [DatabaseNameKey]
@@ -155 +156 @@
 static const unsigned char SchemaVersionTypeByte = 0;
 static const unsigned char MaxDatabaseIdTypeByte = 1;
-static const unsigned char MaxSimpleGlobalMetaDataTypeByte = 2; // Insert before this and increment.
+static const unsigned char DataVersionTypeByte = 2;
+static const unsigned char MaxSimpleGlobalMetaDataTypeByte = 3; // Insert before this and increment.
 static const unsigned char DatabaseFreeListTypeByte = 100;
 static const unsigned char DatabaseNameTypeByte = 201;
@@ -1048 +1050 @@
 }
 
+Vector<char> DataVersionKey::encode()
+{
+    KeyPrefix prefix(0, 0, 0);
+    Vector<char> ret = prefix.encode();
+    ret.append(encodeByte(DataVersionTypeByte));
+    return ret;
+}
+
 DatabaseFreeListKey::DatabaseFreeListKey()
     : m_databaseId(-1)

trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.h

@@ -112 +112 @@
 };
 
+class DataVersionKey {
+public:
+    static Vector<char> encode();
+};
+
 class DatabaseFreeListKey {
 public:

trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp

@@ -1986 +1986 @@
 }
 
-}
+uint32_t SerializedScriptValue::wireFormatVersion()
+{
+    return CurrentVersion;
+}
+
+}

trunk/Source/WebCore/bindings/js/SerializedScriptValue.h

@@ -84 +84 @@
     static PassRefPtr<SerializedScriptValue> booleanValue(bool value);
 
+    static uint32_t wireFormatVersion();
+
     String toString();
     

trunk/Source/WebCore/bindings/v8/SerializedScriptValue.cpp

@@ -2450 +2450 @@
 }
 
+uint32_t SerializedScriptValue::wireFormatVersion()
+{
+    return WebCore::wireFormatVersion;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/bindings/v8/SerializedScriptValue.h

@@ -66 +66 @@
     static PassRefPtr<SerializedScriptValue> numberValue(double value, v8::Isolate* = 0);
 
+    static uint32_t wireFormatVersion();
+
     PassRefPtr<SerializedScriptValue> release();