Gabriel Kaszewski
b569efe715
Error handling:
thiserror enum (NotFound/BadRequest/Unauthorized/Forbidden/Internal)
eliminates 41 boilerplate .map_err() calls
signature failures return 401, not 500
Named types:
Keypair, LocalObject (with to/cc/bto/bcc addressing), Addressing
Readability:
descriptive names everywhere, small functions, breathing room
noisy comments removed, intent-explicit error handling (no let _ =)
types.rs per module separating data from behavior
File organization:
handlers/ module (actor, featured, followers, inbox, nodeinfo, outbox, webfinger)
actors/ split (mod.rs + person.rs + types.rs)
service/ split (builder, broadcast, collections, delivery, fetch, follow, lookup, types)
tests next to modules
Repository traits:
FollowRepository → 5 sub-traits (FollowerWriter/Reader, FollowingWriter/Reader, FollowMigration)
ActorRepository → 3 sub-traits (KeypairRepository, RemoteActorCache, AnnounceRepository)
BlocklistRepository → 2 sub-traits (DomainBlocklist, ActorBlocklist)
supertraits with blanket impls — existing consumers unchanged
FollowMigration has default no-op
delete dead get_following_outbox_url
Testing:
mock_repo! macro generates mock builders from compact specs
MockFollowRepo, MockActorRepo, MockBlocklistRepo, MockActivityRepo,
MockUserRepo, MockContentReader, MockObjectHandler, MockEventPublisher
all hand-written test stubs replaced
Flexibility:
UrlScheme trait — configurable URL patterns (DefaultUrlScheme = /users/{uuid})
on_unknown_activity hook for custom AP extensions
broadcast_raw_to_followers for arbitrary activity JSON
broadcast_create/broadcast_update (renamed from Note-centric names)
internal modules locked to pub(crate), clean public re-exports
actor_handler, followers_handler, following_handler re-exported for custom routers
Security:
SSRF: block IPv6-mapped private IPv4, TEST-NET, benchmarking, reserved ranges
verify_attributed_to rejects missing/array attributedTo
remove .expect() from outbox handler
Architecture:
handlers/followers.rs delegates to serialize_ordered_collection (no more UrlScheme bypass)
extract dispatch_sends, prepare_addressed_broadcast (eliminate duplication)
DbActor::object_id(), RemoteActor::from/from_ap_person/placeholder
send_activity unifies prepare+dispatch, deterministic_activity_id helper
pass-through wrappers grouped in lookup.rs
92 lines
3.1 KiB
Rust
92 lines
3.1 KiB
Rust
use activitypub_federation::{
|
|
config::Data, fetch::object_id::ObjectId, kinds::activity::DeleteType, traits::Activity,
|
|
};
|
|
use serde::{Deserialize, Serialize};
|
|
use url::Url;
|
|
|
|
use crate::actors::DbActor;
|
|
use crate::data::FederationData;
|
|
use crate::error::Error;
|
|
|
|
use super::helpers::check_guards;
|
|
|
|
#[derive(Debug, Deserialize, Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct DeleteActivity {
|
|
pub(crate) id: Url,
|
|
#[serde(rename = "type", default)]
|
|
pub(crate) kind: DeleteType,
|
|
pub(crate) actor: ObjectId<DbActor>,
|
|
pub(crate) object: serde_json::Value,
|
|
#[serde(skip_serializing_if = "Vec::is_empty", default)]
|
|
pub(crate) to: Vec<String>,
|
|
#[serde(skip_serializing_if = "Vec::is_empty", default)]
|
|
pub(crate) cc: Vec<String>,
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl Activity for DeleteActivity {
|
|
type DataType = FederationData;
|
|
type Error = Error;
|
|
|
|
fn id(&self) -> &Url {
|
|
&self.id
|
|
}
|
|
fn actor(&self) -> &Url {
|
|
self.actor.inner()
|
|
}
|
|
|
|
async fn verify(&self, _data: &Data<Self::DataType>) -> Result<(), Self::Error> {
|
|
let actor_domain = self.actor.inner().host_str().unwrap_or("");
|
|
let object_domain = match &self.object {
|
|
serde_json::Value::String(s) => Url::parse(s)
|
|
.ok()
|
|
.and_then(|u| u.host_str().map(|h| h.to_string()))
|
|
.unwrap_or_default(),
|
|
serde_json::Value::Object(o) => o
|
|
.get("id")
|
|
.and_then(|v| v.as_str())
|
|
.and_then(|s| Url::parse(s).ok())
|
|
.and_then(|u| u.host_str().map(|h| h.to_string()))
|
|
.unwrap_or_default(),
|
|
_ => String::new(),
|
|
};
|
|
if !object_domain.is_empty() && actor_domain != object_domain {
|
|
return Err(Error::bad_request(
|
|
"Delete actor domain does not match object domain",
|
|
));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
async fn receive(self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
|
|
if check_guards(&self.id, self.actor.inner(), data).await? {
|
|
return Ok(());
|
|
}
|
|
let actor_url = self.actor.inner().clone();
|
|
let object_url_str = match &self.object {
|
|
serde_json::Value::String(s) => s.clone(),
|
|
serde_json::Value::Object(o) => o
|
|
.get("id")
|
|
.and_then(|v| v.as_str())
|
|
.map(|s| s.to_string())
|
|
.unwrap_or_default(),
|
|
_ => String::new(),
|
|
};
|
|
let Ok(object_url) = Url::parse(&object_url_str) else {
|
|
tracing::warn!(actor = %actor_url, "Delete has unparseable object, ignoring");
|
|
return Ok(());
|
|
};
|
|
if object_url == *self.actor.inner() {
|
|
data.object_handler.on_actor_removed(&actor_url).await?;
|
|
tracing::info!(actor = %actor_url, "received Delete(actor) — remote account deleted");
|
|
return Ok(());
|
|
}
|
|
data.object_handler
|
|
.on_delete(&object_url, &actor_url)
|
|
.await?;
|
|
tracing::info!(object = %object_url, "received Delete(note)");
|
|
Ok(())
|
|
}
|
|
}
|