use async_trait::async_trait;
use lemmy_api_common::context::LemmyContext;
use lemmy_db_schema::{
- source::{
- activity::{Activity, ActivityInsertForm},
- instance::Instance,
- local_site::LocalSite,
- },
- traits::Crud,
+ source::{activity::ReceivedActivity, instance::Instance, local_site::LocalSite},
utils::{ActualDbPool, DbPool},
};
use lemmy_utils::error::{LemmyError, LemmyErrorType, LemmyResult};
use moka::future::Cache;
use once_cell::sync::Lazy;
-use serde::Serialize;
use std::{sync::Arc, time::Duration};
use url::Url;
let local_site_data = local_site_data_cached(&mut (&self.0).into())
.await
.expect("read local site data");
- check_apub_id_valid(url, &local_site_data)?;
+ check_apub_id_valid(url, &local_site_data).map_err(|err| match err {
+ LemmyError {
+ error_type: LemmyErrorType::FederationDisabled,
+ ..
+ } => "Federation disabled",
+ LemmyError {
+ error_type: LemmyErrorType::DomainBlocked(_),
+ ..
+ } => "Domain is blocked",
+ LemmyError {
+ error_type: LemmyErrorType::DomainNotInAllowList(_),
+ ..
+ } => "Domain is not in allowlist",
+ _ => "Failed validating apub id",
+ })?;
Ok(())
}
}
/// - URL being in the allowlist (if it is active)
/// - URL not being in the blocklist (if it is active)
#[tracing::instrument(skip(local_site_data))]
-fn check_apub_id_valid(apub_id: &Url, local_site_data: &LocalSiteData) -> Result<(), &'static str> {
+fn check_apub_id_valid(apub_id: &Url, local_site_data: &LocalSiteData) -> Result<(), LemmyError> {
let domain = apub_id.domain().expect("apud id has domain").to_string();
if !local_site_data
.map(|l| l.federation_enabled)
.unwrap_or(true)
{
- return Err("Federation disabled");
+ Err(LemmyErrorType::FederationDisabled)?;
}
if local_site_data
.iter()
.any(|i| domain.eq(&i.domain))
{
- return Err("Domain is blocked");
+ Err(LemmyErrorType::DomainBlocked(domain.clone()))?;
}
// Only check this if there are instances in the allowlist
.iter()
.any(|i| domain.eq(&i.domain))
{
- return Err("Domain is not in allowlist");
+ Err(LemmyErrorType::DomainNotInAllowList(domain))?;
}
Ok(())
}
let local_site_data = local_site_data_cached(&mut context.pool()).await?;
- check_apub_id_valid(apub_id, &local_site_data).map_err(|err| match err {
- "Federation disabled" => LemmyErrorType::FederationDisabled,
- "Domain is blocked" => LemmyErrorType::DomainBlocked,
- "Domain is not in allowlist" => LemmyErrorType::DomainNotInAllowList,
- _ => panic!("Could not handle apub error!"),
- })?;
+ check_apub_id_valid(apub_id, &local_site_data)?;
// Only check allowlist if this is a community, and there are instances in the allowlist
if is_strict && !local_site_data.allowed_instances.is_empty() {
Ok(())
}
-/// Store a sent or received activity in the database.
+/// Store received activities in the database.
///
-/// Stored activities are served over the HTTP endpoint `GET /activities/{type_}/{id}`. This also
-/// ensures that the same activity cannot be received more than once.
-#[tracing::instrument(skip(data, activity))]
-async fn insert_activity<T>(
+/// This ensures that the same activity doesnt get received and processed more than once, which
+/// would be a waste of resources.
+#[tracing::instrument(skip(data))]
+async fn insert_received_activity(
ap_id: &Url,
- activity: &T,
- local: bool,
- sensitive: bool,
data: &Data<LemmyContext>,
-) -> Result<(), LemmyError>
-where
- T: Serialize,
-{
- let ap_id = ap_id.clone().into();
- let form = ActivityInsertForm {
- ap_id,
- data: serde_json::to_value(activity)?,
- local: Some(local),
- sensitive: Some(sensitive),
- updated: None,
- };
- Activity::create(&mut data.pool(), &form).await?;
+) -> Result<(), LemmyError> {
+ ReceivedActivity::create(&mut data.pool(), &ap_id.clone().into()).await?;
Ok(())
}