mirror of https://gitlab.com/famedly/conduit
Fixed more compile time errors
Timo Kösters
2 years ago
committed by
Nyaaori
parent
785ddfc4aa
commit
bd8b616ca0
@ -1,3 +1,7 @@
|
|||||||
mod presence;
|
mod presence;
|
||||||
mod typing;
|
mod typing;
|
||||||
mod read_receipt;
|
mod read_receipt;
|
||||||
|
|
||||||
|
use crate::{service, database::KeyValueDatabase};
|
||||||
|
|
||||||
|
impl service::rooms::edus::Data for KeyValueDatabase {}
|
||||||
|
|||||||
@ -1,16 +1,20 @@
|
|||||||
mod alias;
|
mod alias;
|
||||||
|
mod auth_chain;
|
||||||
mod directory;
|
mod directory;
|
||||||
mod edus;
|
mod edus;
|
||||||
//mod event_handler;
|
|
||||||
mod lazy_load;
|
mod lazy_load;
|
||||||
mod metadata;
|
mod metadata;
|
||||||
mod outlier;
|
mod outlier;
|
||||||
mod pdu_metadata;
|
mod pdu_metadata;
|
||||||
mod search;
|
mod search;
|
||||||
//mod short;
|
mod short;
|
||||||
mod state;
|
mod state;
|
||||||
mod state_accessor;
|
mod state_accessor;
|
||||||
mod state_cache;
|
mod state_cache;
|
||||||
mod state_compressor;
|
mod state_compressor;
|
||||||
mod timeline;
|
mod timeline;
|
||||||
mod user;
|
mod user;
|
||||||
|
|
||||||
|
use crate::{database::KeyValueDatabase, service};
|
||||||
|
|
||||||
|
impl service::rooms::Data for KeyValueDatabase {}
|
||||||
|
|||||||
@ -0,0 +1,4 @@
|
|||||||
|
use crate::{database::KeyValueDatabase, service};
|
||||||
|
|
||||||
|
impl service::rooms::short::Data for KeyValueDatabase {
|
||||||
|
}
|
||||||
@ -1,145 +1,32 @@
|
|||||||
use crate::{utils, Error, Result};
|
use std::collections::HashMap;
|
||||||
use ruma::{
|
|
||||||
api::client::error::ErrorKind,
|
|
||||||
events::{AnyEphemeralRoomEvent, RoomAccountDataEventType},
|
|
||||||
serde::Raw,
|
|
||||||
RoomId, UserId,
|
|
||||||
};
|
|
||||||
use serde::{de::DeserializeOwned, Serialize};
|
|
||||||
use std::{collections::HashMap, sync::Arc};
|
|
||||||
|
|
||||||
impl AccountData {
|
use ruma::{UserId, RoomId, events::{RoomAccountDataEventType, AnyEphemeralRoomEvent}, serde::Raw};
|
||||||
|
use serde::{Serialize, de::DeserializeOwned};
|
||||||
|
use crate::Result;
|
||||||
|
|
||||||
|
pub trait Data {
|
||||||
/// Places one event in the account data of the user and removes the previous entry.
|
/// Places one event in the account data of the user and removes the previous entry.
|
||||||
#[tracing::instrument(skip(self, room_id, user_id, event_type, data))]
|
fn update<T: Serialize>(
|
||||||
pub fn update<T: Serialize>(
|
|
||||||
&self,
|
&self,
|
||||||
room_id: Option<&RoomId>,
|
room_id: Option<&RoomId>,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
event_type: RoomAccountDataEventType,
|
event_type: RoomAccountDataEventType,
|
||||||
data: &T,
|
data: &T,
|
||||||
) -> Result<()> {
|
) -> Result<()>;
|
||||||
let mut prefix = room_id
|
|
||||||
.map(|r| r.to_string())
|
|
||||||
.unwrap_or_default()
|
|
||||||
.as_bytes()
|
|
||||||
.to_vec();
|
|
||||||
prefix.push(0xff);
|
|
||||||
prefix.extend_from_slice(user_id.as_bytes());
|
|
||||||
prefix.push(0xff);
|
|
||||||
|
|
||||||
let mut roomuserdataid = prefix.clone();
|
|
||||||
roomuserdataid.extend_from_slice(&services().globals.next_count()?.to_be_bytes());
|
|
||||||
roomuserdataid.push(0xff);
|
|
||||||
roomuserdataid.extend_from_slice(event_type.to_string().as_bytes());
|
|
||||||
|
|
||||||
let mut key = prefix;
|
|
||||||
key.extend_from_slice(event_type.to_string().as_bytes());
|
|
||||||
|
|
||||||
let json = serde_json::to_value(data).expect("all types here can be serialized"); // TODO: maybe add error handling
|
|
||||||
if json.get("type").is_none() || json.get("content").is_none() {
|
|
||||||
return Err(Error::BadRequest(
|
|
||||||
ErrorKind::InvalidParam,
|
|
||||||
"Account data doesn't have all required fields.",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
self.roomuserdataid_accountdata.insert(
|
|
||||||
&roomuserdataid,
|
|
||||||
&serde_json::to_vec(&json).expect("to_vec always works on json values"),
|
|
||||||
)?;
|
|
||||||
|
|
||||||
let prev = self.roomusertype_roomuserdataid.get(&key)?;
|
|
||||||
|
|
||||||
self.roomusertype_roomuserdataid
|
|
||||||
.insert(&key, &roomuserdataid)?;
|
|
||||||
|
|
||||||
// Remove old entry
|
|
||||||
if let Some(prev) = prev {
|
|
||||||
self.roomuserdataid_accountdata.remove(&prev)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Searches the account data for a specific kind.
|
/// Searches the account data for a specific kind.
|
||||||
#[tracing::instrument(skip(self, room_id, user_id, kind))]
|
fn get<T: DeserializeOwned>(
|
||||||
pub fn get<T: DeserializeOwned>(
|
|
||||||
&self,
|
&self,
|
||||||
room_id: Option<&RoomId>,
|
room_id: Option<&RoomId>,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
kind: RoomAccountDataEventType,
|
kind: RoomAccountDataEventType,
|
||||||
) -> Result<Option<T>> {
|
) -> Result<Option<T>>;
|
||||||
let mut key = room_id
|
|
||||||
.map(|r| r.to_string())
|
|
||||||
.unwrap_or_default()
|
|
||||||
.as_bytes()
|
|
||||||
.to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(user_id.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(kind.to_string().as_bytes());
|
|
||||||
|
|
||||||
self.roomusertype_roomuserdataid
|
|
||||||
.get(&key)?
|
|
||||||
.and_then(|roomuserdataid| {
|
|
||||||
self.roomuserdataid_accountdata
|
|
||||||
.get(&roomuserdataid)
|
|
||||||
.transpose()
|
|
||||||
})
|
|
||||||
.transpose()?
|
|
||||||
.map(|data| {
|
|
||||||
serde_json::from_slice(&data)
|
|
||||||
.map_err(|_| Error::bad_database("could not deserialize"))
|
|
||||||
})
|
|
||||||
.transpose()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns all changes to the account data that happened after `since`.
|
/// Returns all changes to the account data that happened after `since`.
|
||||||
#[tracing::instrument(skip(self, room_id, user_id, since))]
|
fn changes_since(
|
||||||
pub fn changes_since(
|
|
||||||
&self,
|
&self,
|
||||||
room_id: Option<&RoomId>,
|
room_id: Option<&RoomId>,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
since: u64,
|
since: u64,
|
||||||
) -> Result<HashMap<RoomAccountDataEventType, Raw<AnyEphemeralRoomEvent>>> {
|
) -> Result<HashMap<RoomAccountDataEventType, Raw<AnyEphemeralRoomEvent>>>;
|
||||||
let mut userdata = HashMap::new();
|
|
||||||
|
|
||||||
let mut prefix = room_id
|
|
||||||
.map(|r| r.to_string())
|
|
||||||
.unwrap_or_default()
|
|
||||||
.as_bytes()
|
|
||||||
.to_vec();
|
|
||||||
prefix.push(0xff);
|
|
||||||
prefix.extend_from_slice(user_id.as_bytes());
|
|
||||||
prefix.push(0xff);
|
|
||||||
|
|
||||||
// Skip the data that's exactly at since, because we sent that last time
|
|
||||||
let mut first_possible = prefix.clone();
|
|
||||||
first_possible.extend_from_slice(&(since + 1).to_be_bytes());
|
|
||||||
|
|
||||||
for r in self
|
|
||||||
.roomuserdataid_accountdata
|
|
||||||
.iter_from(&first_possible, false)
|
|
||||||
.take_while(move |(k, _)| k.starts_with(&prefix))
|
|
||||||
.map(|(k, v)| {
|
|
||||||
Ok::<_, Error>((
|
|
||||||
RoomAccountDataEventType::try_from(
|
|
||||||
utils::string_from_bytes(k.rsplit(|&b| b == 0xff).next().ok_or_else(
|
|
||||||
|| Error::bad_database("RoomUserData ID in db is invalid."),
|
|
||||||
)?)
|
|
||||||
.map_err(|_| Error::bad_database("RoomUserData ID in db is invalid."))?,
|
|
||||||
)
|
|
||||||
.map_err(|_| Error::bad_database("RoomUserData ID in db is invalid."))?,
|
|
||||||
serde_json::from_slice::<Raw<AnyEphemeralRoomEvent>>(&v).map_err(|_| {
|
|
||||||
Error::bad_database("Database contains invalid account data.")
|
|
||||||
})?,
|
|
||||||
))
|
|
||||||
})
|
|
||||||
{
|
|
||||||
let (kind, data) = r?;
|
|
||||||
userdata.insert(kind, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(userdata)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,8 @@
|
|||||||
|
use ruma::signatures::Ed25519KeyPair;
|
||||||
|
|
||||||
|
use crate::Result;
|
||||||
|
|
||||||
|
pub trait Data {
|
||||||
|
fn load_keypair(&self) -> Result<Ed25519KeyPair>;
|
||||||
|
fn remove_keypair(&self) -> Result<()>;
|
||||||
|
}
|
||||||
@ -1,371 +1,85 @@
|
|||||||
use crate::{utils, Error, Result, services};
|
use std::collections::BTreeMap;
|
||||||
use ruma::{
|
|
||||||
api::client::{
|
|
||||||
backup::{BackupAlgorithm, KeyBackupData, RoomKeyBackup},
|
|
||||||
error::ErrorKind,
|
|
||||||
},
|
|
||||||
serde::Raw,
|
|
||||||
RoomId, UserId,
|
|
||||||
};
|
|
||||||
use std::{collections::BTreeMap, sync::Arc};
|
|
||||||
|
|
||||||
impl KeyBackups {
|
use ruma::{api::client::backup::{BackupAlgorithm, RoomKeyBackup, KeyBackupData}, serde::Raw, UserId, RoomId};
|
||||||
pub fn create_backup(
|
use crate::Result;
|
||||||
|
|
||||||
|
pub trait Data {
|
||||||
|
fn create_backup(
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
backup_metadata: &Raw<BackupAlgorithm>,
|
backup_metadata: &Raw<BackupAlgorithm>,
|
||||||
) -> Result<String> {
|
) -> Result<String>;
|
||||||
let version = services().globals.next_count()?.to_string();
|
|
||||||
|
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
|
|
||||||
self.backupid_algorithm.insert(
|
|
||||||
&key,
|
|
||||||
&serde_json::to_vec(backup_metadata).expect("BackupAlgorithm::to_vec always works"),
|
|
||||||
)?;
|
|
||||||
self.backupid_etag
|
|
||||||
.insert(&key, &services().globals.next_count()?.to_be_bytes())?;
|
|
||||||
Ok(version)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn delete_backup(&self, user_id: &UserId, version: &str) -> Result<()> {
|
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
|
|
||||||
self.backupid_algorithm.remove(&key)?;
|
|
||||||
self.backupid_etag.remove(&key)?;
|
|
||||||
|
|
||||||
key.push(0xff);
|
fn delete_backup(&self, user_id: &UserId, version: &str) -> Result<()>;
|
||||||
|
|
||||||
for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
|
fn update_backup(
|
||||||
self.backupkeyid_backup.remove(&outdated_key)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn update_backup(
|
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
version: &str,
|
version: &str,
|
||||||
backup_metadata: &Raw<BackupAlgorithm>,
|
backup_metadata: &Raw<BackupAlgorithm>,
|
||||||
) -> Result<String> {
|
) -> Result<String>;
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
|
|
||||||
if self.backupid_algorithm.get(&key)?.is_none() {
|
|
||||||
return Err(Error::BadRequest(
|
|
||||||
ErrorKind::NotFound,
|
|
||||||
"Tried to update nonexistent backup.",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
self.backupid_algorithm
|
|
||||||
.insert(&key, backup_metadata.json().get().as_bytes())?;
|
|
||||||
self.backupid_etag
|
|
||||||
.insert(&key, &services().globals.next_count()?.to_be_bytes())?;
|
|
||||||
Ok(version.to_owned())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_latest_backup_version(&self, user_id: &UserId) -> Result<Option<String>> {
|
|
||||||
let mut prefix = user_id.as_bytes().to_vec();
|
|
||||||
prefix.push(0xff);
|
|
||||||
let mut last_possible_key = prefix.clone();
|
|
||||||
last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
|
|
||||||
|
|
||||||
self.backupid_algorithm
|
fn get_latest_backup_version(&self, user_id: &UserId) -> Result<Option<String>>;
|
||||||
.iter_from(&last_possible_key, true)
|
|
||||||
.take_while(move |(k, _)| k.starts_with(&prefix))
|
|
||||||
.next()
|
|
||||||
.map(|(key, _)| {
|
|
||||||
utils::string_from_bytes(
|
|
||||||
key.rsplit(|&b| b == 0xff)
|
|
||||||
.next()
|
|
||||||
.expect("rsplit always returns an element"),
|
|
||||||
)
|
|
||||||
.map_err(|_| Error::bad_database("backupid_algorithm key is invalid."))
|
|
||||||
})
|
|
||||||
.transpose()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_latest_backup(
|
fn get_latest_backup(
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
) -> Result<Option<(String, Raw<BackupAlgorithm>)>> {
|
) -> Result<Option<(String, Raw<BackupAlgorithm>)>>;
|
||||||
let mut prefix = user_id.as_bytes().to_vec();
|
|
||||||
prefix.push(0xff);
|
|
||||||
let mut last_possible_key = prefix.clone();
|
|
||||||
last_possible_key.extend_from_slice(&u64::MAX.to_be_bytes());
|
|
||||||
|
|
||||||
self.backupid_algorithm
|
fn get_backup(
|
||||||
.iter_from(&last_possible_key, true)
|
|
||||||
.take_while(move |(k, _)| k.starts_with(&prefix))
|
|
||||||
.next()
|
|
||||||
.map(|(key, value)| {
|
|
||||||
let version = utils::string_from_bytes(
|
|
||||||
key.rsplit(|&b| b == 0xff)
|
|
||||||
.next()
|
|
||||||
.expect("rsplit always returns an element"),
|
|
||||||
)
|
|
||||||
.map_err(|_| Error::bad_database("backupid_algorithm key is invalid."))?;
|
|
||||||
|
|
||||||
Ok((
|
|
||||||
version,
|
|
||||||
serde_json::from_slice(&value).map_err(|_| {
|
|
||||||
Error::bad_database("Algorithm in backupid_algorithm is invalid.")
|
|
||||||
})?,
|
|
||||||
))
|
|
||||||
})
|
|
||||||
.transpose()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_backup(
|
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
version: &str,
|
version: &str,
|
||||||
) -> Result<Option<Raw<BackupAlgorithm>>> {
|
) -> Result<Option<Raw<BackupAlgorithm>>>;
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
|
|
||||||
self.backupid_algorithm
|
|
||||||
.get(&key)?
|
|
||||||
.map_or(Ok(None), |bytes| {
|
|
||||||
serde_json::from_slice(&bytes)
|
|
||||||
.map_err(|_| Error::bad_database("Algorithm in backupid_algorithm is invalid."))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn add_key(
|
fn add_key(
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
version: &str,
|
version: &str,
|
||||||
room_id: &RoomId,
|
room_id: &RoomId,
|
||||||
session_id: &str,
|
session_id: &str,
|
||||||
key_data: &Raw<KeyBackupData>,
|
key_data: &Raw<KeyBackupData>,
|
||||||
) -> Result<()> {
|
) -> Result<()>;
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
|
|
||||||
if self.backupid_algorithm.get(&key)?.is_none() {
|
|
||||||
return Err(Error::BadRequest(
|
|
||||||
ErrorKind::NotFound,
|
|
||||||
"Tried to update nonexistent backup.",
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
self.backupid_etag
|
|
||||||
.insert(&key, &services().globals.next_count()?.to_be_bytes())?;
|
|
||||||
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(room_id.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(session_id.as_bytes());
|
|
||||||
|
|
||||||
self.backupkeyid_backup
|
|
||||||
.insert(&key, key_data.json().get().as_bytes())?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn count_keys(&self, user_id: &UserId, version: &str) -> Result<usize> {
|
|
||||||
let mut prefix = user_id.as_bytes().to_vec();
|
|
||||||
prefix.push(0xff);
|
|
||||||
prefix.extend_from_slice(version.as_bytes());
|
|
||||||
|
|
||||||
Ok(self.backupkeyid_backup.scan_prefix(prefix).count())
|
fn count_keys(&self, user_id: &UserId, version: &str) -> Result<usize>;
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_etag(&self, user_id: &UserId, version: &str) -> Result<String> {
|
fn get_etag(&self, user_id: &UserId, version: &str) -> Result<String>;
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
|
|
||||||
Ok(utils::u64_from_bytes(
|
fn get_all(
|
||||||
&self
|
|
||||||
.backupid_etag
|
|
||||||
.get(&key)?
|
|
||||||
.ok_or_else(|| Error::bad_database("Backup has no etag."))?,
|
|
||||||
)
|
|
||||||
.map_err(|_| Error::bad_database("etag in backupid_etag invalid."))?
|
|
||||||
.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_all(
|
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
version: &str,
|
version: &str,
|
||||||
) -> Result<BTreeMap<Box<RoomId>, RoomKeyBackup>> {
|
) -> Result<BTreeMap<Box<RoomId>, RoomKeyBackup>>;
|
||||||
let mut prefix = user_id.as_bytes().to_vec();
|
|
||||||
prefix.push(0xff);
|
|
||||||
prefix.extend_from_slice(version.as_bytes());
|
|
||||||
prefix.push(0xff);
|
|
||||||
|
|
||||||
let mut rooms = BTreeMap::<Box<RoomId>, RoomKeyBackup>::new();
|
|
||||||
|
|
||||||
for result in self
|
|
||||||
.backupkeyid_backup
|
|
||||||
.scan_prefix(prefix)
|
|
||||||
.map(|(key, value)| {
|
|
||||||
let mut parts = key.rsplit(|&b| b == 0xff);
|
|
||||||
|
|
||||||
let session_id =
|
|
||||||
utils::string_from_bytes(parts.next().ok_or_else(|| {
|
|
||||||
Error::bad_database("backupkeyid_backup key is invalid.")
|
|
||||||
})?)
|
|
||||||
.map_err(|_| {
|
|
||||||
Error::bad_database("backupkeyid_backup session_id is invalid.")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let room_id = RoomId::parse(
|
|
||||||
utils::string_from_bytes(parts.next().ok_or_else(|| {
|
|
||||||
Error::bad_database("backupkeyid_backup key is invalid.")
|
|
||||||
})?)
|
|
||||||
.map_err(|_| Error::bad_database("backupkeyid_backup room_id is invalid."))?,
|
|
||||||
)
|
|
||||||
.map_err(|_| {
|
|
||||||
Error::bad_database("backupkeyid_backup room_id is invalid room id.")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let key_data = serde_json::from_slice(&value).map_err(|_| {
|
fn get_room(
|
||||||
Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
Ok::<_, Error>((room_id, session_id, key_data))
|
|
||||||
})
|
|
||||||
{
|
|
||||||
let (room_id, session_id, key_data) = result?;
|
|
||||||
rooms
|
|
||||||
.entry(room_id)
|
|
||||||
.or_insert_with(|| RoomKeyBackup {
|
|
||||||
sessions: BTreeMap::new(),
|
|
||||||
})
|
|
||||||
.sessions
|
|
||||||
.insert(session_id, key_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(rooms)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_room(
|
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
version: &str,
|
version: &str,
|
||||||
room_id: &RoomId,
|
room_id: &RoomId,
|
||||||
) -> Result<BTreeMap<String, Raw<KeyBackupData>>> {
|
) -> Result<BTreeMap<String, Raw<KeyBackupData>>>;
|
||||||
let mut prefix = user_id.as_bytes().to_vec();
|
|
||||||
prefix.push(0xff);
|
|
||||||
prefix.extend_from_slice(version.as_bytes());
|
|
||||||
prefix.push(0xff);
|
|
||||||
prefix.extend_from_slice(room_id.as_bytes());
|
|
||||||
prefix.push(0xff);
|
|
||||||
|
|
||||||
Ok(self
|
|
||||||
.backupkeyid_backup
|
|
||||||
.scan_prefix(prefix)
|
|
||||||
.map(|(key, value)| {
|
|
||||||
let mut parts = key.rsplit(|&b| b == 0xff);
|
|
||||||
|
|
||||||
let session_id =
|
|
||||||
utils::string_from_bytes(parts.next().ok_or_else(|| {
|
|
||||||
Error::bad_database("backupkeyid_backup key is invalid.")
|
|
||||||
})?)
|
|
||||||
.map_err(|_| {
|
|
||||||
Error::bad_database("backupkeyid_backup session_id is invalid.")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let key_data = serde_json::from_slice(&value).map_err(|_| {
|
fn get_session(
|
||||||
Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
Ok::<_, Error>((session_id, key_data))
|
|
||||||
})
|
|
||||||
.filter_map(|r| r.ok())
|
|
||||||
.collect())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_session(
|
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
version: &str,
|
version: &str,
|
||||||
room_id: &RoomId,
|
room_id: &RoomId,
|
||||||
session_id: &str,
|
session_id: &str,
|
||||||
) -> Result<Option<Raw<KeyBackupData>>> {
|
) -> Result<Option<Raw<KeyBackupData>>>;
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(room_id.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(session_id.as_bytes());
|
|
||||||
|
|
||||||
self.backupkeyid_backup
|
|
||||||
.get(&key)?
|
|
||||||
.map(|value| {
|
|
||||||
serde_json::from_slice(&value).map_err(|_| {
|
|
||||||
Error::bad_database("KeyBackupData in backupkeyid_backup is invalid.")
|
|
||||||
})
|
|
||||||
})
|
|
||||||
.transpose()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn delete_all_keys(&self, user_id: &UserId, version: &str) -> Result<()> {
|
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
|
|
||||||
for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
|
|
||||||
self.backupkeyid_backup.remove(&outdated_key)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
fn delete_all_keys(&self, user_id: &UserId, version: &str) -> Result<()>;
|
||||||
}
|
|
||||||
|
|
||||||
pub fn delete_room_keys(
|
fn delete_room_keys(
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
version: &str,
|
version: &str,
|
||||||
room_id: &RoomId,
|
room_id: &RoomId,
|
||||||
) -> Result<()> {
|
) -> Result<()>;
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(room_id.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
|
|
||||||
for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
|
fn delete_room_key(
|
||||||
self.backupkeyid_backup.remove(&outdated_key)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn delete_room_key(
|
|
||||||
&self,
|
&self,
|
||||||
user_id: &UserId,
|
user_id: &UserId,
|
||||||
version: &str,
|
version: &str,
|
||||||
room_id: &RoomId,
|
room_id: &RoomId,
|
||||||
session_id: &str,
|
session_id: &str,
|
||||||
) -> Result<()> {
|
) -> Result<()>;
|
||||||
let mut key = user_id.as_bytes().to_vec();
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(version.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(room_id.as_bytes());
|
|
||||||
key.push(0xff);
|
|
||||||
key.extend_from_slice(session_id.as_bytes());
|
|
||||||
|
|
||||||
for (outdated_key, _) in self.backupkeyid_backup.scan_prefix(key) {
|
|
||||||
self.backupkeyid_backup.remove(&outdated_key)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,8 @@
|
|||||||
|
use crate::Result;
|
||||||
|
|
||||||
|
pub trait Data {
|
||||||
|
fn create_file_metadata(&self, mxc: String, width: u32, height: u32, content_disposition: &Option<&str>, content_type: &Option<&str>) -> Result<Vec<u8>>;
|
||||||
|
|
||||||
|
/// Returns content_disposition, content_type and the metadata key.
|
||||||
|
fn search_file_metadata(&self, mxc: String, width: u32, height: u32) -> Result<(Option<String>, Option<String>, Vec<u8>)>;
|
||||||
|
}
|
||||||
@ -1,28 +1,29 @@
|
|||||||
pub mod pdu;
|
|
||||||
pub mod appservice;
|
|
||||||
pub mod pusher;
|
|
||||||
pub mod rooms;
|
|
||||||
pub mod transaction_ids;
|
|
||||||
pub mod uiaa;
|
|
||||||
pub mod users;
|
|
||||||
pub mod account_data;
|
pub mod account_data;
|
||||||
pub mod admin;
|
pub mod admin;
|
||||||
|
pub mod appservice;
|
||||||
pub mod globals;
|
pub mod globals;
|
||||||
pub mod key_backups;
|
pub mod key_backups;
|
||||||
pub mod media;
|
pub mod media;
|
||||||
|
pub mod pdu;
|
||||||
|
pub mod pusher;
|
||||||
|
pub mod rooms;
|
||||||
pub mod sending;
|
pub mod sending;
|
||||||
|
pub mod transaction_ids;
|
||||||
|
pub mod uiaa;
|
||||||
|
pub mod users;
|
||||||
|
|
||||||
pub struct Services<D> {
|
pub struct Services<D: appservice::Data + pusher::Data + rooms::Data + transaction_ids::Data + uiaa::Data + users::Data + account_data::Data + globals::Data + key_backups::Data + media::Data>
|
||||||
|
{
|
||||||
pub appservice: appservice::Service<D>,
|
pub appservice: appservice::Service<D>,
|
||||||
pub pusher: pusher::Service<D>,
|
pub pusher: pusher::Service<D>,
|
||||||
pub rooms: rooms::Service<D>,
|
pub rooms: rooms::Service<D>,
|
||||||
pub transaction_ids: transaction_ids::Service<D>,
|
pub transaction_ids: transaction_ids::Service<D>,
|
||||||
pub uiaa: uiaa::Service<D>,
|
pub uiaa: uiaa::Service<D>,
|
||||||
pub users: users::Service<D>,
|
pub users: users::Service<D>,
|
||||||
//pub account_data: account_data::Service<D>,
|
pub account_data: account_data::Service<D>,
|
||||||
//pub admin: admin::Service<D>,
|
pub admin: admin::Service,
|
||||||
pub globals: globals::Service<D>,
|
pub globals: globals::Service<D>,
|
||||||
//pub key_backups: key_backups::Service<D>,
|
pub key_backups: key_backups::Service<D>,
|
||||||
//pub media: media::Service<D>,
|
pub media: media::Service<D>,
|
||||||
//pub sending: sending::Service<D>,
|
pub sending: sending::Service,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,24 +1,29 @@
|
|||||||
use ruma::{RoomId, RoomAliasId};
|
use ruma::{RoomId, RoomAliasId};
|
||||||
|
use crate::Result;
|
||||||
|
|
||||||
pub trait Data {
|
pub trait Data {
|
||||||
/// Creates or updates the alias to the given room id.
|
/// Creates or updates the alias to the given room id.
|
||||||
fn set_alias(
|
fn set_alias(
|
||||||
|
&self,
|
||||||
alias: &RoomAliasId,
|
alias: &RoomAliasId,
|
||||||
room_id: &RoomId
|
room_id: &RoomId
|
||||||
) -> Result<()>;
|
) -> Result<()>;
|
||||||
|
|
||||||
/// Forgets about an alias. Returns an error if the alias did not exist.
|
/// Forgets about an alias. Returns an error if the alias did not exist.
|
||||||
fn remove_alias(
|
fn remove_alias(
|
||||||
|
&self,
|
||||||
alias: &RoomAliasId,
|
alias: &RoomAliasId,
|
||||||
) -> Result<()>;
|
) -> Result<()>;
|
||||||
|
|
||||||
/// Looks up the roomid for the given alias.
|
/// Looks up the roomid for the given alias.
|
||||||
fn resolve_local_alias(
|
fn resolve_local_alias(
|
||||||
|
&self,
|
||||||
alias: &RoomAliasId,
|
alias: &RoomAliasId,
|
||||||
) -> Result<()>;
|
) -> Result<Option<Box<RoomId>>>;
|
||||||
|
|
||||||
/// Returns all local aliases that point to the given room
|
/// Returns all local aliases that point to the given room
|
||||||
fn local_aliases_for_room(
|
fn local_aliases_for_room(
|
||||||
alias: &RoomAliasId,
|
&self,
|
||||||
) -> Result<()>;
|
room_id: &RoomId,
|
||||||
|
) -> Result<Box<dyn Iterator<Item=String>>>;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
|
use crate::Result;
|
||||||
|
|
||||||
pub trait Data {
|
pub trait Data {
|
||||||
fn get_cached_eventid_authchain<'a>() -> Result<HashSet<u64>>;
|
fn get_cached_eventid_authchain(&self, shorteventid: u64) -> Result<HashSet<u64>>;
|
||||||
fn cache_eventid_authchain<'a>(shorteventid: u64, auth_chain: &HashSet<u64>) -> Result<HashSet<u64>>;
|
fn cache_eventid_authchain(&self, shorteventid: u64, auth_chain: &HashSet<u64>) -> Result<()>;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,15 +1,16 @@
|
|||||||
use ruma::RoomId;
|
use ruma::RoomId;
|
||||||
|
use crate::Result;
|
||||||
|
|
||||||
pub trait Data {
|
pub trait Data {
|
||||||
/// Adds the room to the public room directory
|
/// Adds the room to the public room directory
|
||||||
fn set_public(room_id: &RoomId) -> Result<()>;
|
fn set_public(&self, room_id: &RoomId) -> Result<()>;
|
||||||
|
|
||||||
/// Removes the room from the public room directory.
|
/// Removes the room from the public room directory.
|
||||||
fn set_not_public(room_id: &RoomId) -> Result<()>;
|
fn set_not_public(&self, room_id: &RoomId) -> Result<()>;
|
||||||
|
|
||||||
/// Returns true if the room is in the public room directory.
|
/// Returns true if the room is in the public room directory.
|
||||||
fn is_public_room(room_id: &RoomId) -> Result<bool>;
|
fn is_public_room(&self, room_id: &RoomId) -> Result<bool>;
|
||||||
|
|
||||||
/// Returns the unsorted public room directory
|
/// Returns the unsorted public room directory
|
||||||
fn public_rooms() -> impl Iterator<Item = Result<Box<RoomId>>> + '_;
|
fn public_rooms(&self) -> Box<dyn Iterator<Item = Result<Box<RoomId>>>>;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,11 +1,12 @@
|
|||||||
use ruma::RoomId;
|
use ruma::RoomId;
|
||||||
|
use crate::Result;
|
||||||
|
|
||||||
pub trait Data {
|
pub trait Data {
|
||||||
fn index_pdu<'a>(&self, room_id: &RoomId, pdu_id: u64, message_body: String) -> Result<()>;
|
fn index_pdu<'a>(&self, shortroomid: u64, pdu_id: u64, message_body: String) -> Result<()>;
|
||||||
|
|
||||||
fn search_pdus<'a>(
|
fn search_pdus<'a>(
|
||||||
&'a self,
|
&'a self,
|
||||||
room_id: &RoomId,
|
room_id: &RoomId,
|
||||||
search_string: &str,
|
search_string: &str,
|
||||||
) -> Result<Option<(impl Iterator<Item = Vec<u8>> + 'a, Vec<String>)>>;
|
) -> Result<Option<(Box<dyn Iterator<Item = Vec<u8>>>, Vec<String>)>>;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,2 @@
|
|||||||
|
pub trait Data {
|
||||||
|
}
|
||||||
@ -1,5 +1,9 @@
|
|||||||
use ruma::{UserId, RoomId};
|
use ruma::{UserId, RoomId, serde::Raw, events::AnyStrippedStateEvent};
|
||||||
|
use crate::Result;
|
||||||
|
|
||||||
pub trait Data {
|
pub trait Data {
|
||||||
fn mark_as_once_joined(user_id: &UserId, room_id: &RoomId) -> Result<()>;
|
fn mark_as_once_joined(&self, user_id: &UserId, room_id: &RoomId) -> Result<()>;
|
||||||
|
fn mark_as_joined(&self, user_id: &UserId, room_id: &RoomId) -> Result<()>;
|
||||||
|
fn mark_as_invited(&self, user_id: &UserId, room_id: &RoomId, last_state: Option<Vec<Raw<AnyStrippedStateEvent>>>) -> Result<()>;
|
||||||
|
fn mark_as_left(&self, user_id: &UserId, room_id: &RoomId) -> Result<()>;
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue