nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

More work on federation

Browse source
This commit is contained in:
timokoesters 2020-04-22 20:55:11 +02:00
parent b0d9ccdb2d
commit 1af6dd984a
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
5 changed files with 91 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/server_server.rs
View file

@ -1,10 +1,20 @@
use log::error;
use crate::{utils, Data, MatrixResult, Ruma};
use http::header::{HeaderValue, AUTHORIZATION};
use log::error;
use rocket::{get, options, post, put, response::content::Json, State};
use ruma_api::{
error::{FromHttpRequestError, FromHttpResponseError},
Endpoint, Outgoing,
};
use std::convert::{TryFrom, TryInto};
use ruma_client_api::error::{Error, ErrorKind};
use ruma_federation_api::{v1::get_server_version, v2::get_server_keys};
use serde_json::json;
use std::{
collections::{BTreeMap, HashMap},
convert::{TryFrom, TryInto},
path::PathBuf,
time::{Duration, SystemTime},
};
pub async fn send_request<T: Endpoint>(
data: &crate::Data,
@ -39,7 +49,7 @@ where
request_map.insert("origin".to_owned(), data.hostname().into());
request_map.insert("destination".to_owned(), destination.to_string().into());
ruma_signatures::sign_json(data.hostname(), data.keypair(), dbg!(&mut request_json)).unwrap();
ruma_signatures::sign_json(data.hostname(), data.keypair(), &mut request_json).unwrap();
let signatures = request_json["signatures"]
.as_object()
.unwrap()
@ -52,7 +62,16 @@ where
.map(|(k, v)| (k, v.as_str().unwrap()));
for s in signatures {
http_request.headers_mut().insert(AUTHORIZATION, HeaderValue::from_str(dbg!(&format!("X-Matrix origin={},key=\"{}\",sig=\"{}\"", data.hostname(), s.0, s.1))).unwrap());
http_request.headers_mut().insert(
AUTHORIZATION,
HeaderValue::from_str(&format!(
"X-Matrix origin={},key=\"{}\",sig=\"{}\"",
data.hostname(),
s.0,
s.1
))
.unwrap(),
);
}
let reqwest_response = data
@ -79,7 +98,13 @@ where
.unwrap()
.into_iter()
.collect();
Some(<T::Response as Outgoing>::Incoming::try_from(dbg!(http_response.body(body).unwrap())).ok().unwrap())
Some(
<T::Response as Outgoing>::Incoming::try_from(
dbg!(http_response.body(body)).unwrap(),
)
.ok()
.unwrap(),
)
}
Err(e) => {
println!("ERROR: {}", e);
@ -87,3 +112,54 @@ where
}
}
}
#[get("/.well-known/matrix/server")]
pub fn well_known_server(data: State<Data>) -> Json<String> {
rocket::response::content::Json(
json!({ "m.server": "matrixtesting.koesters.xyz:14004"}).to_string(),
)
}
#[get("/_matrix/federation/v1/version")]
pub fn get_server_version(data: State<Data>) -> MatrixResult<get_server_version::Response, Error> {
MatrixResult(Ok(get_server_version::Response {
server: get_server_version::Server {
name: Some("Conduit".to_owned()),
version: Some(env!("CARGO_PKG_VERSION").to_owned()),
},
}))
}
#[get("/_matrix/key/v2/server", data = "<body>")]
pub fn get_server_keys(data: State<Data>, body: Ruma<get_server_keys::Request>) -> Json<String> {
let mut verify_keys = BTreeMap::new();
verify_keys.insert(
format!("ed25519:{}", data.keypair().version()),
get_server_keys::VerifyKey {
key: base64::encode_config(data.keypair().public_key(), base64::STANDARD_NO_PAD),
},
);
let mut response = serde_json::from_slice(
http::Response::try_from(get_server_keys::Response {
server_name: data.hostname().to_owned(),
verify_keys,
old_verify_keys: BTreeMap::new(),
signatures: BTreeMap::new(),
valid_until_ts: SystemTime::now() + Duration::from_secs(60 * 60 * 24),
})
.unwrap()
.body(),
)
.unwrap();
ruma_signatures::sign_json(data.hostname(), data.keypair(), &mut response).unwrap();
Json(dbg!(response.to_string()))
}
#[get("/_matrix/key/v2/server/<_key_id>", data = "<body>")]
pub fn get_server_keys_deprecated(
data: State<Data>,
body: Ruma<get_server_keys::Request>,
_key_id: String,
) -> Json<String> {
get_server_keys(data, body)
}