Changeset 96007 in webkit

Timestamp:

Sep 26, 2011 3:22:23 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

IndexedDB: Null key path gets stored as empty string key path
​https://bugs.webkit.org/show_bug.cgi?id=68726

Patch by Joshua Bell <​jsbell@chromium.org> on 2011-09-26
Reviewed by Tony Chang.

Store additional flag to indicate if object store key path
is null vs. empty. Added additional runtime tests for integrity
of object store metadata.

• storage/IDBLevelDBBackingStore.cpp:

(WebCore::checkObjectStoreAndMetaDataType):
(WebCore::IDBLevelDBBackingStore::getObjectStores):
(WebCore::IDBLevelDBBackingStore::createObjectStore):

• storage/IDBLevelDBCoding.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• storage/IDBLevelDBBackingStore.cpp (modified) (6 diffs)
• storage/IDBLevelDBCoding.cpp (modified) (2 diffs)
• storage/IDBLevelDBCoding.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-26  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Null key path gets stored as empty string key path
+        https://bugs.webkit.org/show_bug.cgi?id=68726
+
+        Reviewed by Tony Chang.
+
+        Store additional flag to indicate if object store key path
+        is null vs. empty. Added additional runtime tests for integrity
+        of object store metadata.
+
+        * storage/IDBLevelDBBackingStore.cpp:
+        (WebCore::checkObjectStoreAndMetaDataType):
+        (WebCore::IDBLevelDBBackingStore::getObjectStores):
+        (WebCore::IDBLevelDBBackingStore::createObjectStore):
+        * storage/IDBLevelDBCoding.cpp:
+
 2011-09-26  John Bauman  <jbauman@chromium.org>
 

trunk/Source/WebCore/storage/IDBLevelDBBackingStore.cpp

@@ -213 +213 @@
 }
 
