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