mirrors/buzzrelay
1
0
Fork 0
mirror of https://github.com/astro/buzzrelay.git synced 2024-11-25 05:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

main: validate remote_actor only for Follow and Undo

Browse source
This commit is contained in:
Astro 2023-12-21 01:59:44 +01:00
parent d6cf1a6a51
commit f8708ab22e
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/endpoint.rs
View file

@ -120,6 +120,7 @@ impl<'a> Endpoint<'a> {
let public_key = PublicKey::from_pem(remote_actor.public_key.pem.as_bytes())?; let public_key = PublicKey::from_pem(remote_actor.public_key.pem.as_bytes())?;
if ! (self.signature.verify(&public_key)?) { if ! (self.signature.verify(&public_key)?) {
tracing::error!("Cannot verify signature for {}: {:?}", self.remote_actor_uri, self.payload);
return Err(Error::SignatureFail(self.remote_actor_uri.clone())); return Err(Error::SignatureFail(self.remote_actor_uri.clone()));
} }

26
src/main.rs
View file

@ -150,18 +150,6 @@ async fn post_relay(
endpoint: endpoint::Endpoint<'_>, endpoint: endpoint::Endpoint<'_>,
target: actor::Actor target: actor::Actor
) -> Response { ) -> Response {
let remote_actor = match endpoint.remote_actor(&state.client, &state.actor_cache, target.key_id(), state.priv_key.clone()).await {
Ok(remote_actor) => remote_actor,
Err(e) => {
track_request("POST", "relay", "bad_actor");
tracing::error!("post_relay bad actor: {e:?}");
return (
StatusCode::BAD_REQUEST,
format!("Bad actor: {:?}", e)
).into_response();
}
};
if let Some((redis, in_topic)) = &state.redis { if let Some((redis, in_topic)) = &state.redis {
if let Ok(data) = serde_json::to_vec(&endpoint.payload) { if let Ok(data) = serde_json::to_vec(&endpoint.payload) {
if let Err(e) = redis::Cmd::publish(in_topic.as_ref(), data) if let Err(e) = redis::Cmd::publish(in_topic.as_ref(), data)
@ -173,6 +161,14 @@ async fn post_relay(
} }
} }
let remote_actor = endpoint.remote_actor(&state.client, &state.actor_cache, target.key_id(), state.priv_key.clone())
.await
.map_err(|e| {
track_request("POST", "relay", "bad_actor");
tracing::error!("post_relay bad actor: {e:?}");
e
});
let action = match serde_json::from_value::<activitypub::Action<serde_json::Value>>(endpoint.payload.clone()) { let action = match serde_json::from_value::<activitypub::Action<serde_json::Value>>(endpoint.payload.clone()) {
Ok(action) => action, Ok(action) => action,
Err(e) => { Err(e) => {
@ -189,6 +185,9 @@ async fn post_relay(
.and_then(|object_type| object_type.as_str().map(std::string::ToString::to_string)); .and_then(|object_type| object_type.as_str().map(std::string::ToString::to_string));
if action.action_type == "Follow" { if action.action_type == "Follow" {
let Ok(remote_actor) = remote_actor else {
return (StatusCode::BAD_REQUEST, "Invalid actor").into_response();
};
let priv_key = state.priv_key.clone(); let priv_key = state.priv_key.clone();
let client = state.client.clone(); let client = state.client.clone();
tokio::spawn(async move { tokio::spawn(async move {
@ -241,6 +240,9 @@ async fn post_relay(
"{}" "{}"
).into_response() ).into_response()
} else if action.action_type == "Undo" && object_type == Some("Follow".to_string()) { } else if action.action_type == "Undo" && object_type == Some("Follow".to_string()) {
let Ok(remote_actor) = remote_actor else {
return (StatusCode::BAD_REQUEST, "Invalid actor").into_response();
};
match state.database.del_follow( match state.database.del_follow(
&remote_actor.id, &remote_actor.id,
&target.uri(), &target.uri(),