fix(indexeddb): skip encoding event id when constructing bounds

In the implementation of EventCacheStore, there are a number of
places where the upper and lower bounds of an EventId are
constructed. It is important to bypass hashing and encryption
when constructing these bounds, otherwise the values will be
modified and will no longer represent the bounds.

Signed-off-by: Michael Goldenberg <[email protected]>

Author: mgoldenberg

crates/matrix-sdk-indexeddb/src/event_cache_store/serializer/constants.rs

@@ -15,12 +15,8 @@
 use std::sync::LazyLock;
 
 use matrix_sdk_base::linked_chunk::ChunkIdentifier;
-use ruma::OwnedEventId;
 
-use crate::{
-    event_cache_store::types::Position,
-    serializer::{INDEXED_KEY_LOWER_CHARACTER, INDEXED_KEY_UPPER_CHARACTER},
-};
+use crate::event_cache_store::types::Position;
 
 /// A [`ChunkIdentifier`] constructed with `0`.
 ///
@@ -38,24 +34,6 @@ pub static INDEXED_KEY_LOWER_CHUNK_IDENTIFIER: LazyLock<ChunkIdentifier> =
 pub static INDEXED_KEY_UPPER_CHUNK_IDENTIFIER: LazyLock<ChunkIdentifier> =
     LazyLock::new(|| ChunkIdentifier::new(js_sys::Number::MAX_SAFE_INTEGER as u64));
 
-/// An [`OwnedEventId`] constructed with [`INDEXED_KEY_LOWER_CHARACTER`].
-///
-/// This value is useful for constructing a key range over all keys which
-/// contain [`EventId`]s when used in conjunction with
-/// [`INDEXED_KEY_UPPER_EVENT_ID`].
-pub static INDEXED_KEY_LOWER_EVENT_ID: LazyLock<OwnedEventId> = LazyLock::new(|| {
-    OwnedEventId::try_from(format!("${INDEXED_KEY_LOWER_CHARACTER}")).expect("valid event id")
-});
-
-/// An [`OwnedEventId`] constructed with [`INDEXED_KEY_UPPER_CHARACTER`].
-///
-/// This value is useful for constructing a key range over all keys which
-/// contain [`EventId`]s when used in conjunction with
-/// [`INDEXED_KEY_LOWER_EVENT_ID`].
-pub static INDEXED_KEY_UPPER_EVENT_ID: LazyLock<OwnedEventId> = LazyLock::new(|| {
-    OwnedEventId::try_from(format!("${INDEXED_KEY_UPPER_CHARACTER}")).expect("valid event id")
-});
-
 /// The lowest possible index that can be used to reference an [`Event`] inside
 /// a [`Chunk`] - i.e., `0`.
 ///

crates/matrix-sdk-indexeddb/src/event_cache_store/serializer/indexed_types.rs

@@ -37,9 +37,8 @@ use crate::{
     event_cache_store::{
         migrations::current::keys,
         serializer::constants::{
-            INDEXED_KEY_LOWER_CHUNK_IDENTIFIER, INDEXED_KEY_LOWER_EVENT_ID,
-            INDEXED_KEY_LOWER_EVENT_INDEX, INDEXED_KEY_LOWER_EVENT_POSITION,
-            INDEXED_KEY_UPPER_CHUNK_IDENTIFIER, INDEXED_KEY_UPPER_EVENT_ID,
+            INDEXED_KEY_LOWER_CHUNK_IDENTIFIER, INDEXED_KEY_LOWER_EVENT_INDEX,
+            INDEXED_KEY_LOWER_EVENT_POSITION, INDEXED_KEY_UPPER_CHUNK_IDENTIFIER,
             INDEXED_KEY_UPPER_EVENT_INDEX, INDEXED_KEY_UPPER_EVENT_POSITION,
         },
         types::{Chunk, Event, Gap, Lease, Position},
@@ -399,14 +398,18 @@ impl IndexedPrefixKeyBounds<Event, LinkedChunkId<'_>> for IndexedEventIdKey {
         linked_chunk_id: LinkedChunkId<'_>,
         serializer: &SafeEncodeSerializer,
     ) -> Self {
-        Self::encode((linked_chunk_id, &*INDEXED_KEY_LOWER_EVENT_ID), serializer)
+        let linked_chunk_id =
+            serializer.hash_key(keys::LINKED_CHUNK_IDS, linked_chunk_id.storage_key());
+        Self(linked_chunk_id, (*INDEXED_KEY_LOWER_STRING).clone())
     }
 
     fn upper_key_with_prefix(
         linked_chunk_id: LinkedChunkId<'_>,
         serializer: &SafeEncodeSerializer,
     ) -> Self {
-        Self::encode((linked_chunk_id, &*INDEXED_KEY_UPPER_EVENT_ID), serializer)
+        let linked_chunk_id =
+            serializer.hash_key(keys::LINKED_CHUNK_IDS, linked_chunk_id.storage_key());
+        Self(linked_chunk_id, (*INDEXED_KEY_UPPER_STRING).clone())
     }
 }
 
@@ -437,11 +440,13 @@ impl IndexedKey<Event> for IndexedEventRoomKey {
 
 impl IndexedPrefixKeyBounds<Event, &RoomId> for IndexedEventRoomKey {
     fn lower_key_with_prefix(room_id: &RoomId, serializer: &SafeEncodeSerializer) -> Self {
-        Self::encode((room_id, &*INDEXED_KEY_LOWER_EVENT_ID), serializer)
+        let room_id = serializer.encode_key_as_string(keys::ROOMS, room_id.as_str());
+        Self(room_id, (*INDEXED_KEY_LOWER_STRING).clone())
     }
 
     fn upper_key_with_prefix(room_id: &RoomId, serializer: &SafeEncodeSerializer) -> Self {
-        Self::encode((room_id, &*INDEXED_KEY_UPPER_EVENT_ID), serializer)
+        let room_id = serializer.encode_key_as_string(keys::ROOMS, room_id.as_str());
+        Self(room_id, (*INDEXED_KEY_UPPER_STRING).clone())
     }
 }