From 66bc25fcd36940bb32c1873c0beed3335604bd55 Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Wed, 29 Jul 2020 17:37:26 +0200
Subject: [PATCH] feat: implement /keys/changes
---
Cargo.lock | 70 +++++++++++++++++++-------------------
src/client_server.rs | 43 +++++++++++++++++++++--
src/database/rooms.rs | 6 ++--
src/database/rooms/edus.rs | 3 +-
src/database/users.rs | 23 ++++++++-----
src/main.rs | 1 +
6 files changed, 96 insertions(+), 50 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index e40fd093..225dc09a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -214,9 +214,9 @@ checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
[[package]]
name = "bytemuck"
-version = "1.3.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40636046a60a45ee5185e885a3ccb771f7a2065fb7cbcc2a7ecfd9896d1c365"
+checksum = "db7a1029718df60331e557c9e83a55523c955e5dd2a7bfeffad6bbd50b538ae9"
[[package]]
name = "byteorder"
@@ -814,9 +814,9 @@ dependencies = [
[[package]]
name = "image"
-version = "0.23.7"
+version = "0.23.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2397fc43bd5648b7117aabb3c5e62d0e62c194826ec77b0b4d0c41e62744635"
+checksum = "543904170510c1b5fb65140485d84de4a57fddb2ed685481e9020ce3d2c9f64c"
dependencies = [
"bytemuck",
"byteorder",
@@ -882,9 +882,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.42"
+version = "0.3.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2"
+checksum = "85a7e2c92a4804dd459b86c339278d0fe87cf93757fae222c3fa3ae75458bc73"
dependencies = [
"wasm-bindgen",
]
@@ -916,9 +916,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.73"
+version = "0.2.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
+checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
[[package]]
name = "lock_api"
@@ -1239,18 +1239,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]]
name = "pin-project"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
dependencies = [
"proc-macro2",
"quote",
@@ -1305,9 +1305,9 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
[[package]]
name = "proc-macro-hack"
-version = "0.5.16"
+version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
+checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
[[package]]
name = "proc-macro-nested"
@@ -1485,7 +1485,7 @@ dependencies = [
[[package]]
name = "rocket"
version = "0.5.0-dev"
-source = "git+https://github.com/timokoesters/Rocket.git?branch=empty_parameters#f383f15047d0dda71dd21399dfea96161fe2bd0e"
+source = "git+https://github.com/timokoesters/Rocket.git?branch=empty_parameters#f6d40ecd5d871d97837b3116eb670fb3c06d95b9"
dependencies = [
"async-trait",
"atomic",
@@ -1510,7 +1510,7 @@ dependencies = [
[[package]]
name = "rocket_codegen"
version = "0.5.0-dev"
-source = "git+https://github.com/timokoesters/Rocket.git?branch=empty_parameters#f383f15047d0dda71dd21399dfea96161fe2bd0e"
+source = "git+https://github.com/timokoesters/Rocket.git?branch=empty_parameters#f6d40ecd5d871d97837b3116eb670fb3c06d95b9"
dependencies = [
"devise",
"glob",
@@ -1522,7 +1522,7 @@ dependencies = [
[[package]]
name = "rocket_http"
version = "0.5.0-dev"
-source = "git+https://github.com/timokoesters/Rocket.git?branch=empty_parameters#f383f15047d0dda71dd21399dfea96161fe2bd0e"
+source = "git+https://github.com/timokoesters/Rocket.git?branch=empty_parameters#f6d40ecd5d871d97837b3116eb670fb3c06d95b9"
dependencies = [
"cookie",
"http",
@@ -1838,9 +1838,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.56"
+version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
dependencies = [
"itoa",
"ryu",
@@ -2029,9 +2029,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
[[package]]
name = "syn"
-version = "1.0.35"
+version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
+checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
dependencies = [
"proc-macro2",
"quote",
@@ -2339,9 +2339,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "wasm-bindgen"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
+checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
dependencies = [
"cfg-if",
"serde",
@@ -2351,9 +2351,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
+checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0"
dependencies = [
"bumpalo",
"lazy_static",
@@ -2366,9 +2366,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.15"
+version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ad6e4e8b2b7f8c90b6e09a9b590ea15cb0d1dbe28502b5a405cd95d1981671"
+checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
dependencies = [
"cfg-if",
"js-sys",
@@ -2378,9 +2378,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
+checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2388,9 +2388,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
+checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
dependencies = [
"proc-macro2",
"quote",
@@ -2401,15 +2401,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.65"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"
+checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"
[[package]]
name = "web-sys"
-version = "0.3.42"
+version = "0.3.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2"
+checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47"
dependencies = [
"js-sys",
"wasm-bindgen",
diff --git a/src/client_server.rs b/src/client_server.rs
index cd61746b..0536c8ea 100644
--- a/src/client_server.rs
+++ b/src/client_server.rs
@@ -35,7 +35,7 @@ use ruma::{
set_room_visibility,
},
filter::{self, create_filter, get_filter},
- keys::{self, claim_keys, get_keys, upload_keys},
+ keys::{self, claim_keys, get_key_changes, get_keys, upload_keys},
media::{create_content, get_content, get_content_thumbnail, get_media_config},
membership::{
ban_user, forget_room, get_member_events, invite_user, join_room_by_id,
@@ -2552,7 +2552,11 @@ pub async fn sync_events_route(
let mut send_member_count = false;
let mut joined_since_last_sync = false;
let mut send_notification_counts = false;
- for pdu in db.rooms.pdus_since(&sender_id, &room_id, since)?.filter_map(|r| r.ok()) {
+ for pdu in db
+ .rooms
+ .pdus_since(&sender_id, &room_id, since)?
+ .filter_map(|r| r.ok())
+ {
send_notification_counts = true;
if pdu.kind == EventType::RoomMember {
send_member_count = true;
@@ -2767,7 +2771,7 @@ pub async fn sync_events_route(
// Look for device list updates in this room
device_list_updates.extend(
db.users
- .keys_changed(&room_id, since)
+ .keys_changed(&room_id, since, None)
.filter_map(|r| r.ok()),
);
@@ -3529,6 +3533,39 @@ pub fn upload_signatures_route(
Ok(upload_signatures::Response.into())
}
+#[cfg_attr(
+ feature = "conduit_bin",
+ get("/_matrix/client/r0/keys/changes", data = "<body>")
+)]
+pub fn get_key_changes_route(
+ db: State<'_, Database>,
+ body: Ruma<get_key_changes::Request>,
+) -> ConduitResult<get_key_changes::Response> {
+ let sender_id = body.sender_id.as_ref().expect("user is authenticated");
+
+ let mut device_list_updates = HashSet::new();
+ for room_id in db.rooms.rooms_joined(sender_id).filter_map(|r| r.ok()) {
+ device_list_updates.extend(
+ db.users
+ .keys_changed(
+ &room_id,
+ body.from.parse().map_err(|_| {
+ Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`.")
+ })?,
+ Some(body.to.parse().map_err(|_| {
+ Error::BadRequest(ErrorKind::InvalidParam, "Invalid `to`.")
+ })?),
+ )
+ .filter_map(|r| r.ok()),
+ );
+ }
+ Ok(get_key_changes::Response {
+ changed: device_list_updates.into_iter().collect(),
+ left: Vec::new(), // TODO
+ }
+ .into())
+}
+
#[cfg_attr(feature = "conduit_bin", get("/_matrix/client/r0/pushers"))]
pub fn pushers_route() -> ConduitResult<get_pushers::Response> {
Ok(get_pushers::Response {
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 4cd47a17..7895f025 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -611,8 +611,8 @@ impl Rooms {
self.pdus_since(user_id, room_id, 0)
}
- /// Returns an iterator over all events in a room that happened after the event with id `since`
- /// in reverse-chronological order.
+ /// Returns a double-ended iterator over all events in a room that happened after the event with id `since`
+ /// in chronological order.
pub fn pdus_since(
&self,
user_id: &UserId,
@@ -624,7 +624,7 @@ impl Rooms {
// Skip the first pdu if it's exactly at since, because we sent that last time
let mut first_pdu_id = prefix.clone();
- first_pdu_id.extend_from_slice(&(since+1).to_be_bytes());
+ first_pdu_id.extend_from_slice(&(since + 1).to_be_bytes());
let mut last_pdu_id = prefix.clone();
last_pdu_id.extend_from_slice(&u64::MAX.to_be_bytes());
diff --git a/src/database/rooms/edus.rs b/src/database/rooms/edus.rs
index 62df0ccd..fff30c22 100644
--- a/src/database/rooms/edus.rs
+++ b/src/database/rooms/edus.rs
@@ -352,7 +352,8 @@ impl RoomEdus {
.ok()?,
))
})
- .take_while(|(_, timestamp)| current_timestamp - timestamp > 5 * 60_000) // 5 Minutes
+ .take_while(|(_, timestamp)| current_timestamp - timestamp > 5 * 60_000)
+ // 5 Minutes
{
self.userid_lastpresenceupdate.remove(&user_id_bytes)?;
diff --git a/src/database/users.rs b/src/database/users.rs
index 7fbdd806..7fb97679 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -9,7 +9,7 @@ use ruma::{
},
},
events::{AnyToDeviceEvent, EventType},
- DeviceId, Raw, UserId, RoomId,
+ DeviceId, Raw, RoomId, UserId,
};
use std::{collections::BTreeMap, convert::TryFrom, mem, time::SystemTime};
@@ -389,8 +389,7 @@ impl Users {
key.push(0xff);
key.extend_from_slice(&count);
- self.keychangeid_userid
- .insert(key, &*user_id.to_string())?;
+ self.keychangeid_userid.insert(key, &*user_id.to_string())?;
}
Ok(())
@@ -497,8 +496,7 @@ impl Users {
key.push(0xff);
key.extend_from_slice(&count);
- self.keychangeid_userid
- .insert(key, &*user_id.to_string())?;
+ self.keychangeid_userid.insert(key, &*user_id.to_string())?;
}
Ok(())
@@ -556,14 +554,23 @@ impl Users {
Ok(())
}
- pub fn keys_changed(&self, room_id: &RoomId, since: u64) -> impl Iterator<Item = Result<UserId>> {
+ pub fn keys_changed(
+ &self,
+ room_id: &RoomId,
+ from: u64,
+ to: Option<u64>,
+ ) -> impl Iterator<Item = Result<UserId>> {
let mut prefix = room_id.to_string().as_bytes().to_vec();
prefix.push(0xff);
+
let mut start = prefix.clone();
- start.extend_from_slice(&(since + 1).to_be_bytes());
+ start.extend_from_slice(&(from + 1).to_be_bytes());
+
+ let mut end = prefix.clone();
+ end.extend_from_slice(&to.unwrap_or(u64::MAX).to_be_bytes());
self.keychangeid_userid
- .range(start..)
+ .range(start..end)
.filter_map(|r| r.ok())
.take_while(move |(k, _)| k.starts_with(&prefix))
.map(|(_, bytes)| {
diff --git a/src/main.rs b/src/main.rs
index cc30ff64..86d8446b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -108,6 +108,7 @@ fn setup_rocket() -> rocket::Rocket {
client_server::options_route,
client_server::upload_signing_keys_route,
client_server::upload_signatures_route,
+ client_server::get_key_changes_route,
client_server::pushers_route,
client_server::set_pushers_route,
//server_server::well_known_server,