Changeset 248366 in webkit

Timestamp:

Aug 7, 2019, 9:08:58 AM (7 years ago)

Author:

youenn@apple.com

Message:

ASSERT that a sessionID is valid when encoding it
​https://bugs.webkit.org/show_bug.cgi?id=199302

Reviewed by Darin Adler.

Source/WebCore:

For IDBValue, instead of encoding an invalid session ID, encode a boolean that tells there is no sessionID.
For IDBRequestData, keep track of whether there is an IDBDatabaseIdentifier
and encode/decode accordingly to not encode an invalid sessionID.
No observable change of behavior.

• Modules/indexeddb/IDBValue.h:

(WebCore::IDBValue::sessionID const):
(WebCore::IDBValue::encode const):
(WebCore::IDBValue::decode):

• Modules/indexeddb/shared/IDBRequestData.cpp:

(WebCore::IDBRequestData::isolatedCopy):

• Modules/indexeddb/shared/IDBRequestData.h:

(WebCore::IDBRequestData::databaseIdentifier const):
(WebCore::IDBRequestData::decode):

Source/WebCore/PAL:

ASSERT that a sessionID is valid at encoding/decoding time.

• pal/SessionID.h:

(PAL::SessionID::encode const):
(PAL::SessionID::decode):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBValue.cpp (modified) (4 diffs)
• Modules/indexeddb/IDBValue.h (modified) (2 diffs)
• Modules/indexeddb/shared/IDBRequestData.cpp (modified) (1 diff)
• Modules/indexeddb/shared/IDBRequestData.h (modified) (3 diffs)
• PAL/ChangeLog (modified) (1 diff)
• PAL/pal/SessionID.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-07  Youenn Fablet  <youenn@apple.com>
+
+        ASSERT that a sessionID is valid when encoding it
+        https://bugs.webkit.org/show_bug.cgi?id=199302
+
+        Reviewed by Darin Adler.
+
+        For IDBValue, instead of encoding an invalid session ID, encode a boolean that tells there is no sessionID.
+        For IDBRequestData, keep track of whether there is an IDBDatabaseIdentifier
+        and encode/decode accordingly to not encode an invalid sessionID.
+        No observable change of behavior.
+
+        * Modules/indexeddb/IDBValue.h:
+        (WebCore::IDBValue::sessionID const):
+        (WebCore::IDBValue::encode const):
+        (WebCore::IDBValue::decode):
+        * Modules/indexeddb/shared/IDBRequestData.cpp:
+        (WebCore::IDBRequestData::isolatedCopy):
+        * Modules/indexeddb/shared/IDBRequestData.h:
+        (WebCore::IDBRequestData::databaseIdentifier const):
+        (WebCore::IDBRequestData::decode):
+
 2019-08-07  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -41 +41 @@
     : m_data(ThreadSafeDataBuffer::copyVector(scriptValue.data()))
     , m_blobURLs(scriptValue.blobURLsIsolatedCopy())
-    , m_sessionID(scriptValue.sessionID())
 {
+    if (scriptValue.sessionID().isValid())
+        m_sessionID = scriptValue.sessionID();
 }
 
@@ -53 +54 @@
     : m_data(ThreadSafeDataBuffer::copyVector(scriptValue.data()))
     , m_blobURLs(blobURLs)
-    , m_sessionID(sessionID)
     , m_blobFilePaths(blobFilePaths)
 {
     ASSERT(m_data.data());
+    if (sessionID.isValid())
+        m_sessionID = sessionID;
 }
 
@@ -62 +64 @@
     : m_data(value)
     , m_blobURLs(WTFMove(blobURLs))
-    , m_sessionID(sessionID)
     , m_blobFilePaths(WTFMove(blobFilePaths))
 {
+    if (sessionID.isValid())
+        m_sessionID = sessionID;
 }
 
@@ -70 +73 @@
     : m_data(value)
     , m_blobURLs(blobURLs)
