X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fobjects%2Fperson.rs;h=2c238fb56c309d4c23accaa81633e06f4190fae6;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=b1a892a321244ee9788ea732b98f5977e00eef62;hpb=c9f140742925d6da20103124b49f2b58a35fc2b8;p=lemmy.git diff --git a/crates/apub/src/objects/person.rs b/crates/apub/src/objects/person.rs index b1a892a3..2c238fb5 100644 --- a/crates/apub/src/objects/person.rs +++ b/crates/apub/src/objects/person.rs @@ -1,6 +1,6 @@ use crate::{ check_apub_id_valid_with_strictness, - generate_outbox_url, + local_site_data_cached, objects::{instance::fetch_instance_actor_for_object, read_from_string_or_source_opt}, protocol::{ objects::{ @@ -10,30 +10,35 @@ use crate::{ ImageObject, Source, }, - ActorType, }; use activitypub_federation::{ - core::object_id::ObjectId, - traits::{Actor, ApubObject}, - utils::verify_domains_match, + config::Data, + protocol::verification::verify_domains_match, + traits::{Actor, Object}, }; use chrono::NaiveDateTime; -use lemmy_api_common::utils::blocking; +use lemmy_api_common::{ + context::LemmyContext, + utils::{generate_outbox_url, local_site_opt_to_slur_regex, sanitize_html, sanitize_html_opt}, +}; use lemmy_db_schema::{ - source::person::{Person as DbPerson, PersonForm}, - traits::ApubActor, + source::person::{Person as DbPerson, PersonInsertForm, PersonUpdateForm}, + traits::{ApubActor, Crud}, utils::naive_now, }; use lemmy_utils::{ error::LemmyError, - utils::{check_slurs, check_slurs_opt, convert_datetime, markdown_to_html}, + utils::{ + markdown::markdown_to_html, + slurs::{check_slurs, check_slurs_opt}, + time::convert_datetime, + }, }; -use lemmy_websocket::LemmyContext; use std::ops::Deref; use url::Url; #[derive(Clone, Debug, PartialEq, Eq)] -pub struct ApubPerson(DbPerson); +pub struct ApubPerson(pub(crate) DbPerson); impl Deref for ApubPerson { type Target = DbPerson; @@ -48,11 +53,10 @@ impl From for ApubPerson { } } -#[async_trait::async_trait(?Send)] -impl ApubObject for ApubPerson { +#[async_trait::async_trait] +impl Object for ApubPerson { type DataType = LemmyContext; - type ApubType = Person; - type DbType = DbPerson; + type Kind = Person; type Error = LemmyError; fn last_refreshed_at(&self) -> Option { @@ -60,30 +64,26 @@ impl ApubObject for ApubPerson { } #[tracing::instrument(skip_all)] - async fn read_from_apub_id( + async fn read_from_id( object_id: Url, - context: &LemmyContext, + context: &Data, ) -> Result, LemmyError> { Ok( - blocking(context.pool(), move |conn| { - DbPerson::read_from_apub_id(conn, &object_id.into()) - }) - .await?? - .map(Into::into), + DbPerson::read_from_apub_id(&mut context.pool(), &object_id.into()) + .await? + .map(Into::into), ) } #[tracing::instrument(skip_all)] - async fn delete(self, context: &LemmyContext) -> Result<(), LemmyError> { - blocking(context.pool(), move |conn| { - DbPerson::update_deleted(conn, self.id, true) - }) - .await??; + async fn delete(self, context: &Data) -> Result<(), LemmyError> { + let form = PersonUpdateForm::builder().deleted(Some(true)).build(); + DbPerson::update(&mut context.pool(), self.id, &form).await?; Ok(()) } #[tracing::instrument(skip_all)] - async fn into_apub(self, _pool: &LemmyContext) -> Result { + async fn into_json(self, _context: &Data) -> Result { let kind = if self.bot_account { UserTypes::Service } else { @@ -92,7 +92,7 @@ impl ApubObject for ApubPerson { let person = Person { kind, - id: ObjectId::new(self.actor_id.clone()), + id: self.actor_id.clone().into(), preferred_username: self.name.clone(), name: self.display_name.clone(), summary: self.bio.as_ref().map(|b| markdown_to_html(b)), @@ -105,7 +105,7 @@ impl ApubObject for ApubPerson { endpoints: self.shared_inbox_url.clone().map(|s| Endpoints { shared_inbox: s.into(), }), - public_key: self.get_public_key(), + public_key: self.public_key(), updated: self.updated.map(convert_datetime), inbox: self.inbox_url.clone().into(), }; @@ -116,77 +116,77 @@ impl ApubObject for ApubPerson { async fn verify( person: &Person, expected_domain: &Url, - context: &LemmyContext, - _request_counter: &mut i32, + context: &Data, ) -> Result<(), LemmyError> { - verify_domains_match(person.id.inner(), expected_domain)?; - check_apub_id_valid_with_strictness(person.id.inner(), false, context.settings())?; - - let slur_regex = &context.settings().slur_regex(); + let local_site_data = local_site_data_cached(&mut context.pool()).await?; + let slur_regex = &local_site_opt_to_slur_regex(&local_site_data.local_site); check_slurs(&person.preferred_username, slur_regex)?; check_slurs_opt(&person.name, slur_regex)?; + + verify_domains_match(person.id.inner(), expected_domain)?; + check_apub_id_valid_with_strictness(person.id.inner(), false, context).await?; + let bio = read_from_string_or_source_opt(&person.summary, &None, &person.source); check_slurs_opt(&bio, slur_regex)?; Ok(()) } #[tracing::instrument(skip_all)] - async fn from_apub( + async fn from_json( person: Person, - context: &LemmyContext, - request_counter: &mut i32, + context: &Data, ) -> Result { - let person_form = PersonForm { - name: person.preferred_username, - display_name: Some(person.name), + let instance_id = fetch_instance_actor_for_object(&person.id, context).await?; + + let name = sanitize_html(&person.preferred_username); + let display_name = sanitize_html_opt(&person.name); + let bio = read_from_string_or_source_opt(&person.summary, &None, &person.source); + let bio = sanitize_html_opt(&bio); + + // Some Mastodon users have `name: ""` (empty string), need to convert that to `None` + // https://github.com/mastodon/mastodon/issues/25233 + let display_name = display_name.filter(|n| !n.is_empty()); + + let person_form = PersonInsertForm { + name, + display_name, banned: None, ban_expires: None, - deleted: None, - avatar: Some(person.icon.map(|i| i.url.into())), - banner: Some(person.image.map(|i| i.url.into())), + deleted: Some(false), + avatar: person.icon.map(|i| i.url.into()), + banner: person.image.map(|i| i.url.into()), published: person.published.map(|u| u.naive_local()), updated: person.updated.map(|u| u.naive_local()), actor_id: Some(person.id.into()), - bio: Some(read_from_string_or_source_opt( - &person.summary, - &None, - &person.source, - )), + bio, local: Some(false), admin: Some(false), bot_account: Some(person.kind == UserTypes::Service), private_key: None, - public_key: Some(person.public_key.public_key_pem), + public_key: person.public_key.public_key_pem, last_refreshed_at: Some(naive_now()), inbox_url: Some(person.inbox.into()), - shared_inbox_url: Some(person.endpoints.map(|e| e.shared_inbox.into())), - matrix_user_id: Some(person.matrix_user_id), + shared_inbox_url: person.endpoints.map(|e| e.shared_inbox.into()), + matrix_user_id: person.matrix_user_id, + instance_id, }; - let person = blocking(context.pool(), move |conn| { - DbPerson::upsert(conn, &person_form) - }) - .await??; - - let actor_id = person.actor_id.clone().into(); - fetch_instance_actor_for_object(actor_id, context, request_counter).await; + let person = DbPerson::upsert(&mut context.pool(), &person_form).await?; Ok(person.into()) } } -impl ActorType for ApubPerson { - fn actor_id(&self) -> Url { - self.actor_id.to_owned().into() +impl Actor for ApubPerson { + fn id(&self) -> Url { + self.actor_id.inner().clone() } - fn private_key(&self) -> Option { - self.private_key.to_owned() + fn public_key_pem(&self) -> &str { + &self.public_key } -} -impl Actor for ApubPerson { - fn public_key(&self) -> &str { - &self.public_key + fn private_key_pem(&self) -> Option { + self.private_key.clone() } fn inbox(&self) -> Url { @@ -194,12 +194,15 @@ impl Actor for ApubPerson { } fn shared_inbox(&self) -> Option { - self.shared_inbox_url.clone().map(|s| s.into()) + self.shared_inbox_url.clone().map(Into::into) } } #[cfg(test)] pub(crate) mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use super::*; use crate::{ objects::{ @@ -208,71 +211,62 @@ pub(crate) mod tests { }, protocol::{objects::instance::Instance, tests::file_to_json_object}, }; + use activitypub_federation::fetch::object_id::ObjectId; use lemmy_db_schema::{source::site::Site, traits::Crud}; use serial_test::serial; - pub(crate) async fn parse_lemmy_person(context: &LemmyContext) -> (ApubPerson, ApubSite) { + pub(crate) async fn parse_lemmy_person(context: &Data) -> (ApubPerson, ApubSite) { let site = parse_lemmy_instance(context).await; let json = file_to_json_object("assets/lemmy/objects/person.json").unwrap(); let url = Url::parse("https://enterprise.lemmy.ml/u/picard").unwrap(); - let mut request_counter = 0; - ApubPerson::verify(&json, &url, context, &mut request_counter) - .await - .unwrap(); - let person = ApubPerson::from_apub(json, context, &mut request_counter) - .await - .unwrap(); - assert_eq!(request_counter, 0); + ApubPerson::verify(&json, &url, context).await.unwrap(); + let person = ApubPerson::from_json(json, context).await.unwrap(); + assert_eq!(context.request_count(), 0); (person, site) } - #[actix_rt::test] + #[tokio::test] #[serial] async fn test_parse_lemmy_person() { - let context = init_context(); - let conn = &mut context.pool().get().unwrap(); + let context = init_context().await; let (person, site) = parse_lemmy_person(&context).await; assert_eq!(person.display_name, Some("Jean-Luc Picard".to_string())); assert!(!person.local); assert_eq!(person.bio.as_ref().unwrap().len(), 39); - DbPerson::delete(conn, person.id).unwrap(); - Site::delete(conn, site.id).unwrap(); + cleanup((person, site), &context).await; } - #[actix_rt::test] + #[tokio::test] #[serial] async fn test_parse_pleroma_person() { - let context = init_context(); - let conn = &mut context.pool().get().unwrap(); + let context = init_context().await; // create and parse a fake pleroma instance actor, to avoid network request during test let mut json: Instance = file_to_json_object("assets/lemmy/objects/instance.json").unwrap(); - let id = Url::parse("https://queer.hacktivis.me/").unwrap(); - json.id = ObjectId::new(id); - let mut request_counter = 0; - let site = ApubSite::from_apub(json, &context, &mut request_counter) - .await - .unwrap(); + json.id = ObjectId::parse("https://queer.hacktivis.me/").unwrap(); + let url = Url::parse("https://queer.hacktivis.me/users/lanodan").unwrap(); + ApubSite::verify(&json, &url, &context).await.unwrap(); + let site = ApubSite::from_json(json, &context).await.unwrap(); let json = file_to_json_object("assets/pleroma/objects/person.json").unwrap(); - let url = Url::parse("https://queer.hacktivis.me/users/lanodan").unwrap(); - let mut request_counter = 0; - ApubPerson::verify(&json, &url, &context, &mut request_counter) - .await - .unwrap(); - let person = ApubPerson::from_apub(json, &context, &mut request_counter) - .await - .unwrap(); + ApubPerson::verify(&json, &url, &context).await.unwrap(); + let person = ApubPerson::from_json(json, &context).await.unwrap(); assert_eq!(person.actor_id, url.into()); assert_eq!(person.name, "lanodan"); assert!(!person.local); - assert_eq!(request_counter, 0); + assert_eq!(context.request_count(), 0); assert_eq!(person.bio.as_ref().unwrap().len(), 873); - DbPerson::delete(conn, person.id).unwrap(); - Site::delete(conn, site.id).unwrap(); + cleanup((person, site), &context).await; + } + + async fn cleanup(data: (ApubPerson, ApubSite), context: &LemmyContext) { + DbPerson::delete(&mut context.pool(), data.0.id) + .await + .unwrap(); + Site::delete(&mut context.pool(), data.1.id).await.unwrap(); } }