|
|
|
@ -11,10 +11,7 @@ use {
|
|
|
|
|
crate::{server_server, utils},
|
|
|
|
|
log::{debug, warn},
|
|
|
|
|
rocket::{
|
|
|
|
|
data::{
|
|
|
|
|
ByteUnit, Data, FromDataFuture, FromTransformedData, Transform, TransformFuture,
|
|
|
|
|
Transformed,
|
|
|
|
|
},
|
|
|
|
|
data::{self, ByteUnit, Data, FromData},
|
|
|
|
|
http::Status,
|
|
|
|
|
outcome::Outcome::*,
|
|
|
|
|
response::{self, Responder},
|
|
|
|
@ -42,29 +39,15 @@ pub struct Ruma<T: Outgoing> {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[cfg(feature = "conduit_bin")]
|
|
|
|
|
impl<'a, T: Outgoing> FromTransformedData<'a> for Ruma<T>
|
|
|
|
|
#[rocket::async_trait]
|
|
|
|
|
impl<'a, T: Outgoing> FromData<'a> for Ruma<T>
|
|
|
|
|
where
|
|
|
|
|
T::Incoming: IncomingRequest,
|
|
|
|
|
{
|
|
|
|
|
type Error = ();
|
|
|
|
|
type Owned = Data;
|
|
|
|
|
type Borrowed = Self::Owned;
|
|
|
|
|
|
|
|
|
|
fn transform<'r>(
|
|
|
|
|
_req: &'r Request<'_>,
|
|
|
|
|
data: Data,
|
|
|
|
|
) -> TransformFuture<'r, Self::Owned, Self::Error> {
|
|
|
|
|
Box::pin(async move { Transform::Owned(Success(data)) })
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn from_data(
|
|
|
|
|
request: &'a Request<'_>,
|
|
|
|
|
outcome: Transformed<'a, Self>,
|
|
|
|
|
) -> FromDataFuture<'a, Self, Self::Error> {
|
|
|
|
|
async fn from_data(request: &'a Request<'_>, data: Data) -> data::Outcome<Self, Self::Error> {
|
|
|
|
|
let metadata = T::Incoming::METADATA;
|
|
|
|
|
|
|
|
|
|
Box::pin(async move {
|
|
|
|
|
let data = rocket::try_outcome!(outcome.owned());
|
|
|
|
|
let db = request
|
|
|
|
|
.guard::<State<'_, crate::Database>>()
|
|
|
|
|
.await
|
|
|
|
@ -75,15 +58,15 @@ where
|
|
|
|
|
.headers()
|
|
|
|
|
.get_one("Authorization")
|
|
|
|
|
.map(|s| s[7..].to_owned()) // Split off "Bearer "
|
|
|
|
|
.or_else(|| request.get_query_value("access_token").and_then(|r| r.ok()));
|
|
|
|
|
.or_else(|| request.query_value("access_token").and_then(|r| r.ok()));
|
|
|
|
|
|
|
|
|
|
let limit = db.globals.max_request_size();
|
|
|
|
|
let mut handle = data.open(ByteUnit::Byte(limit.into()));
|
|
|
|
|
let mut body = Vec::new();
|
|
|
|
|
handle.read_to_end(&mut body).await.unwrap();
|
|
|
|
|
|
|
|
|
|
let (sender_user, sender_device, from_appservice) = if let Some((_id, registration)) =
|
|
|
|
|
db.appservice
|
|
|
|
|
let (sender_user, sender_device, from_appservice) = if let Some((_id, registration)) = db
|
|
|
|
|
.appservice
|
|
|
|
|
.iter_all()
|
|
|
|
|
.filter_map(|r| r.ok())
|
|
|
|
|
.find(|(_id, registration)| {
|
|
|
|
@ -94,7 +77,7 @@ where
|
|
|
|
|
}) {
|
|
|
|
|
match metadata.authentication {
|
|
|
|
|
AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
|
|
|
|
|
let user_id = request.get_query_value::<String>("user_id").map_or_else(
|
|
|
|
|
let user_id = request.query_value::<String>("user_id").map_or_else(
|
|
|
|
|
|| {
|
|
|
|
|
UserId::parse_with_server_name(
|
|
|
|
|
registration
|
|
|
|
@ -217,15 +200,16 @@ where
|
|
|
|
|
"uri".to_owned(),
|
|
|
|
|
CanonicalJsonValue::String(request.uri().to_string()),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
println!("{}: {:?}", origin, request.uri().to_string());
|
|
|
|
|
|
|
|
|
|
request_map.insert(
|
|
|
|
|
"origin".to_owned(),
|
|
|
|
|
CanonicalJsonValue::String(origin.as_str().to_owned()),
|
|
|
|
|
);
|
|
|
|
|
request_map.insert(
|
|
|
|
|
"destination".to_owned(),
|
|
|
|
|
CanonicalJsonValue::String(
|
|
|
|
|
db.globals.server_name().as_str().to_owned(),
|
|
|
|
|
),
|
|
|
|
|
CanonicalJsonValue::String(db.globals.server_name().as_str().to_owned()),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let mut origin_signatures = BTreeMap::new();
|
|
|
|
@ -265,10 +249,7 @@ where
|
|
|
|
|
match ruma::signatures::verify_json(&pub_key_map, &request_map) {
|
|
|
|
|
Ok(()) => (None, None, false),
|
|
|
|
|
Err(e) => {
|
|
|
|
|
warn!(
|
|
|
|
|
"Failed to verify json request: {}: {:?} {:?}",
|
|
|
|
|
e, pub_key_map, request_map
|
|
|
|
|
);
|
|
|
|
|
warn!("Failed to verify json request from {}: {}", origin, e,);
|
|
|
|
|
|
|
|
|
|
// Forbidden
|
|
|
|
|
return Failure((Status::raw(580), ()));
|
|
|
|
@ -304,7 +285,6 @@ where
|
|
|
|
|
Failure((Status::raw(583), ()))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|