X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Factivities%2Fmod.rs;h=02ad0b6b19e32f8bfbc99fa079842fd2d685301a;hb=5d23ef960e3361d1cc38c1aff1d907d8da58b90f;hp=d3400705dff5fc439e422d0416ed1fbc709c7adb;hpb=ec5e63b5a9b83c9dfde7ac8fa129e50c14555f15;p=lemmy.git diff --git a/crates/apub/src/activities/mod.rs b/crates/apub/src/activities/mod.rs index d3400705..02ad0b6b 100644 --- a/crates/apub/src/activities/mod.rs +++ b/crates/apub/src/activities/mod.rs @@ -1,25 +1,39 @@ use crate::{ - generate_moderators_url, - insert_activity, - local_instance, objects::{community::ApubCommunity, person::ApubPerson}, - ActorType, + protocol::activities::{create_or_update::page::CreateOrUpdatePage, CreateOrUpdateType}, CONTEXT, }; use activitypub_federation::{ - core::{activity_queue::send_activity, object_id::ObjectId}, - deser::context::WithContext, + activity_queue::send_activity, + config::Data, + fetch::object_id::ObjectId, + kinds::public, + protocol::context::WithContext, traits::{ActivityHandler, Actor}, }; -use activitystreams_kinds::public; use anyhow::anyhow; -use lemmy_api_common::utils::blocking; -use lemmy_db_schema::{newtypes::CommunityId, source::community::Community}; +use lemmy_api_common::{ + context::LemmyContext, + send_activity::{ActivityChannel, SendActivityData}, +}; +use lemmy_db_schema::{ + newtypes::CommunityId, + source::{ + activity::{SentActivity, SentActivityForm}, + community::Community, + instance::Instance, + }, +}; use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView}; -use lemmy_utils::error::LemmyError; -use lemmy_websocket::LemmyContext; +use lemmy_utils::{ + error::{LemmyError, LemmyErrorExt, LemmyErrorType, LemmyResult}, + spawn_try_task, + SYNCHRONOUS_FEDERATION, +}; +use moka::future::Cache; +use once_cell::sync::Lazy; use serde::Serialize; -use std::ops::Deref; +use std::{ops::Deref, sync::Arc, time::Duration}; use tracing::info; use url::{ParseError, Url}; use uuid::Uuid; @@ -29,22 +43,24 @@ pub mod community; pub mod create_or_update; pub mod deletion; pub mod following; +pub mod unfederated; pub mod voting; +/// Amount of time that the list of dead instances is cached. This is only updated once a day, +/// so there is no harm in caching it for a longer time. +pub static DEAD_INSTANCE_LIST_CACHE_DURATION: Duration = Duration::from_secs(30 * 60); + /// Checks that the specified Url actually identifies a Person (by fetching it), and that the person /// doesn't have a site ban. #[tracing::instrument(skip_all)] async fn verify_person( person_id: &ObjectId, - context: &LemmyContext, - request_counter: &mut i32, + context: &Data, ) -> Result<(), LemmyError> { - let person = person_id - .dereference(context, local_instance(context), request_counter) - .await?; + let person = person_id.dereference(context).await?; if person.banned { - let err = anyhow!("Person {} is banned", person_id); - return Err(LemmyError::from_error_message(err, "banned")); + return Err(anyhow!("Person {} is banned", person_id)) + .with_lemmy_type(LemmyErrorType::CouldntUpdateComment); } Ok(()) } @@ -55,21 +71,19 @@ async fn verify_person( pub(crate) async fn verify_person_in_community( person_id: &ObjectId, community: &ApubCommunity, - context: &LemmyContext, - request_counter: &mut i32, + context: &Data, ) -> Result<(), LemmyError> { - let person = person_id - .dereference(context, local_instance(context), request_counter) - .await?; + let person = person_id.dereference(context).await?; if person.banned { - return Err(LemmyError::from_message("Person is banned from site")); + return Err(LemmyErrorType::PersonIsBannedFromSite)?; } let person_id = person.id; let community_id = community.id; - let is_banned = - move |conn: &mut _| CommunityPersonBanView::get(conn, person_id, community_id).is_ok(); - if blocking(context.pool(), is_banned).await? { - return Err(LemmyError::from_message("Person is banned from community")); + let is_banned = CommunityPersonBanView::get(&mut context.pool(), person_id, community_id) + .await + .is_ok(); + if is_banned { + return Err(LemmyErrorType::PersonIsBannedFromCommunity)?; } Ok(()) @@ -85,17 +99,12 @@ pub(crate) async fn verify_mod_action( mod_id: &ObjectId, object_id: &Url, community_id: CommunityId, - context: &LemmyContext, - request_counter: &mut i32, + context: &Data, ) -> Result<(), LemmyError> { - let mod_ = mod_id - .dereference(context, local_instance(context), request_counter) - .await?; + let mod_ = mod_id.dereference(context).await?; - let is_mod_or_admin = blocking(context.pool(), move |conn| { - CommunityView::is_mod_or_admin(conn, mod_.id, community_id) - }) - .await?; + let is_mod_or_admin = + CommunityView::is_mod_or_admin(&mut context.pool(), mod_.id, community_id).await?; if is_mod_or_admin { return Ok(()); } @@ -107,33 +116,33 @@ pub(crate) async fn verify_mod_action( return Ok(()); } - Err(LemmyError::from_message("Not a mod")) + Err(LemmyErrorType::NotAModerator)? } -/// For Add/Remove community moderator activities, check that the target field actually contains -/// /c/community/moderators. Any different values are unsupported. -fn verify_add_remove_moderator_target( - target: &Url, - community: &ApubCommunity, -) -> Result<(), LemmyError> { - if target != &generate_moderators_url(&community.actor_id)?.into() { - return Err(LemmyError::from_message("Unkown target url")); +pub(crate) fn verify_is_public(to: &[Url], cc: &[Url]) -> Result<(), LemmyError> { + if ![to, cc].iter().any(|set| set.contains(&public())) { + return Err(LemmyErrorType::ObjectIsNotPublic)?; } Ok(()) } -pub(crate) fn verify_is_public(to: &[Url], cc: &[Url]) -> Result<(), LemmyError> { - if ![to, cc].iter().any(|set| set.contains(&public())) { - return Err(LemmyError::from_message("Object is not public")); +pub(crate) fn verify_community_matches( + a: &ObjectId, + b: T, +) -> Result<(), LemmyError> +where + T: Into>, +{ + let b: ObjectId = b.into(); + if a != &b { + return Err(LemmyErrorType::InvalidCommunity)?; } Ok(()) } pub(crate) fn check_community_deleted_or_removed(community: &Community) -> Result<(), LemmyError> { if community.deleted || community.removed { - Err(LemmyError::from_message( - "New post or comment cannot be created in deleted or removed community", - )) + Err(LemmyErrorType::CannotCreatePostOrCommentInDeletedOrRemovedCommunity)? } else { Ok(()) } @@ -156,31 +165,73 @@ where #[tracing::instrument(skip_all)] async fn send_lemmy_activity( - context: &LemmyContext, + data: &Data, activity: Activity, actor: &ActorT, - inbox: Vec, + mut inbox: Vec, sensitive: bool, ) -> Result<(), LemmyError> where - Activity: ActivityHandler + Serialize, - ActorT: Actor + ActorType, + Activity: ActivityHandler + Serialize + Send + Sync + Clone, + ActorT: Actor, Activity: ActivityHandler, { + static CACHE: Lazy>>> = Lazy::new(|| { + Cache::builder() + .max_capacity(1) + .time_to_live(DEAD_INSTANCE_LIST_CACHE_DURATION) + .build() + }); + let dead_instances = CACHE + .try_get_with((), async { + Ok::<_, diesel::result::Error>(Arc::new(Instance::dead_instances(&mut data.pool()).await?)) + }) + .await?; + + inbox.retain(|i| { + let domain = i.domain().expect("has domain").to_string(); + !dead_instances.contains(&domain) + }); info!("Sending activity {}", activity.id().to_string()); let activity = WithContext::new(activity, CONTEXT.deref().clone()); - let object_value = serde_json::to_value(&activity)?; - insert_activity(activity.id(), object_value, true, sensitive, context.pool()).await?; + let form = SentActivityForm { + ap_id: activity.id().clone().into(), + data: serde_json::to_value(activity.clone())?, + sensitive, + }; + SentActivity::create(&mut data.pool(), form).await?; + send_activity(activity, actor, inbox, data).await?; - send_activity( - activity, - actor.get_public_key(), - actor.private_key().expect("actor has private key"), - inbox, - local_instance(context), - ) - .await?; + Ok(()) +} +pub async fn handle_outgoing_activities(context: Data) -> LemmyResult<()> { + while let Some(data) = ActivityChannel::retrieve_activity().await { + match_outgoing_activities(data, &context.reset_request_count()).await? + } + Ok(()) +} + +pub async fn match_outgoing_activities( + data: SendActivityData, + context: &Data, +) -> LemmyResult<()> { + let fed_task = match data { + SendActivityData::CreatePost(post) => { + let creator_id = post.creator_id; + CreateOrUpdatePage::send( + post, + creator_id, + CreateOrUpdateType::Create, + context.reset_request_count(), + ) + } + }; + if *SYNCHRONOUS_FEDERATION { + fed_task.await?; + } else { + spawn_try_task(fed_task); + } Ok(()) }