+static bool checkObjectStoreAndMetaDataType(const LevelDBIterator* it, const Vector<char>& stopKey, int64_t objectStoreId, int64_t metaDataType)
+{
+    if (!it->isValid() || compareKeys(it->key(), stopKey) >= 0)
+        return false;
+
+    ObjectStoreMetaDataKey metaDataKey;
+    const char* p = ObjectStoreMetaDataKey::decode(it->key().begin(), it->key().end(), &metaDataKey);
+    ASSERT_UNUSED(p, p);
+    if (metaDataKey.objectStoreId() != objectStoreId)
+        return false;
+    if (metaDataKey.metaDataType() != metaDataType)
+        return false;
+    return true;
+}
+
 void IDBLevelDBBackingStore::getObjectStores(int64_t databaseId, Vector<int64_t>& foundIds, Vector<String>& foundNames, Vector<String>& foundKeyPaths, Vector<bool>& foundAutoIncrementFlags)
 {
@@ -219 +234 @@
 
     OwnPtr<LevelDBIterator> it = m_db->createIterator();
-    for (it->seek(startKey); it->isValid() && compareKeys(it->key(), stopKey) < 0; it->next()) {
+    it->seek(startKey);
+    while (it->isValid() && compareKeys(it->key(), stopKey) < 0) {
         const char *p = it->key().begin();
         const char *limit = it->key().end();
@@ -226 +242 @@
         p = ObjectStoreMetaDataKey::decode(p, limit, &metaDataKey);
         ASSERT(p);
-
-        int64_t objectStoreId = metaDataKey.objectStoreId();
-
-        String objectStoreName = decodeString(it->value().begin(), it->value().end());
-
-        it->next();
-        if (!it->isValid()) {
+        if (metaDataKey.metaDataType()) {
             LOG_ERROR("Internal Indexed DB error.");
             return;
         }
-        String keyPath = decodeString(it->value().begin(), it->value().end());
+
+        int64_t objectStoreId = metaDataKey.objectStoreId();
+        String objectStoreName = decodeString(it->value().begin(), it->value().end());
 
         it->next();
-        if (!it->isValid()) {
+        if (!checkObjectStoreAndMetaDataType(it.get(), stopKey, objectStoreId, 1)) {
             LOG_ERROR("Internal Indexed DB error.");
             return;
         }
-        bool autoIncrement = *it->value().begin();
-
-        it->next(); // Is evicatble.
-        if (!it->isValid()) {
+        String keyPath = decodeString(it->value().begin(), it->value().end());
+        bool hasKeyPath = true;
+
+        it->next();
+        if (!checkObjectStoreAndMetaDataType(it.get(), stopKey, objectStoreId, 2)) {
             LOG_ERROR("Internal Indexed DB error.");
             return;
         }
-
-        it->next(); // Last version.
-        if (!it->isValid()) {
+        // FIXME: Add encode/decode functions for bools
+        bool autoIncrement = *it->value().begin();
+
+        it->next(); // Is evicatble.
+        if (!checkObjectStoreAndMetaDataType(it.get(), stopKey, objectStoreId, 3)) {
             LOG_ERROR("Internal Indexed DB error.");
             return;
         }
 
-        it->next(); // Maxium index id allocated.
-        if (!it->isValid()) {
+        it->next(); // Last version.
+        if (!checkObjectStoreAndMetaDataType(it.get(), stopKey, objectStoreId, 4)) {
             LOG_ERROR("Internal Indexed DB error.");
             return;
         }
 
+        it->next(); // Maxium index id allocated.
+        if (!checkObjectStoreAndMetaDataType(it.get(), stopKey, objectStoreId, 5)) {
+            LOG_ERROR("Internal Indexed DB error.");
+            return;
+        }
+
+        it->next(); // [optional] has key path (is not null)
+        if (checkObjectStoreAndMetaDataType(it.get(), stopKey, objectStoreId, 6)) {
+            // FIXME: Add encode/decode functions for bools
+            hasKeyPath = *it->value().begin();
+            if (!hasKeyPath && !keyPath.isEmpty()) {
+                LOG_ERROR("Internal Indexed DB error.");
+                return;
+            }
+            it->next();
+        }
+
         foundIds.append(objectStoreId);
         foundNames.append(objectStoreName);
-        foundKeyPaths.append(keyPath);
+        foundKeyPaths.append(hasKeyPath ? keyPath : String());
         foundAutoIncrementFlags.append(autoIncrement);
     }
@@ -299 +331 @@
     const Vector<char> lastVersionKey = ObjectStoreMetaDataKey::encode(databaseId, objectStoreId, 4);
     const Vector<char> maxIndexIdKey = ObjectStoreMetaDataKey::encode(databaseId, objectStoreId, 5);
+    const Vector<char> hasKeyPathKey  = ObjectStoreMetaDataKey::encode(databaseId, objectStoreId, 6);
     const Vector<char> namesKey = ObjectStoreNamesKey::encode(databaseId, name);
 
@@ -332 +365 @@
 
     ok = putInt(m_currentTransaction.get(), maxIndexIdKey, kMinimumIndexId);
+    if (!ok) {
+        LOG_ERROR("Internal Indexed DB error.");
+        return false;
+    }
+
+    ok = putInt(m_currentTransaction.get(), hasKeyPathKey, !keyPath.isNull());
     if (!ok) {
         LOG_ERROR("Internal Indexed DB error.");
@@ -366 +405 @@
     getString(m_currentTransaction.get(), ObjectStoreMetaDataKey::encode(databaseId, objectStoreId, 0), objectStoreName);
 
-    if (!deleteRange(m_currentTransaction.get(), ObjectStoreMetaDataKey::encode(databaseId, objectStoreId, 0), ObjectStoreMetaDataKey::encode(databaseId, objectStoreId, 6)))
+    if (!deleteRange(m_currentTransaction.get(), ObjectStoreMetaDataKey::encode(databaseId, objectStoreId, 0), ObjectStoreMetaDataKey::encodeMaxKey(databaseId, objectStoreId)))
         return; // FIXME: Report error.
 

trunk/Source/WebCore/storage/IDBLevelDBCoding.cpp

@@ -72 +72 @@
 //     <database id, 0, 0, 50, object store id, 4> => last "version" number [ObjectStoreMetaDataKey]
 //     <database id, 0, 0, 50, object store id, 5> => maximum index id ever allocated [ObjectStoreMetaDataKey]
+//     <database id, 0, 0, 50, object store id, 6> => has key path (vs. null) [ObjectStoreMetaDataKey]
 //
 //
@@ -878 +879 @@
 }
 
+Vector<char> ObjectStoreMetaDataKey::encodeMaxKey(int64_t databaseId, int64_t objectStoreId)
+{
+    return encode(databaseId, objectStoreId, INT64_MAX);
+}
+
 int64_t ObjectStoreMetaDataKey::objectStoreId() const
 {

trunk/Source/WebCore/storage/IDBLevelDBCoding.h

@@ -145 +145 @@
     static Vector<char> encode(int64_t databaseId, int64_t objectStoreId, int64_t metaDataType);
     static Vector<char> encodeMaxKey(int64_t databaseId);
+    static Vector<char> encodeMaxKey(int64_t databaseId, int64_t objectStoreId);
     int64_t objectStoreId() const;
     int64_t metaDataType() const;