From 4db322ab53864a51965d4eb1dbe956880ab78325 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Thu, 13 Jan 2022 03:48:00 +0100 Subject: [PATCH] Accept posts using Note type (and better error messages for tests) --- crates/apub/assets/lotide/objects/page.json | 12 ++++++++++ .../src/collections/community_moderators.rs | 2 +- crates/apub/src/objects/comment.rs | 8 +++---- crates/apub/src/objects/community.rs | 2 +- crates/apub/src/objects/mod.rs | 6 +++-- crates/apub/src/objects/person.rs | 4 ++-- crates/apub/src/objects/post.rs | 9 +++++--- crates/apub/src/objects/private_message.rs | 8 +++---- .../activities/create_or_update/mod.rs | 14 +++++++----- .../src/protocol/activities/following/mod.rs | 3 ++- crates/apub/src/protocol/mod.rs | 10 ++++++--- crates/apub/src/protocol/objects/mod.rs | 22 ++++++++++--------- crates/apub/src/protocol/objects/page.rs | 7 +++++- 13 files changed, 70 insertions(+), 37 deletions(-) create mode 100644 crates/apub/assets/lotide/objects/page.json diff --git a/crates/apub/assets/lotide/objects/page.json b/crates/apub/assets/lotide/objects/page.json new file mode 100644 index 000000000..b892eba6e --- /dev/null +++ b/crates/apub/assets/lotide/objects/page.json @@ -0,0 +1,12 @@ +{ + "@context": "https://www.w3.org/ns/activitystreams", + "id": "https://narwhal.city/posts/9", + "type": "Page", + "name": "What's Dylan Grillin'? (reupload)", + "to": "https://narwhal.city/communities/4", + "attributedTo": "https://narwhal.city/users/1", + "published": "2020-12-30T07:29:19.460932+00:00", + "url": "https://www.youtube.com/watch?v=ZI4LGTXscR4", + "summary": "What's Dylan Grillin'? (reupload)", + "cc": "https://www.w3.org/ns/activitystreams#Public" +} diff --git a/crates/apub/src/collections/community_moderators.rs b/crates/apub/src/collections/community_moderators.rs index 04611ddd0..338ed0f5a 100644 --- a/crates/apub/src/collections/community_moderators.rs +++ b/crates/apub/src/collections/community_moderators.rs @@ -177,7 +177,7 @@ mod tests { let new_mod = parse_lemmy_person(&context).await; let json: GroupModerators = - file_to_json_object("assets/lemmy/collections/group_moderators.json"); + file_to_json_object("assets/lemmy/collections/group_moderators.json").unwrap(); let url = Url::parse("https://enterprise.lemmy.ml/c/tenforward").unwrap(); let mut request_counter = 0; let community_context = CommunityContext { diff --git a/crates/apub/src/objects/comment.rs b/crates/apub/src/objects/comment.rs index f525d1f64..ee131adf7 100644 --- a/crates/apub/src/objects/comment.rs +++ b/crates/apub/src/objects/comment.rs @@ -227,7 +227,7 @@ pub(crate) mod tests { ) -> (ApubPerson, ApubCommunity, ApubPost) { let person = parse_lemmy_person(context).await; let community = parse_lemmy_community(context).await; - let post_json = file_to_json_object("assets/lemmy/objects/page.json"); + let post_json = file_to_json_object("assets/lemmy/objects/page.json").unwrap(); ApubPost::verify(&post_json, url, context, &mut 0) .await .unwrap(); @@ -252,7 +252,7 @@ pub(crate) mod tests { let url = Url::parse("https://enterprise.lemmy.ml/comment/38741").unwrap(); let data = prepare_comment_test(&url, &context).await; - let json: Note = file_to_json_object("assets/lemmy/objects/note.json"); + let json: Note = file_to_json_object("assets/lemmy/objects/note.json").unwrap(); let mut request_counter = 0; ApubComment::verify(&json, &url, &context, &mut request_counter) .await @@ -286,14 +286,14 @@ pub(crate) mod tests { let pleroma_url = Url::parse("https://queer.hacktivis.me/objects/8d4973f4-53de-49cd-8c27-df160e16a9c2") .unwrap(); - let person_json = file_to_json_object("assets/pleroma/objects/person.json"); + let person_json = file_to_json_object("assets/pleroma/objects/person.json").unwrap(); ApubPerson::verify(&person_json, &pleroma_url, &context, &mut 0) .await .unwrap(); ApubPerson::from_apub(person_json, &context, &mut 0) .await .unwrap(); - let json = file_to_json_object("assets/pleroma/objects/note.json"); + let json = file_to_json_object("assets/pleroma/objects/note.json").unwrap(); let mut request_counter = 0; ApubComment::verify(&json, &pleroma_url, &context, &mut request_counter) .await diff --git a/crates/apub/src/objects/community.rs b/crates/apub/src/objects/community.rs index 488bf172c..65b0e64b1 100644 --- a/crates/apub/src/objects/community.rs +++ b/crates/apub/src/objects/community.rs @@ -225,7 +225,7 @@ pub(crate) mod tests { use serial_test::serial; pub(crate) async fn parse_lemmy_community(context: &LemmyContext) -> ApubCommunity { - let mut json: Group = file_to_json_object("assets/lemmy/objects/group.json"); + let mut json: Group = file_to_json_object("assets/lemmy/objects/group.json").unwrap(); // change these links so they dont fetch over the network json.moderators = None; json.outbox = diff --git a/crates/apub/src/objects/mod.rs b/crates/apub/src/objects/mod.rs index 46013e1e3..235038392 100644 --- a/crates/apub/src/objects/mod.rs +++ b/crates/apub/src/objects/mod.rs @@ -90,9 +90,11 @@ pub(crate) mod tests { LemmyContext::create(pool, chat_server, client, activity_queue, settings, secret) } - pub(crate) fn file_to_json_object(path: &str) -> T { + pub(crate) fn file_to_json_object( + path: &str, + ) -> serde_json::error::Result { let file = File::open(path).unwrap(); let reader = BufReader::new(file); - serde_json::from_reader(reader).unwrap() + serde_json::from_reader(reader) } } diff --git a/crates/apub/src/objects/person.rs b/crates/apub/src/objects/person.rs index faed33f4f..f6ad0e207 100644 --- a/crates/apub/src/objects/person.rs +++ b/crates/apub/src/objects/person.rs @@ -209,7 +209,7 @@ pub(crate) mod tests { use serial_test::serial; pub(crate) async fn parse_lemmy_person(context: &LemmyContext) -> ApubPerson { - let json = file_to_json_object("assets/lemmy/objects/person.json"); + 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) @@ -243,7 +243,7 @@ pub(crate) mod tests { let client = reqwest::Client::new().into(); let manager = create_activity_queue(client); let context = init_context(manager.queue_handle().clone()); - let json = file_to_json_object("assets/pleroma/objects/person.json"); + 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) diff --git a/crates/apub/src/objects/post.rs b/crates/apub/src/objects/post.rs index a8d64c18d..e4206080a 100644 --- a/crates/apub/src/objects/post.rs +++ b/crates/apub/src/objects/post.rs @@ -2,12 +2,15 @@ use crate::{ activities::{verify_is_public, verify_person_in_community}, check_is_apub_id_valid, protocol::{ - objects::{page::Page, tombstone::Tombstone}, + objects::{ + page::{Page, PageType}, + tombstone::Tombstone, + }, ImageObject, Source, }, }; -use activitystreams_kinds::{object::PageType, public}; +use activitystreams_kinds::public; use chrono::NaiveDateTime; use lemmy_api_common::blocking; use lemmy_apub_lib::{ @@ -222,7 +225,7 @@ mod tests { let community = parse_lemmy_community(&context).await; let person = parse_lemmy_person(&context).await; - let json = file_to_json_object("assets/lemmy/objects/page.json"); + let json = file_to_json_object("assets/lemmy/objects/page.json").unwrap(); let url = Url::parse("https://enterprise.lemmy.ml/post/55143").unwrap(); let mut request_counter = 0; ApubPost::verify(&json, &url, &context, &mut request_counter) diff --git a/crates/apub/src/objects/private_message.rs b/crates/apub/src/objects/private_message.rs index c7b053e4f..176ee009e 100644 --- a/crates/apub/src/objects/private_message.rs +++ b/crates/apub/src/objects/private_message.rs @@ -171,14 +171,14 @@ mod tests { 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"); + let lemmy_person = file_to_json_object("assets/lemmy/objects/person.json").unwrap(); ApubPerson::verify(&lemmy_person, url, context, &mut 0) .await .unwrap(); let person1 = ApubPerson::from_apub(lemmy_person, context, &mut 0) .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) .await @@ -202,7 +202,7 @@ mod tests { let context = init_context(manager.queue_handle().clone()); 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 json: ChatMessage = file_to_json_object("assets/lemmy/objects/chat_message.json").unwrap(); let mut request_counter = 0; ApubPrivateMessage::verify(&json, &url, &context, &mut request_counter) .await @@ -232,7 +232,7 @@ mod tests { 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 json = file_to_json_object("assets/pleroma/objects/chat_message.json").unwrap(); let mut request_counter = 0; ApubPrivateMessage::verify(&json, &pleroma_url, &context, &mut request_counter) .await diff --git a/crates/apub/src/protocol/activities/create_or_update/mod.rs b/crates/apub/src/protocol/activities/create_or_update/mod.rs index 8693647f6..160bbfba3 100644 --- a/crates/apub/src/protocol/activities/create_or_update/mod.rs +++ b/crates/apub/src/protocol/activities/create_or_update/mod.rs @@ -26,13 +26,17 @@ mod tests { file_to_json_object::>( "assets/pleroma/activities/create_note.json", - ); + ) + .unwrap(); file_to_json_object::>( "assets/smithereen/activities/create_note.json", - ); - file_to_json_object::("assets/mastodon/activities/create_note.json"); + ) + .unwrap(); + file_to_json_object::("assets/mastodon/activities/create_note.json") + .unwrap(); - file_to_json_object::("assets/lotide/activities/create_page.json"); - file_to_json_object::("assets/lotide/activities/create_note_reply.json"); + file_to_json_object::("assets/lotide/activities/create_page.json").unwrap(); + file_to_json_object::("assets/lotide/activities/create_note_reply.json") + .unwrap(); } } diff --git a/crates/apub/src/protocol/activities/following/mod.rs b/crates/apub/src/protocol/activities/following/mod.rs index 693725a94..f855cb328 100644 --- a/crates/apub/src/protocol/activities/following/mod.rs +++ b/crates/apub/src/protocol/activities/following/mod.rs @@ -25,6 +25,7 @@ mod tests { "assets/lemmy/activities/following/undo_follow.json", ); - file_to_json_object::>("assets/pleroma/activities/follow.json"); + file_to_json_object::>("assets/pleroma/activities/follow.json") + .unwrap(); } } diff --git a/crates/apub/src/protocol/mod.rs b/crates/apub/src/protocol/mod.rs index 2a4acf246..a7a233964 100644 --- a/crates/apub/src/protocol/mod.rs +++ b/crates/apub/src/protocol/mod.rs @@ -45,13 +45,17 @@ pub(crate) mod tests { use serde::{de::DeserializeOwned, Serialize}; use std::collections::HashMap; + /// Check that json deserialize -> serialize -> deserialize gives identical file as initial one. + /// Ensures that there are no breaking changes in sent data. pub(crate) fn test_parse_lemmy_item( path: &str, ) -> T { - let parsed = file_to_json_object::(path); + // parse file as T + let parsed = file_to_json_object::(path).unwrap(); - // ensure that no field is ignored when parsing - let raw = file_to_json_object::>(path); + // parse file into hashmap, which ensures that every field is included + let raw = file_to_json_object::>(path).unwrap(); + // assert that all fields are identical, otherwise print diff assert_json_include!(actual: &parsed, expected: raw); parsed } diff --git a/crates/apub/src/protocol/objects/mod.rs b/crates/apub/src/protocol/objects/mod.rs index d05093960..04c653578 100644 --- a/crates/apub/src/protocol/objects/mod.rs +++ b/crates/apub/src/protocol/objects/mod.rs @@ -36,27 +36,29 @@ mod tests { #[actix_rt::test] async fn test_parse_object_pleroma() { - file_to_json_object::>("assets/pleroma/objects/person.json"); - file_to_json_object::>("assets/pleroma/objects/note.json"); - file_to_json_object::>("assets/pleroma/objects/chat_message.json"); + file_to_json_object::>("assets/pleroma/objects/person.json").unwrap(); + file_to_json_object::>("assets/pleroma/objects/note.json").unwrap(); + file_to_json_object::>("assets/pleroma/objects/chat_message.json") + .unwrap(); } #[actix_rt::test] async fn test_parse_object_smithereen() { - file_to_json_object::>("assets/smithereen/objects/person.json"); - file_to_json_object::("assets/smithereen/objects/note.json"); + file_to_json_object::>("assets/smithereen/objects/person.json").unwrap(); + file_to_json_object::("assets/smithereen/objects/note.json").unwrap(); } #[actix_rt::test] async fn test_parse_object_mastodon() { - file_to_json_object::("assets/mastodon/objects/person.json"); - file_to_json_object::("assets/mastodon/objects/note.json"); + file_to_json_object::("assets/mastodon/objects/person.json").unwrap(); + file_to_json_object::("assets/mastodon/objects/note.json").unwrap(); } #[actix_rt::test] async fn test_parse_object_lotide() { - file_to_json_object::>("assets/lotide/objects/group.json"); - file_to_json_object::>("assets/lotide/objects/person.json"); - file_to_json_object::>("assets/lotide/objects/note.json"); + file_to_json_object::>("assets/lotide/objects/group.json").unwrap(); + file_to_json_object::>("assets/lotide/objects/person.json").unwrap(); + file_to_json_object::>("assets/lotide/objects/note.json").unwrap(); + file_to_json_object::>("assets/lotide/objects/page.json").unwrap(); } } diff --git a/crates/apub/src/protocol/objects/page.rs b/crates/apub/src/protocol/objects/page.rs index 08b167dde..08906e757 100644 --- a/crates/apub/src/protocol/objects/page.rs +++ b/crates/apub/src/protocol/objects/page.rs @@ -2,7 +2,6 @@ use crate::{ objects::{community::ApubCommunity, person::ApubPerson, post::ApubPost}, protocol::{ImageObject, Source, Unparsed}, }; -use activitystreams_kinds::object::PageType; use chrono::{DateTime, FixedOffset}; use lemmy_apub_lib::{ data::Data, @@ -16,6 +15,12 @@ use serde::{Deserialize, Serialize}; use serde_with::skip_serializing_none; use url::Url; +#[derive(Clone, Debug, Deserialize, Serialize)] +pub enum PageType { + Page, + Note, +} + #[skip_serializing_none] #[derive(Clone, Debug, Deserialize, Serialize)] #[serde(rename_all = "camelCase")]