char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: room exists panic

next
Timo Kösters 2021-08-14 08:26:45 +02:00
parent 3eabaa2a95
commit 3cf0145bc5
No known key found for this signature in database
GPG Key ID: 356E705610F626D5
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/database/rooms.rs
View File

@ -249,7 +249,10 @@ impl Rooms {
/// Checks if a room exists. /// Checks if a room exists.
pub fn exists(&self, room_id: &RoomId) -> Result<bool> { pub fn exists(&self, room_id: &RoomId) -> Result<bool> {
let prefix = self.get_shortroomid(room_id)?.to_be_bytes().to_vec(); let prefix = match self.get_shortroomid(room_id)? {
Some(b) => b.to_be_bytes().to_vec(),
None => return Ok(false),
};
// Look for PDUs in that room. // Look for PDUs in that room.
Ok(self Ok(self
@ -262,7 +265,7 @@ impl Rooms {
/// Checks if a room exists. /// Checks if a room exists.
pub fn first_pdu_in_room(&self, room_id: &RoomId) -> Result<Option<Arc<PduEvent>>> { pub fn first_pdu_in_room(&self, room_id: &RoomId) -> Result<Option<Arc<PduEvent>>> {
let prefix = self.get_shortroomid(room_id)?.to_be_bytes().to_vec(); let prefix = self.get_shortroomid(room_id)?.expect("room exists").to_be_bytes().to_vec();
// Look for PDUs in that room. // Look for PDUs in that room.
self.pduid_pdu self.pduid_pdu
@ -627,12 +630,12 @@ impl Rooms {
}) })
} }
pub fn get_shortroomid(&self, room_id: &RoomId) -> Result<u64> { pub fn get_shortroomid(&self, room_id: &RoomId) -> Result<Option<u64>> {
let bytes = self self
.roomid_shortroomid .roomid_shortroomid
.get(&room_id.as_bytes())? .get(&room_id.as_bytes())?
.expect("every room has a shortroomid"); .map(|bytes|
utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Invalid shortroomid in db.")) utils::u64_from_bytes(&bytes).map_err(|_| Error::bad_database("Invalid shortroomid in db."))).transpose()
} }
pub fn get_shortstatekey( pub fn get_shortstatekey(
@ -781,7 +784,7 @@ impl Rooms {
} }
pub fn latest_pdu_count(&self, room_id: &RoomId) -> Result<u64> { pub fn latest_pdu_count(&self, room_id: &RoomId) -> Result<u64> {
let prefix = self.get_shortroomid(room_id)?.to_be_bytes().to_vec(); let prefix = self.get_shortroomid(room_id)?.expect("room exists").to_be_bytes().to_vec();
let mut last_possible_key = prefix.clone(); let mut last_possible_key = prefix.clone();
last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes()); last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
@ -1021,7 +1024,7 @@ impl Rooms {
leaves: &[EventId], leaves: &[EventId],
db: &Database, db: &Database,
) -> Result<Vec<u8>> { ) -> Result<Vec<u8>> {
let shortroomid = self.get_shortroomid(&pdu.room_id)?; let shortroomid = self.get_shortroomid(&pdu.room_id)?.expect("room exists");
// Make unsigned fields correct. This is not properly documented in the spec, but state // Make unsigned fields correct. This is not properly documented in the spec, but state
// events need to have previous content in the unsigned field, so clients can easily // events need to have previous content in the unsigned field, so clients can easily
@ -1846,7 +1849,7 @@ impl Rooms {
room_id: &RoomId, room_id: &RoomId,
since: u64, since: u64,
) -> Result<impl Iterator<Item = Result<(Vec<u8>, PduEvent)>> + 'a> { ) -> Result<impl Iterator<Item = Result<(Vec<u8>, PduEvent)>> + 'a> {
let prefix = self.get_shortroomid(room_id)?.to_be_bytes().to_vec(); let prefix = self.get_shortroomid(room_id)?.expect("room exists").to_be_bytes().to_vec();
// Skip the first pdu if it's exactly at since, because we sent that last time // Skip the first pdu if it's exactly at since, because we sent that last time
let mut first_pdu_id = prefix.clone(); let mut first_pdu_id = prefix.clone();
@ -1878,7 +1881,7 @@ impl Rooms {
until: u64, until: u64,
) -> Result<impl Iterator<Item = Result<(Vec<u8>, PduEvent)>> + 'a> { ) -> Result<impl Iterator<Item = Result<(Vec<u8>, PduEvent)>> + 'a> {
// Create the first part of the full pdu id // Create the first part of the full pdu id
let prefix = self.get_shortroomid(room_id)?.to_be_bytes().to_vec(); let prefix = self.get_shortroomid(room_id)?.expect("room exists").to_be_bytes().to_vec();
let mut current = prefix.clone(); let mut current = prefix.clone();
current.extend_from_slice(&(until.saturating_sub(1)).to_be_bytes()); // -1 because we don't want event at `until` current.extend_from_slice(&(until.saturating_sub(1)).to_be_bytes()); // -1 because we don't want event at `until`
@ -1911,7 +1914,7 @@ impl Rooms {
from: u64, from: u64,
) -> Result<impl Iterator<Item = Result<(Vec<u8>, PduEvent)>> + 'a> { ) -> Result<impl Iterator<Item = Result<(Vec<u8>, PduEvent)>> + 'a> {
// Create the first part of the full pdu id // Create the first part of the full pdu id
let prefix = self.get_shortroomid(room_id)?.to_be_bytes().to_vec(); let prefix = self.get_shortroomid(room_id)?.expect("room exists").to_be_bytes().to_vec();
let mut current = prefix.clone(); let mut current = prefix.clone();
current.extend_from_slice(&(from + 1).to_be_bytes()); // +1 so we don't send the base event current.extend_from_slice(&(from + 1).to_be_bytes()); // +1 so we don't send the base event
@ -2462,7 +2465,7 @@ impl Rooms {
room_id: &RoomId, room_id: &RoomId,
search_string: &str, search_string: &str,
) -> Result<(impl Iterator<Item = Vec<u8>> + 'a, Vec<String>)> { ) -> Result<(impl Iterator<Item = Vec<u8>> + 'a, Vec<String>)> {
let prefix = self.get_shortroomid(room_id)?.to_be_bytes().to_vec(); let prefix = self.get_shortroomid(room_id)?.expect("room exists").to_be_bytes().to_vec();
let prefix_clone = prefix.clone(); let prefix_clone = prefix.clone();
let words = search_string let words = search_string