shruub
/
conduit
mirror of https://gitlab.com/famedly/conduit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump dependencies and fixes

Browse Source
merge-requests/22/head
timokoesters 4 years ago
parent 873d191569
commit 120b6f4b95
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
7 changed files with 67 additions and 90 deletions
Show Stats Download Patch File Download Diff File

51
Cargo.lock generated
Unescape Escape View File

@ -11,9 +11,9 @@ dependencies = [
[[package]] [[package]]
name = "arc-swap" name = "arc-swap"
version = "0.4.5" version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d663a8e9a99154b5fb793032533f6328da35e23aac63d5c152279aa8ba356825" checksum = "b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62"
[[package]] [[package]]
name = "arrayref" name = "arrayref"
@ -119,9 +119,9 @@ checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.50" version = "1.0.52"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"
@ -841,9 +841,9 @@ dependencies = [
[[package]] [[package]]
name = "parking_lot_core" name = "parking_lot_core"
version = "0.7.1" version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e136c1904604defe99ce5fd71a28d473fa60a12255d511aa78a9ddf11237aeb" checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"cloudabi", "cloudabi",
@ -915,9 +915,9 @@ checksum = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
[[package]] [[package]]
name = "pin-utils" name = "pin-utils"
version = "0.1.0-alpha.4" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]] [[package]]
name = "pkg-config" name = "pkg-config"
@ -1191,9 +1191,9 @@ dependencies = [
[[package]] [[package]]
name = "ruma-api" name = "ruma-api"
version = "0.16.0-rc.1" version = "0.16.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7769e934360383f91d68a2b9132610d02436ef3272cbdd46de239c9025198a36" checksum = "c296a951625ccc8c04d5188f1791d1628503c8614073a05833af9fed18b029c1"
dependencies = [ dependencies = [
"http", "http",
"percent-encoding 2.1.0", "percent-encoding 2.1.0",
@ -1207,9 +1207,9 @@ dependencies = [
[[package]] [[package]]
name = "ruma-api-macros" name = "ruma-api-macros"
version = "0.16.0-rc.1" version = "0.16.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f8dad3311d0bee6d43da684ba03f9a84cddd39f9b3e7e88cab5d726419ec22e" checksum = "0f6b02a6a860a96e3c2081c8aea88b37b2918b53e539856b73aadde1908b65ad"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
@ -1218,8 +1218,8 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.8.0-rc.2" version = "0.8.0-rc.5"
source = "git+https://github.com/ruma/ruma-client-api.git#1b7863dc36e6e043ae365791cc719dc190abd660" source = "git+https://github.com/ruma/ruma-client-api.git#473cf2386178781688f12c538ee6419869d14a46"
dependencies = [ dependencies = [
"http", "http",
"js_int", "js_int",
@ -1235,9 +1235,9 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.19.0" version = "0.21.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "844b5d38397c945395c7a1eaf89d55714c3d22983b870085a1a67d51fb6611cf" checksum = "d4802476bbe517f2ac6cb7b1cf4869d54586c10e86e2ddc00806cafa32a96553"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-events-macros", "ruma-events-macros",
@ -1249,9 +1249,9 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events-macros" name = "ruma-events-macros"
version = "0.19.0-final" version = "0.21.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5477046b734fde45dd7913dbc8d7b260af3b1c31ea2bc329bd2f0b44e37368be" checksum = "abd3cfe96c9887fe2eebfa2e5e7d3a4afff02c374874d4e718f46dab5fd3320d"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
@ -1261,6 +1261,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.0.1" version = "0.0.1"
source = "git+https://git.koesters.xyz/timo/ruma-federation-api.git#6f1c5a6a714d6be2f420f3832d31e214fe4fb229"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-api", "ruma-api",
@ -1273,10 +1274,11 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers" name = "ruma-identifiers"
version = "0.15.1" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63db5545f38077ea141fb112df070773e6ab9b7025174d732f56c6b37525ccc0" checksum = "6ee548c5dbb5a92a93bb435fd3b66484cd19b0f37450c9b93677338cbe9550d2"
dependencies = [ dependencies = [
"rand",
"serde", "serde",
] ]
@ -1294,6 +1296,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.6.0-dev.1" version = "0.6.0-dev.1"
source = "git+https://git.koesters.xyz/timo/ruma-signatures.git#e2cd0927c14133b8d49a8cd9fbd96f8af5c60f07"
dependencies = [ dependencies = [
"base64 0.12.0", "base64 0.12.0",
"ring", "ring",
@ -1340,9 +1343,9 @@ dependencies = [
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.3" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1"
[[package]] [[package]]
name = "schannel" name = "schannel"
@ -1877,9 +1880,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]] [[package]]
name = "winapi-util" name = "winapi-util"
version = "0.1.4" version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [ dependencies = [
"winapi 0.3.8", "winapi 0.3.8",
] ]

10
Cargo.toml
Unescape Escape View File

@ -14,11 +14,11 @@ edition = "2018"
rocket = { git = "https://github.com/SergioBenitez/Rocket.git", branch = "async", features = ["tls"] } rocket = { git = "https://github.com/SergioBenitez/Rocket.git", branch = "async", features = ["tls"] }
http = "0.2.1" http = "0.2.1"
ruma-client-api = { git = "https://github.com/ruma/ruma-client-api.git" } ruma-client-api = { git = "https://github.com/ruma/ruma-client-api.git" }
ruma-identifiers = "0.15.1" ruma-identifiers = { version = "0.16.0", features = ["rand"] }
ruma-api = "0.16.0-rc.1" ruma-api = "0.16.0-rc.3"
ruma-events = "0.19.0" ruma-events = "0.21.0-beta.1"
ruma-signatures = { path = "../ruma-signatures" } ruma-signatures = { git = "https://git.koesters.xyz/timo/ruma-signatures.git" }
ruma-federation-api = { path = "../ruma-federation-api" } ruma-federation-api = { git = "https://git.koesters.xyz/timo/ruma-federation-api.git" }
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
log = "0.4.8" log = "0.4.8"
sled = "0.31.0" sled = "0.31.0"

8
src/client_server.rs
Unescape Escape View File

@ -549,7 +549,7 @@ pub fn create_room_route(
body: Ruma<create_room::Request>, body: Ruma<create_room::Request>,
) -> MatrixResult<create_room::Response> { ) -> MatrixResult<create_room::Response> {
// TODO: check if room is unique // TODO: check if room is unique
let room_id = RoomId::try_from(data.hostname()).expect("host is valid"); let room_id = RoomId::new(data.hostname()).expect("host is valid");
let user_id = body.user_id.clone().expect("user is authenticated"); let user_id = body.user_id.clone().expect("user is authenticated");
data.pdu_append( data.pdu_append(
@ -756,7 +756,7 @@ pub async fn get_public_rooms_filtered_route(
chunk.extend_from_slice( chunk.extend_from_slice(
&server_server::send_request( &server_server::send_request(
&data, &data,
"matrix.koesters.xyz".to_owned(), "koesters.xyz".to_owned(),
ruma_federation_api::v1::get_public_rooms::Request { ruma_federation_api::v1::get_public_rooms::Request {
limit: None, limit: None,
since: None, since: None,
@ -913,7 +913,6 @@ pub fn sync_route(
let room_events = pdus let room_events = pdus
.into_iter() .into_iter()
.map(|pdu| pdu.to_room_event()) .map(|pdu| pdu.to_room_event())
.filter_map(|e| e)
.collect(); .collect();
let mut edus = data.roomlatests_since(&room_id, since); let mut edus = data.roomlatests_since(&room_id, since);
edus.extend_from_slice(&data.roomactives_in(&room_id)); edus.extend_from_slice(&data.roomactives_in(&room_id));
@ -949,7 +948,6 @@ pub fn sync_route(
let room_events = pdus let room_events = pdus
.into_iter() .into_iter()
.map(|pdu| pdu.to_room_event()) .map(|pdu| pdu.to_room_event())
.filter_map(|e| e)
.collect(); .collect();
let mut edus = data.roomlatests_since(&room_id, since); let mut edus = data.roomlatests_since(&room_id, since);
edus.extend_from_slice(&data.roomactives_in(&room_id)); edus.extend_from_slice(&data.roomactives_in(&room_id));
@ -973,7 +971,7 @@ pub fn sync_route(
let events = data let events = data
.pdus_since(&room_id, since) .pdus_since(&room_id, since)
.into_iter() .into_iter()
.filter_map(|pdu| pdu.to_stripped_state_event()) .map(|pdu| pdu.to_stripped_state_event())
.collect(); .collect();
invited_rooms.insert( invited_rooms.insert(

23
src/data.rs
Unescape Escape View File

@ -1,5 +1,5 @@
use crate::{utils, Database, PduEvent}; use crate::{utils, Database, PduEvent};
use ruma_events::{collections::only::Event as EduEvent, EventResult, EventType}; use ruma_events::{collections::only::Event as EduEvent, EventJson, EventType};
use ruma_federation_api::RoomV3Pdu; use ruma_federation_api::RoomV3Pdu;
use ruma_identifiers::{EventId, RoomId, UserId}; use ruma_identifiers::{EventId, RoomId, UserId};
use serde_json::json; use serde_json::json;
@ -604,7 +604,7 @@ impl Data {
} }
/// Returns a vector of the most recent read_receipts in a room that happened after the event with id `since`. /// Returns a vector of the most recent read_receipts in a room that happened after the event with id `since`.
pub fn roomlatests_since(&self, room_id: &RoomId, since: u64) -> Vec<EduEvent> { pub fn roomlatests_since(&self, room_id: &RoomId, since: u64) -> Vec<EventJson<EduEvent>> {
let mut room_latests = Vec::new(); let mut room_latests = Vec::new();
let mut prefix = room_id.to_string().as_bytes().to_vec(); let mut prefix = room_id.to_string().as_bytes().to_vec();
@ -617,10 +617,11 @@ impl Data {
if key.starts_with(&prefix) { if key.starts_with(&prefix) {
current = key.to_vec(); current = key.to_vec();
room_latests.push( room_latests.push(
serde_json::from_slice::<EventResult<_>>(&value) serde_json::from_slice::<EventJson<EduEvent>>(&value)
.expect("room_latest in db is valid") .expect("room_latest in db is valid")
.into_result() .deserialize()
.expect("room_latest in db is valid"), .expect("room_latest in db is valid")
.into(),
); );
} else { } else {
break; break;
@ -691,7 +692,7 @@ impl Data {
} }
/// Returns a vector of the most recent read_receipts in a room that happened after the event with id `since`. /// Returns a vector of the most recent read_receipts in a room that happened after the event with id `since`.
pub fn roomactives_in(&self, room_id: &RoomId) -> Vec<EduEvent> { pub fn roomactives_in(&self, room_id: &RoomId) -> Vec<EventJson<EduEvent>> {
let mut room_actives = Vec::new(); let mut room_actives = Vec::new();
let mut prefix = room_id.to_string().as_bytes().to_vec(); let mut prefix = room_id.to_string().as_bytes().to_vec();
@ -704,10 +705,11 @@ impl Data {
if key.starts_with(&prefix) { if key.starts_with(&prefix) {
current = key.to_vec(); current = key.to_vec();
room_actives.push( room_actives.push(
serde_json::from_slice::<EventResult<_>>(&value) serde_json::from_slice::<EventJson<EduEvent>>(&value)
.expect("room_active in db is valid")
.deserialize()
.expect("room_active in db is valid") .expect("room_active in db is valid")
.into_result() .into(),
.expect("room_active in db is valid"),
); );
} else { } else {
break; break;
@ -720,7 +722,8 @@ impl Data {
user_ids: Vec::new(), user_ids: Vec::new(),
}, },
room_id: None, // None because it can be inferred room_id: None, // None because it can be inferred
})]; })
.into()];
} else { } else {
room_actives room_actives
} }

23
src/pdu.rs
Unescape Escape View File

@ -1,6 +1,6 @@
use js_int::UInt; use js_int::UInt;
use ruma_events::{ use ruma_events::{
collections::all::RoomEvent, stripped::AnyStrippedStateEvent, EventResult, EventType, collections::all::RoomEvent, stripped::AnyStrippedStateEvent, EventJson, EventType,
}; };
use ruma_federation_api::EventHash; use ruma_federation_api::EventHash;
use ruma_identifiers::{EventId, RoomId, UserId}; use ruma_identifiers::{EventId, RoomId, UserId};
@ -31,29 +31,20 @@ pub struct PduEvent {
} }
impl PduEvent { impl PduEvent {
// TODO: This shouldn't be an option pub fn to_room_event(&self) -> EventJson<RoomEvent> {
pub fn to_room_event(&self) -> Option<RoomEvent> {
// Can only fail in rare circumstances that won't ever happen here, see // Can only fail in rare circumstances that won't ever happen here, see
// https://docs.rs/serde_json/1.0.50/serde_json/fn.to_string.html // https://docs.rs/serde_json/1.0.50/serde_json/fn.to_string.html
let json = serde_json::to_string(&self).unwrap(); let json = serde_json::to_string(&self).unwrap();
// EventResult's deserialize implementation always returns `Ok(...)` // EventJson's deserialize implementation always returns `Ok(...)`
Some( serde_json::from_str::<EventJson<RoomEvent>>(&json).unwrap()
serde_json::from_str::<EventResult<RoomEvent>>(&json)
.unwrap()
.into_result()
.ok()?,
)
} }
pub fn to_stripped_state_event(&self) -> Option<AnyStrippedStateEvent> { pub fn to_stripped_state_event(&self) -> EventJson<AnyStrippedStateEvent> {
// Can only fail in rare circumstances that won't ever happen here, see // Can only fail in rare circumstances that won't ever happen here, see
// https://docs.rs/serde_json/1.0.50/serde_json/fn.to_string.html // https://docs.rs/serde_json/1.0.50/serde_json/fn.to_string.html
let json = serde_json::to_string(&self).unwrap(); let json = serde_json::to_string(&self).unwrap();
// EventResult's deserialize implementation always returns `Ok(...)` // EventJson's deserialize implementation always returns `Ok(...)`
serde_json::from_str::<EventResult<AnyStrippedStateEvent>>(&json) serde_json::from_str::<EventJson<AnyStrippedStateEvent>>(&json).unwrap()
.unwrap()
.into_result()
.ok()
} }
} }

23
src/ruma_wrapper.rs
Unescape Escape View File

@ -7,12 +7,11 @@ use rocket::{
Request, State, Request, State,
}; };
use ruma_api::{ use ruma_api::{
error::{FromHttpRequestError, FromHttpResponseError}, Endpoint
Endpoint, Outgoing,
}; };
use ruma_identifiers::UserId; use ruma_identifiers::UserId;
use std::{ use std::{
convert::{TryFrom, TryInto}, convert::{TryInto},
io::Cursor, io::Cursor,
ops::Deref, ops::Deref,
}; };
@ -22,21 +21,13 @@ const MESSAGE_LIMIT: u64 = 65535;
/// This struct converts rocket requests into ruma structs by converting them into http requests /// This struct converts rocket requests into ruma structs by converting them into http requests
/// first. /// first.
pub struct Ruma<T: Outgoing> { pub struct Ruma<T> {
body: T::Incoming, body: T,
pub user_id: Option<UserId>, pub user_id: Option<UserId>,
pub json_body: serde_json::Value, pub json_body: serde_json::Value,
} }
impl<'a, T: Endpoint> FromData<'a> for Ruma<T> impl<'a, T: Endpoint> FromData<'a> for Ruma<T>
where
// We need to duplicate Endpoint's where clauses because the compiler is not smart enough yet.
// See https://github.com/rust-lang/rust/issues/54149
<T as Outgoing>::Incoming: TryFrom<http::Request<Vec<u8>>, Error = FromHttpRequestError>,
<T::Response as Outgoing>::Incoming: TryFrom<
http::Response<Vec<u8>>,
Error = FromHttpResponseError<<T as Endpoint>::ResponseError>,
>,
{ {
type Error = (); // TODO: Better error handling type Error = (); // TODO: Better error handling
type Owned = Data; type Owned = Data;
@ -95,7 +86,7 @@ where
let http_request = http_request.body(body.clone()).unwrap(); let http_request = http_request.body(body.clone()).unwrap();
log::info!("{:?}", http_request); log::info!("{:?}", http_request);
match T::Incoming::try_from(http_request) { match T::try_from(http_request) {
Ok(t) => Success(Ruma { Ok(t) => Success(Ruma {
body: t, body: t,
user_id, user_id,
@ -115,8 +106,8 @@ where
} }
} }
impl<T: Outgoing> Deref for Ruma<T> { impl<T> Deref for Ruma<T> {
type Target = T::Incoming; type Target = T;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.body &self.body

19
src/server_server.rs
Unescape Escape View File

@ -4,7 +4,7 @@ use log::error;
use rocket::{get, options, post, put, response::content::Json, State}; use rocket::{get, options, post, put, response::content::Json, State};
use ruma_api::{ use ruma_api::{
error::{FromHttpRequestError, FromHttpResponseError}, error::{FromHttpRequestError, FromHttpResponseError},
Endpoint, Outgoing, Endpoint,
}; };
use ruma_client_api::error::{Error, ErrorKind}; use ruma_client_api::error::{Error, ErrorKind};
use ruma_federation_api::{v1::get_server_version, v2::get_server_keys}; use ruma_federation_api::{v1::get_server_version, v2::get_server_keys};
@ -20,20 +20,11 @@ pub async fn send_request<T: Endpoint>(
data: &crate::Data, data: &crate::Data,
destination: String, destination: String,
request: T, request: T,
) -> Option<<T::Response as Outgoing>::Incoming> ) -> Option<T::Response>
where
// We need to duplicate Endpoint's where clauses because the compiler is not smart enough yet.
// See https://github.com/rust-lang/rust/issues/54149
<T as Outgoing>::Incoming: TryFrom<http::Request<Vec<u8>>, Error = FromHttpRequestError>,
<T::Response as Outgoing>::Incoming: TryFrom<
http::Response<Vec<u8>>,
Error = FromHttpResponseError<<T as Endpoint>::ResponseError>,
>,
T::Error: std::fmt::Debug,
{ {
let mut http_request: http::Request<_> = request.try_into().unwrap(); let mut http_request: http::Request<_> = request.try_into().unwrap();
*http_request.uri_mut() = ("https://".to_owned() + &destination.clone() + T::METADATA.path).parse().unwrap(); *http_request.uri_mut() = format!("https://{}:8448{}", &destination.clone(), T::METADATA.path).parse().unwrap();
let mut request_map = serde_json::Map::new(); let mut request_map = serde_json::Map::new();
@ -50,7 +41,7 @@ where
let mut request_json = request_map.into(); let mut request_json = request_map.into();
ruma_signatures::sign_json(data.hostname(), data.keypair(), dbg!(&mut request_json)).unwrap(); ruma_signatures::sign_json(data.hostname(), data.keypair(), dbg!(&mut request_json)).unwrap();
dbg!(&request_json); println!("{}", &request_json);
let signatures = request_json["signatures"] let signatures = request_json["signatures"]
.as_object() .as_object()
@ -101,7 +92,7 @@ where
.into_iter() .into_iter()
.collect(); .collect();
Some( Some(
<T::Response as Outgoing>::Incoming::try_from( <T::Response>::try_from(
dbg!(http_response.body(body)).unwrap(), dbg!(http_response.body(body)).unwrap(),
) )
.ok() .ok()

Write Preview
Loading…
Cancel
Save