|
|
|
@ -1,10 +1,11 @@
|
|
|
|
use crate::{database::DatabaseGuard, Error, Result, Ruma};
|
|
|
|
use crate::{database::DatabaseGuard, Error, Result, Ruma};
|
|
|
|
use ruma::api::client::{
|
|
|
|
use ruma::api::client::{
|
|
|
|
backup::{
|
|
|
|
backup::{
|
|
|
|
add_backup_key_session, add_backup_key_sessions, add_backup_keys, create_backup,
|
|
|
|
add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session,
|
|
|
|
delete_backup, delete_backup_key_session, delete_backup_key_sessions, delete_backup_keys,
|
|
|
|
create_backup_version, delete_backup_keys, delete_backup_keys_for_room,
|
|
|
|
get_backup, get_backup_key_session, get_backup_key_sessions, get_backup_keys,
|
|
|
|
delete_backup_keys_for_session, delete_backup_version, get_backup_info, get_backup_keys,
|
|
|
|
get_latest_backup, update_backup,
|
|
|
|
get_backup_keys_for_room, get_backup_keys_for_session, get_latest_backup_info,
|
|
|
|
|
|
|
|
update_backup_version,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
error::ErrorKind,
|
|
|
|
error::ErrorKind,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
@ -14,8 +15,8 @@ use ruma::api::client::{
|
|
|
|
/// Creates a new backup.
|
|
|
|
/// Creates a new backup.
|
|
|
|
pub async fn create_backup_route(
|
|
|
|
pub async fn create_backup_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<create_backup::v3::Request>,
|
|
|
|
body: Ruma<create_backup_version::v3::Request>,
|
|
|
|
) -> Result<create_backup::v3::Response> {
|
|
|
|
) -> Result<create_backup_version::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let version = db
|
|
|
|
let version = db
|
|
|
|
.key_backups
|
|
|
|
.key_backups
|
|
|
|
@ -23,7 +24,7 @@ pub async fn create_backup_route(
|
|
|
|
|
|
|
|
|
|
|
|
db.flush()?;
|
|
|
|
db.flush()?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(create_backup::v3::Response { version })
|
|
|
|
Ok(create_backup_version::v3::Response { version })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// # `PUT /_matrix/client/r0/room_keys/version/{version}`
|
|
|
|
/// # `PUT /_matrix/client/r0/room_keys/version/{version}`
|
|
|
|
@ -31,15 +32,15 @@ pub async fn create_backup_route(
|
|
|
|
/// Update information about an existing backup. Only `auth_data` can be modified.
|
|
|
|
/// Update information about an existing backup. Only `auth_data` can be modified.
|
|
|
|
pub async fn update_backup_route(
|
|
|
|
pub async fn update_backup_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<update_backup::v3::Request<'_>>,
|
|
|
|
body: Ruma<update_backup_version::v3::Request<'_>>,
|
|
|
|
) -> Result<update_backup::v3::Response> {
|
|
|
|
) -> Result<update_backup_version::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
db.key_backups
|
|
|
|
db.key_backups
|
|
|
|
.update_backup(sender_user, &body.version, &body.algorithm, &db.globals)?;
|
|
|
|
.update_backup(sender_user, &body.version, &body.algorithm, &db.globals)?;
|
|
|
|
|
|
|
|
|
|
|
|
db.flush()?;
|
|
|
|
db.flush()?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(update_backup::v3::Response {})
|
|
|
|
Ok(update_backup_version::v3::Response {})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// # `GET /_matrix/client/r0/room_keys/version`
|
|
|
|
/// # `GET /_matrix/client/r0/room_keys/version`
|
|
|
|
@ -47,8 +48,8 @@ pub async fn update_backup_route(
|
|
|
|
/// Get information about the latest backup version.
|
|
|
|
/// Get information about the latest backup version.
|
|
|
|
pub async fn get_latest_backup_route(
|
|
|
|
pub async fn get_latest_backup_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<get_latest_backup::v3::Request>,
|
|
|
|
body: Ruma<get_latest_backup_info::v3::Request>,
|
|
|
|
) -> Result<get_latest_backup::v3::Response> {
|
|
|
|
) -> Result<get_latest_backup_info::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
|
|
|
|
|
|
|
|
let (version, algorithm) =
|
|
|
|
let (version, algorithm) =
|
|
|
|
@ -59,7 +60,7 @@ pub async fn get_latest_backup_route(
|
|
|
|
"Key backup does not exist.",
|
|
|
|
"Key backup does not exist.",
|
|
|
|
))?;
|
|
|
|
))?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(get_latest_backup::v3::Response {
|
|
|
|
Ok(get_latest_backup_info::v3::Response {
|
|
|
|
algorithm,
|
|
|
|
algorithm,
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &version)? as u32).into(),
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &version)? as u32).into(),
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &version)?,
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &version)?,
|
|
|
|
@ -72,8 +73,8 @@ pub async fn get_latest_backup_route(
|
|
|
|
/// Get information about an existing backup.
|
|
|
|
/// Get information about an existing backup.
|
|
|
|
pub async fn get_backup_route(
|
|
|
|
pub async fn get_backup_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<get_backup::v3::Request<'_>>,
|
|
|
|
body: Ruma<get_backup_info::v3::Request<'_>>,
|
|
|
|
) -> Result<get_backup::v3::Response> {
|
|
|
|
) -> Result<get_backup_info::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let algorithm = db
|
|
|
|
let algorithm = db
|
|
|
|
.key_backups
|
|
|
|
.key_backups
|
|
|
|
@ -83,7 +84,7 @@ pub async fn get_backup_route(
|
|
|
|
"Key backup does not exist.",
|
|
|
|
"Key backup does not exist.",
|
|
|
|
))?;
|
|
|
|
))?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(get_backup::v3::Response {
|
|
|
|
Ok(get_backup_info::v3::Response {
|
|
|
|
algorithm,
|
|
|
|
algorithm,
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
@ -98,15 +99,15 @@ pub async fn get_backup_route(
|
|
|
|
/// - Deletes both information about the backup, as well as all key data related to the backup
|
|
|
|
/// - Deletes both information about the backup, as well as all key data related to the backup
|
|
|
|
pub async fn delete_backup_route(
|
|
|
|
pub async fn delete_backup_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<delete_backup::v3::Request<'_>>,
|
|
|
|
body: Ruma<delete_backup_version::v3::Request<'_>>,
|
|
|
|
) -> Result<delete_backup::v3::Response> {
|
|
|
|
) -> Result<delete_backup_version::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
|
|
|
|
|
|
|
|
db.key_backups.delete_backup(sender_user, &body.version)?;
|
|
|
|
db.key_backups.delete_backup(sender_user, &body.version)?;
|
|
|
|
|
|
|
|
|
|
|
|
db.flush()?;
|
|
|
|
db.flush()?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(delete_backup::v3::Response {})
|
|
|
|
Ok(delete_backup_version::v3::Response {})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// # `PUT /_matrix/client/r0/room_keys/keys`
|
|
|
|
/// # `PUT /_matrix/client/r0/room_keys/keys`
|
|
|
|
@ -164,8 +165,8 @@ pub async fn add_backup_keys_route(
|
|
|
|
/// - Returns the new number of keys in this backup and the etag
|
|
|
|
/// - Returns the new number of keys in this backup and the etag
|
|
|
|
pub async fn add_backup_key_sessions_route(
|
|
|
|
pub async fn add_backup_key_sessions_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<add_backup_key_sessions::v3::Request<'_>>,
|
|
|
|
body: Ruma<add_backup_keys_for_room::v3::Request<'_>>,
|
|
|
|
) -> Result<add_backup_key_sessions::v3::Response> {
|
|
|
|
) -> Result<add_backup_keys_for_room::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
|
|
|
|
|
|
|
|
if Some(&body.version)
|
|
|
|
if Some(&body.version)
|
|
|
|
@ -193,7 +194,7 @@ pub async fn add_backup_key_sessions_route(
|
|
|
|
|
|
|
|
|
|
|
|
db.flush()?;
|
|
|
|
db.flush()?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(add_backup_key_sessions::v3::Response {
|
|
|
|
Ok(add_backup_keys_for_room::v3::Response {
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -208,8 +209,8 @@ pub async fn add_backup_key_sessions_route(
|
|
|
|
/// - Returns the new number of keys in this backup and the etag
|
|
|
|
/// - Returns the new number of keys in this backup and the etag
|
|
|
|
pub async fn add_backup_key_session_route(
|
|
|
|
pub async fn add_backup_key_session_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<add_backup_key_session::v3::Request<'_>>,
|
|
|
|
body: Ruma<add_backup_keys_for_session::v3::Request<'_>>,
|
|
|
|
) -> Result<add_backup_key_session::v3::Response> {
|
|
|
|
) -> Result<add_backup_keys_for_session::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
|
|
|
|
|
|
|
|
if Some(&body.version)
|
|
|
|
if Some(&body.version)
|
|
|
|
@ -235,7 +236,7 @@ pub async fn add_backup_key_session_route(
|
|
|
|
|
|
|
|
|
|
|
|
db.flush()?;
|
|
|
|
db.flush()?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(add_backup_key_session::v3::Response {
|
|
|
|
Ok(add_backup_keys_for_session::v3::Response {
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -260,15 +261,15 @@ pub async fn get_backup_keys_route(
|
|
|
|
/// Retrieves all keys from the backup for a given room.
|
|
|
|
/// Retrieves all keys from the backup for a given room.
|
|
|
|
pub async fn get_backup_key_sessions_route(
|
|
|
|
pub async fn get_backup_key_sessions_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<get_backup_key_sessions::v3::Request<'_>>,
|
|
|
|
body: Ruma<get_backup_keys_for_room::v3::Request<'_>>,
|
|
|
|
) -> Result<get_backup_key_sessions::v3::Response> {
|
|
|
|
) -> Result<get_backup_keys_for_room::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
|
|
|
|
|
|
|
|
let sessions = db
|
|
|
|
let sessions = db
|
|
|
|
.key_backups
|
|
|
|
.key_backups
|
|
|
|
.get_room(sender_user, &body.version, &body.room_id)?;
|
|
|
|
.get_room(sender_user, &body.version, &body.room_id)?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(get_backup_key_sessions::v3::Response { sessions })
|
|
|
|
Ok(get_backup_keys_for_room::v3::Response { sessions })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// # `GET /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
|
|
|
|
/// # `GET /_matrix/client/r0/room_keys/keys/{roomId}/{sessionId}`
|
|
|
|
@ -276,8 +277,8 @@ pub async fn get_backup_key_sessions_route(
|
|
|
|
/// Retrieves a key from the backup.
|
|
|
|
/// Retrieves a key from the backup.
|
|
|
|
pub async fn get_backup_key_session_route(
|
|
|
|
pub async fn get_backup_key_session_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<get_backup_key_session::v3::Request<'_>>,
|
|
|
|
body: Ruma<get_backup_keys_for_session::v3::Request<'_>>,
|
|
|
|
) -> Result<get_backup_key_session::v3::Response> {
|
|
|
|
) -> Result<get_backup_keys_for_session::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
|
|
|
|
|
|
|
|
let key_data = db
|
|
|
|
let key_data = db
|
|
|
|
@ -288,7 +289,7 @@ pub async fn get_backup_key_session_route(
|
|
|
|
"Backup key not found for this user's session.",
|
|
|
|
"Backup key not found for this user's session.",
|
|
|
|
))?;
|
|
|
|
))?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(get_backup_key_session::v3::Response { key_data })
|
|
|
|
Ok(get_backup_keys_for_session::v3::Response { key_data })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// # `DELETE /_matrix/client/r0/room_keys/keys`
|
|
|
|
/// # `DELETE /_matrix/client/r0/room_keys/keys`
|
|
|
|
@ -315,8 +316,8 @@ pub async fn delete_backup_keys_route(
|
|
|
|
/// Delete the keys from the backup for a given room.
|
|
|
|
/// Delete the keys from the backup for a given room.
|
|
|
|
pub async fn delete_backup_key_sessions_route(
|
|
|
|
pub async fn delete_backup_key_sessions_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<delete_backup_key_sessions::v3::Request<'_>>,
|
|
|
|
body: Ruma<delete_backup_keys_for_room::v3::Request<'_>>,
|
|
|
|
) -> Result<delete_backup_key_sessions::v3::Response> {
|
|
|
|
) -> Result<delete_backup_keys_for_room::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
|
|
|
|
|
|
|
|
db.key_backups
|
|
|
|
db.key_backups
|
|
|
|
@ -324,7 +325,7 @@ pub async fn delete_backup_key_sessions_route(
|
|
|
|
|
|
|
|
|
|
|
|
db.flush()?;
|
|
|
|
db.flush()?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(delete_backup_key_sessions::v3::Response {
|
|
|
|
Ok(delete_backup_keys_for_room::v3::Response {
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
@ -335,8 +336,8 @@ pub async fn delete_backup_key_sessions_route(
|
|
|
|
/// Delete a key from the backup.
|
|
|
|
/// Delete a key from the backup.
|
|
|
|
pub async fn delete_backup_key_session_route(
|
|
|
|
pub async fn delete_backup_key_session_route(
|
|
|
|
db: DatabaseGuard,
|
|
|
|
db: DatabaseGuard,
|
|
|
|
body: Ruma<delete_backup_key_session::v3::Request<'_>>,
|
|
|
|
body: Ruma<delete_backup_keys_for_session::v3::Request<'_>>,
|
|
|
|
) -> Result<delete_backup_key_session::v3::Response> {
|
|
|
|
) -> Result<delete_backup_keys_for_session::v3::Response> {
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
|
|
|
|
|
|
|
|
|
|
|
|
db.key_backups
|
|
|
|
db.key_backups
|
|
|
|
@ -344,7 +345,7 @@ pub async fn delete_backup_key_session_route(
|
|
|
|
|
|
|
|
|
|
|
|
db.flush()?;
|
|
|
|
db.flush()?;
|
|
|
|
|
|
|
|
|
|
|
|
Ok(delete_backup_key_session::v3::Response {
|
|
|
|
Ok(delete_backup_keys_for_session::v3::Response {
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
count: (db.key_backups.count_keys(sender_user, &body.version)? as u32).into(),
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
etag: db.key_backups.get_etag(sender_user, &body.version)?,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
chenyuqide
2 years ago
committed by
Timo Kösters