-    , m_sessionID(sessionID)
     , m_blobFilePaths(blobFilePaths)
 {
+    if (sessionID.isValid())
+        m_sessionID = sessionID;
 }
 

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

@@ -51 +51 @@
     const ThreadSafeDataBuffer& data() const { return m_data; }
     const Vector<String>& blobURLs() const { return m_blobURLs; }
-    const PAL::SessionID& sessionID() const { return m_sessionID; }
+    PAL::SessionID sessionID() const;
     const Vector<String>& blobFilePaths() const { return m_blobFilePaths; }
 
@@ -60 +60 @@
     ThreadSafeDataBuffer m_data;
     Vector<String> m_blobURLs;
-    PAL::SessionID m_sessionID;
+    Optional<PAL::SessionID> m_sessionID;
     Vector<String> m_blobFilePaths;
 };
 
+inline PAL::SessionID IDBValue::sessionID() const
+{
+    // FIXME: We should assert m_sessionID is valid or remove m_sessionID.
+    if (!m_sessionID)
+        return { };
+    return *m_sessionID;
+}
 
 template<class Encoder>

trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp

@@ -99 +99 @@
     destination.m_requestType = source.m_requestType;
 
-    destination.m_databaseIdentifier = source.m_databaseIdentifier.isolatedCopy();
+    if (source.m_databaseIdentifier)
+        destination.m_databaseIdentifier = source.m_databaseIdentifier->isolatedCopy();
 
     if (source.m_requestIdentifier)

trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h

@@ -66 +66 @@
     IDBResourceIdentifier cursorIdentifier() const;
 
-    const IDBDatabaseIdentifier& databaseIdentifier() const { return m_databaseIdentifier; }
+    const IDBDatabaseIdentifier& databaseIdentifier() const;
     uint64_t requestedVersion() const;
 
@@ -90 +90 @@
     IndexedDB::IndexRecordType m_indexRecordType;
 
-    IDBDatabaseIdentifier m_databaseIdentifier;
+    mutable Optional<IDBDatabaseIdentifier> m_databaseIdentifier;
     uint64_t m_requestedVersion { 0 };
 
     IndexedDB::RequestType m_requestType { IndexedDB::RequestType::Other };
 };
+
+inline const IDBDatabaseIdentifier& IDBRequestData::databaseIdentifier() const
+{
+    ASSERT(m_databaseIdentifier);
+    if (!m_databaseIdentifier)
+        m_databaseIdentifier = IDBDatabaseIdentifier { };
+    return *m_databaseIdentifier;
+}
 
 template<class Encoder>
@@ -129 +137 @@
         return false;
 
-    Optional<IDBDatabaseIdentifier> databaseIdentifier;
+    Optional<Optional<IDBDatabaseIdentifier>> databaseIdentifier;
     decoder >> databaseIdentifier;
     if (!databaseIdentifier)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2019-08-07  Youenn Fablet  <youenn@apple.com>
+
+        ASSERT that a sessionID is valid when encoding it
+        https://bugs.webkit.org/show_bug.cgi?id=199302
+
+        Reviewed by Darin Adler.
+
+        ASSERT that a sessionID is valid at encoding/decoding time.
+
+        * pal/SessionID.h:
+        (PAL::SessionID::encode const):
+        (PAL::SessionID::decode):
+
 2019-08-06  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/PAL/pal/SessionID.h

@@ -81 +81 @@
 void SessionID::encode(Encoder& encoder) const
 {
-    // FIXME: Eliminate places that encode invalid SessionIDs, then ASSERT here that the sessionID is valid.
+    ASSERT(isValid());
     encoder << m_sessionID;
 }
@@ -105 +105 @@
         return WTF::nullopt;
 
-    // FIXME: Eliminate places that encode invalid SessionIDs, then fail to decode an invalid sessionID.
+    // FIXME: We should fail to decode an invalid sessionID.
+    ASSERT(SessionID { *sessionID }.isValid());
     return SessionID { *sessionID };
 }