@ -1,16 +1,15 @@
use crate ::{ Database, Matrix Result} ;
use crate ::{ ConduitResult, Database , Result} ;
use http ::header ::{ HeaderValue , AUTHORIZATION } ;
use log ::error ;
use rocket ::{ get , response ::content ::Json , State } ;
use ruma ::api ::Endpoint ;
use ruma ::api ::client ::error ::Error ;
use ruma ::api ::federation ::discovery ::{
get_server_keys ::v2 as get_server_keys , get_server_version ::v1 as get_server_version ,
get_server_keys , get_server_version ::v1 as get_server_version , ServerKey , VerifyKey ,
} ;
use ruma ::api ::OutgoingRequest ;
use serde_json ::json ;
use std ::{
collections ::BTreeMap ,
convert ::TryFrom ,
fmt ::Debug ,
time ::{ Duration , SystemTime } ,
} ;
@ -33,36 +32,51 @@ pub async fn request_well_known(db: &crate::Database, destination: &str) -> Opti
Some ( body . get ( "m.server" ) ? . as_str ( ) ? . to_owned ( ) )
}
pub async fn send_request < T : Endpoin t> (
pub async fn send_request < T : OutgoingReques t> (
db : & crate ::Database ,
destination : String ,
request : T ,
) -> Option < T ::Response > {
let mut http_request : http ::Request < _ > = request . try_into ( ) . unwrap ( ) ;
) -> Result < T ::IncomingResponse >
where
T : Debug ,
{
let actual_destination = "https://" . to_owned ( )
+ & request_well_known ( db , & destination )
. await
. unwrap_or ( destination . clone ( ) + ":8448" ) ;
* http_request . uri_mut ( ) = ( actual_destination + T ::METADATA . path ) . parse ( ) . unwrap ( ) ;
let mut http_request = request
. try_into_http_request ( & actual_destination , Some ( "" ) )
. unwrap ( ) ;
let mut request_map = serde_json ::Map ::new ( ) ;
if ! http_request . body ( ) . is_empty ( ) {
request_map . insert (
"content" . to_owned ( ) ,
serde_json ::to_valu e( http_request . body ( ) ) . unwrap ( ) ,
serde_json ::from_slic e( http_request . body ( ) ) . unwrap ( ) ,
) ;
} ;
request_map . insert ( "method" . to_owned ( ) , T ::METADATA . method . to_string ( ) . into ( ) ) ;
request_map . insert ( "uri" . to_owned ( ) , T ::METADATA . path . into ( ) ) ;
request_map . insert ( "origin" . to_owned ( ) , db . globals . server_name ( ) . into ( ) ) ;
request_map . insert (
"uri" . to_owned ( ) ,
http_request
. uri ( )
. path_and_query ( )
. expect ( "all requests have a path" )
. to_string ( )
. into ( ) ,
) ;
request_map . insert (
"origin" . to_owned ( ) ,
db . globals . server_name ( ) . as_str ( ) . into ( ) ,
) ;
request_map . insert ( "destination" . to_owned ( ) , destination . into ( ) ) ;
let mut request_json = request_map . into ( ) ;
ruma ::signatures ::sign_json (
db . globals . server_name ( ) ,
db . globals . server_name ( ) .as_str ( ) ,
db . globals . keypair ( ) ,
& mut request_json ,
)
@ -72,31 +86,32 @@ pub async fn send_request<T: Endpoint>(
. as_object ( )
. unwrap ( )
. values ( )
. next ( )
. unwrap ( )
. as_object ( )
. unwrap ( )
. iter ( )
. map ( | ( k , v ) | ( k , v . as_str ( ) . unwrap ( ) ) ) ;
for s in signatures {
http_request . headers_mut ( ) . insert (
AUTHORIZATION ,
HeaderValue ::from_str ( & format! (
"X-Matrix origin={},key=\"{}\",sig=\"{}\"" ,
db . globals . server_name ( ) ,
s . 0 ,
s . 1
) )
. unwrap ( ) ,
) ;
. map ( | v | {
v . as_object ( )
. unwrap ( )
. iter ( )
. map ( | ( k , v ) | ( k , v . as_str ( ) . unwrap ( ) ) )
} ) ;
for signature_server in signatures {
for s in signature_server {
http_request . headers_mut ( ) . insert (
AUTHORIZATION ,
HeaderValue ::from_str ( & format! (
"X-Matrix origin={},key=\"{}\",sig=\"{}\"" ,
db . globals . server_name ( ) ,
s . 0 ,
s . 1
) )
. unwrap ( ) ,
) ;
}
}
let reqwest_response = db
. globals
. reqwest_client ( )
. execute ( http_request . into ( ) )
. await ;
let reqwest_request = reqwest ::Request ::try_from ( http_request )
. expect ( "all http requests are valid reqwest requests" ) ;
let reqwest_response = db . globals . reqwest_client ( ) . execute ( reqwest_request ) . await ;
// Because reqwest::Response -> http::Response is complicated:
match reqwest_response {
@ -117,59 +132,56 @@ pub async fn send_request<T: Endpoint>(
. unwrap ( )
. into_iter ( )
. collect ( ) ;
Some (
< T ::Response > ::try_from ( http_response . body ( body ) . unwrap ( ) )
. ok ( )
. unwrap ( ) ,
Ok (
T ::IncomingResponse ::try_from ( http_response . body ( body ) . unwrap ( ) )
. expect ( "TODO: error handle other server errors" ) ,
)
}
Err ( e ) = > {
error ! ( "{}" , e ) ;
None
}
Err ( e ) = > Err ( e . into ( ) ) ,
}
}
#[ cfg_attr(feature = " conduit_bin " , get(" /.well-known/matrix/server " )) ]
#[ cfg_attr(feature = " conduit_bin " , get(" /.well-known/matrix/server " )) ]
pub fn well_known_server ( ) -> Json < String > {
rocket ::response ::content ::Json (
json ! ( { "m.server" : "matrixtesting.koesters.xyz:14004" } ) . to_string ( ) ,
)
rocket ::response ::content ::Json ( json ! ( { "m.server" : "pc.koesters.xyz:59003" } ) . to_string ( ) )
}
#[ cfg_attr(feature = " conduit_bin " , get(" /_matrix/federation/v1/version " )) ]
pub fn get_server_version ( ) -> Matrix Result< get_server_version ::Response , Error > {
MatrixResult ( Ok ( get_server_version ::Response {
#[ cfg_attr(feature = " conduit_bin " , get(" /_matrix/federation/v1/version " )) ]
pub fn get_server_version ( ) -> Conduit Result< get_server_version ::Response > {
Ok ( get_server_version ::Response {
server : Some ( get_server_version ::Server {
name : Some ( "Conduit" . to_owned ( ) ) ,
version : Some ( env! ( "CARGO_PKG_VERSION" ) . to_owned ( ) ) ,
} ) ,
} ) )
}
. into ( ) )
}
#[ cfg_attr(feature = " conduit_bin " , get(" /_matrix/key/v2/server " )) ]
#[ cfg_attr(feature = " conduit_bin " , get(" /_matrix/key/v2/server " )) ]
pub fn get_server_keys ( db : State < ' _ , Database > ) -> Json < String > {
let mut verify_keys = BTreeMap ::new ( ) ;
verify_keys . insert (
format! ( "ed25519:{}" , db . globals . keypair ( ) . version ( ) ) ,
get_server_keys:: VerifyKey {
{
key : base64 ::encode_config ( db . globals . keypair ( ) . public_key ( ) , base64 ::STANDARD_NO_PAD ) ,
} ,
) ;
let mut response = serde_json ::from_slice (
http ::Response ::try_from ( get_server_keys ::Response {
server_name : db . globals . server_name ( ) . to_owned ( ) ,
verify_keys ,
old_verify_keys : BTreeMap ::new ( ) ,
signatures : BTreeMap ::new ( ) ,
valid_until_ts : SystemTime ::now ( ) + Duration ::from_secs ( 60 * 2 ) ,
http ::Response ::try_from ( get_server_keys ::v2 ::Response {
server_key : ServerKey {
server_name : db . globals . server_name ( ) . to_owned ( ) ,
verify_keys ,
old_verify_keys : BTreeMap ::new ( ) ,
signatures : BTreeMap ::new ( ) ,
valid_until_ts : SystemTime ::now ( ) + Duration ::from_secs ( 60 * 2 ) ,
} ,
} )
. unwrap ( )
. body ( ) ,
)
. unwrap ( ) ;
ruma ::signatures ::sign_json (
db . globals . server_name ( )
db . globals . server_name ( ) .as_str ( ) ,
db . globals . keypair ( ) ,
& mut response ,
)
@ -177,7 +189,7 @@ pub fn get_server_keys(db: State<'_, Database>) -> Json<String> {
Json ( response . to_string ( ) )
}
#[ cfg_attr(feature = " conduit_bin " , get(" /_matrix/key/v2/server/<_ key_id >" )) ]
pub fn get_server_keys_deprecated ( db : State < ' _ , Database > , _key_id : String ) -> Json < String > {
#[ cfg_attr(feature = " conduit_bin " , get(" /_matrix/key/v2/server/<_ >" )) ]
pub fn get_server_keys_deprecated ( db : State < ' _ , Database > -> Json < String > {
get_server_keys ( db )
}
Timo
4 years ago