X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fobjects%2Fprivate_message.rs;h=a51cfe6b77c2cad5008a062cc1a424a85ec968ae;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=a96a14e8909e828a1a5eb85e2983f1478f48e065;hpb=35cbae61bc03a1a0af29f79ee55223d4e9766c07;p=lemmy.git diff --git a/crates/apub/src/objects/private_message.rs b/crates/apub/src/objects/private_message.rs index a96a14e8..a51cfe6b 100644 --- a/crates/apub/src/objects/private_message.rs +++ b/crates/apub/src/objects/private_message.rs @@ -1,33 +1,37 @@ -use crate::protocol::{ - objects::chat_message::{ChatMessage, ChatMessageType}, - Source, +use crate::{ + check_apub_id_valid_with_strictness, + objects::read_from_string_or_source, + protocol::{ + objects::chat_message::{ChatMessage, ChatMessageType}, + Source, + }, +}; +use activitypub_federation::{ + config::Data, + protocol::{values::MediaTypeHtml, verification::verify_domains_match}, + traits::Object, }; use chrono::NaiveDateTime; -use html2md::parse_html; -use lemmy_api_common::blocking; -use lemmy_apub_lib::{ - object_id::ObjectId, - traits::ApubObject, - values::{MediaTypeHtml, MediaTypeMarkdown}, - verify::verify_domains_match, +use lemmy_api_common::{ + context::LemmyContext, + utils::{check_person_block, sanitize_html}, }; use lemmy_db_schema::{ source::{ person::Person, - private_message::{PrivateMessage, PrivateMessageForm}, + private_message::{PrivateMessage, PrivateMessageInsertForm}, }, traits::Crud, }; use lemmy_utils::{ - utils::{convert_datetime, markdown_to_html}, - LemmyError, + error::{LemmyError, LemmyErrorType}, + utils::{markdown::markdown_to_html, time::convert_datetime}, }; -use lemmy_websocket::LemmyContext; use std::ops::Deref; use url::Url; #[derive(Clone, Debug)] -pub struct ApubPrivateMessage(PrivateMessage); +pub struct ApubPrivateMessage(pub(crate) PrivateMessage); impl Deref for ApubPrivateMessage { type Target = PrivateMessage; @@ -38,210 +42,204 @@ impl Deref for ApubPrivateMessage { impl From for ApubPrivateMessage { fn from(pm: PrivateMessage) -> Self { - ApubPrivateMessage { 0: pm } + ApubPrivateMessage(pm) } } -#[async_trait::async_trait(?Send)] -impl ApubObject for ApubPrivateMessage { +#[async_trait::async_trait] +impl Object for ApubPrivateMessage { type DataType = LemmyContext; - type ApubType = ChatMessage; - type TombstoneType = (); + type Kind = ChatMessage; + type Error = LemmyError; fn last_refreshed_at(&self) -> Option { None } #[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| { - PrivateMessage::read_from_apub_id(conn, object_id) - }) - .await?? - .map(Into::into), + PrivateMessage::read_from_apub_id(&mut context.pool(), object_id) + .await? + .map(Into::into), ) } - async fn delete(self, _context: &LemmyContext) -> Result<(), LemmyError> { + async fn delete(self, _context: &Data) -> Result<(), LemmyError> { // do nothing, because pm can't be fetched over http unimplemented!() } #[tracing::instrument(skip_all)] - async fn into_apub(self, context: &LemmyContext) -> Result { + async fn into_json(self, context: &Data) -> Result { let creator_id = self.creator_id; - let creator = blocking(context.pool(), move |conn| Person::read(conn, creator_id)).await??; + let creator = Person::read(&mut context.pool(), creator_id).await?; let recipient_id = self.recipient_id; - let recipient = - blocking(context.pool(), move |conn| Person::read(conn, recipient_id)).await??; + let recipient = Person::read(&mut context.pool(), recipient_id).await?; let note = ChatMessage { r#type: ChatMessageType::ChatMessage, - id: ObjectId::new(self.ap_id.clone()), - attributed_to: ObjectId::new(creator.actor_id), - to: [ObjectId::new(recipient.actor_id)], + id: self.ap_id.clone().into(), + attributed_to: creator.actor_id.into(), + to: [recipient.actor_id.into()], content: markdown_to_html(&self.content), media_type: Some(MediaTypeHtml::Html), - source: Some(Source { - content: self.content.clone(), - media_type: MediaTypeMarkdown::Markdown, - }), + source: Some(Source::new(self.content.clone())), published: Some(convert_datetime(self.published)), updated: self.updated.map(convert_datetime), - unparsed: Default::default(), }; Ok(note) } - fn to_tombstone(&self) -> Result<(), LemmyError> { - unimplemented!() - } - #[tracing::instrument(skip_all)] async fn verify( note: &ChatMessage, expected_domain: &Url, - context: &LemmyContext, - request_counter: &mut i32, + context: &Data, ) -> Result<(), LemmyError> { verify_domains_match(note.id.inner(), expected_domain)?; verify_domains_match(note.attributed_to.inner(), note.id.inner())?; - let person = note - .attributed_to - .dereference(context, request_counter) - .await?; + + check_apub_id_valid_with_strictness(note.id.inner(), false, context).await?; + let person = note.attributed_to.dereference(context).await?; if person.banned { - return Err(LemmyError::from_message("Person is banned from site")); + return Err(LemmyErrorType::PersonIsBannedFromSite)?; } Ok(()) } #[tracing::instrument(skip_all)] - async fn from_apub( + async fn from_json( note: ChatMessage, - context: &LemmyContext, - request_counter: &mut i32, + context: &Data, ) -> Result { - let creator = note - .attributed_to - .dereference(context, request_counter) - .await?; - let recipient = note.to[0].dereference(context, request_counter).await?; - let content = if let Some(source) = ¬e.source { - source.content.clone() - } else { - parse_html(¬e.content) - }; + let creator = note.attributed_to.dereference(context).await?; + let recipient = note.to[0].dereference(context).await?; + check_person_block(creator.id, recipient.id, &mut context.pool()).await?; + + let content = read_from_string_or_source(¬e.content, &None, ¬e.source); + let content = sanitize_html(&content); - let form = PrivateMessageForm { + let form = PrivateMessageInsertForm { creator_id: creator.id, recipient_id: recipient.id, content, published: note.published.map(|u| u.naive_local()), updated: note.updated.map(|u| u.naive_local()), - deleted: None, + deleted: Some(false), read: None, ap_id: Some(note.id.into()), local: Some(false), }; - let pm = blocking(context.pool(), move |conn| { - PrivateMessage::upsert(conn, &form) - }) - .await??; + let pm = PrivateMessage::create(&mut context.pool(), &form).await?; Ok(pm.into()) } } #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use super::*; - use crate::objects::{ - person::ApubPerson, - tests::{file_to_json_object, init_context}, + use crate::{ + objects::{ + instance::{tests::parse_lemmy_instance, ApubSite}, + person::ApubPerson, + tests::init_context, + }, + protocol::tests::file_to_json_object, }; use assert_json_diff::assert_json_include; - use lemmy_apub_lib::activity_queue::create_activity_queue; + use lemmy_db_schema::source::site::Site; use serial_test::serial; - async fn prepare_comment_test(url: &Url, context: &LemmyContext) -> (ApubPerson, ApubPerson) { - let lemmy_person = file_to_json_object("assets/lemmy/objects/person.json"); - ApubPerson::verify(&lemmy_person, url, context, &mut 0) + async fn prepare_comment_test( + url: &Url, + context: &Data, + ) -> (ApubPerson, ApubPerson, ApubSite) { + let context2 = context.reset_request_count(); + let lemmy_person = file_to_json_object("assets/lemmy/objects/person.json").unwrap(); + let site = parse_lemmy_instance(&context2).await; + ApubPerson::verify(&lemmy_person, url, &context2) .await .unwrap(); - let person1 = ApubPerson::from_apub(lemmy_person, context, &mut 0) + let person1 = ApubPerson::from_json(lemmy_person, &context2) .await .unwrap(); - let pleroma_person = file_to_json_object("assets/pleroma/objects/person.json"); + let pleroma_person = file_to_json_object("assets/pleroma/objects/person.json").unwrap(); let pleroma_url = Url::parse("https://queer.hacktivis.me/users/lanodan").unwrap(); - ApubPerson::verify(&pleroma_person, &pleroma_url, context, &mut 0) + ApubPerson::verify(&pleroma_person, &pleroma_url, &context2) .await .unwrap(); - let person2 = ApubPerson::from_apub(pleroma_person, context, &mut 0) + let person2 = ApubPerson::from_json(pleroma_person, &context2) .await .unwrap(); - (person1, person2) + (person1, person2, site) } - fn cleanup(data: (ApubPerson, ApubPerson), context: &LemmyContext) { - Person::delete(&*context.pool().get().unwrap(), data.0.id).unwrap(); - Person::delete(&*context.pool().get().unwrap(), data.1.id).unwrap(); + async fn cleanup(data: (ApubPerson, ApubPerson, ApubSite), context: &Data) { + Person::delete(&mut context.pool(), data.0.id) + .await + .unwrap(); + Person::delete(&mut context.pool(), data.1.id) + .await + .unwrap(); + Site::delete(&mut context.pool(), data.2.id).await.unwrap(); } - #[actix_rt::test] + #[tokio::test] #[serial] async fn test_parse_lemmy_pm() { - let manager = create_activity_queue(); - let context = init_context(manager.queue_handle().clone()); + let context = init_context().await; let url = Url::parse("https://enterprise.lemmy.ml/private_message/1621").unwrap(); let data = prepare_comment_test(&url, &context).await; - let json: ChatMessage = file_to_json_object("assets/lemmy/objects/chat_message.json"); - let mut request_counter = 0; - ApubPrivateMessage::verify(&json, &url, &context, &mut request_counter) + let json: ChatMessage = file_to_json_object("assets/lemmy/objects/chat_message.json").unwrap(); + ApubPrivateMessage::verify(&json, &url, &context) .await .unwrap(); - let pm = ApubPrivateMessage::from_apub(json.clone(), &context, &mut request_counter) + let pm = ApubPrivateMessage::from_json(json.clone(), &context) .await .unwrap(); assert_eq!(pm.ap_id.clone(), url.into()); assert_eq!(pm.content.len(), 20); - assert_eq!(request_counter, 0); + assert_eq!(context.request_count(), 0); let pm_id = pm.id; - let to_apub = pm.into_apub(&context).await.unwrap(); + let to_apub = pm.into_json(&context).await.unwrap(); assert_json_include!(actual: json, expected: to_apub); - PrivateMessage::delete(&*context.pool().get().unwrap(), pm_id).unwrap(); - cleanup(data, &context); + PrivateMessage::delete(&mut context.pool(), pm_id) + .await + .unwrap(); + cleanup(data, &context).await; } - #[actix_rt::test] + #[tokio::test] #[serial] async fn test_parse_pleroma_pm() { - let manager = create_activity_queue(); - let context = init_context(manager.queue_handle().clone()); + let context = init_context().await; let url = Url::parse("https://enterprise.lemmy.ml/private_message/1621").unwrap(); let data = prepare_comment_test(&url, &context).await; let pleroma_url = Url::parse("https://queer.hacktivis.me/objects/2").unwrap(); - let json = file_to_json_object("assets/pleroma/objects/chat_message.json"); - let mut request_counter = 0; - ApubPrivateMessage::verify(&json, &pleroma_url, &context, &mut request_counter) - .await - .unwrap(); - let pm = ApubPrivateMessage::from_apub(json, &context, &mut request_counter) + let json = file_to_json_object("assets/pleroma/objects/chat_message.json").unwrap(); + ApubPrivateMessage::verify(&json, &pleroma_url, &context) .await .unwrap(); + let pm = ApubPrivateMessage::from_json(json, &context).await.unwrap(); assert_eq!(pm.ap_id, pleroma_url.into()); assert_eq!(pm.content.len(), 3); - assert_eq!(request_counter, 0); + assert_eq!(context.request_count(), 0); - PrivateMessage::delete(&*context.pool().get().unwrap(), pm.id).unwrap(); - cleanup(data, &context); + PrivateMessage::delete(&mut context.pool(), pm.id) + .await + .unwrap(); + cleanup(data, &context).await; } }