2021-07-17 16:20:44 +00:00
|
|
|
use crate::{
|
2021-10-29 10:32:42 +00:00
|
|
|
activity_lists::PersonInboxActivities,
|
2021-10-28 15:25:26 +00:00
|
|
|
context::WithContext,
|
2021-07-17 16:20:44 +00:00
|
|
|
http::{
|
|
|
|
|
create_apub_response,
|
|
|
|
|
create_apub_tombstone_response,
|
|
|
|
|
payload_to_string,
|
|
|
|
|
receive_activity,
|
2021-11-03 17:33:51 +00:00
|
|
|
ActivityCommonFields,
|
2021-07-17 16:20:44 +00:00
|
|
|
},
|
2021-10-18 21:36:44 +00:00
|
|
|
objects::person::ApubPerson,
|
2021-11-01 13:05:20 +00:00
|
|
|
protocol::collections::person_outbox::PersonOutbox,
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 16:08:46 +00:00
|
|
|
};
|
2021-10-29 10:32:42 +00:00
|
|
|
use actix_web::{body::Body, web, web::Payload, HttpRequest, HttpResponse};
|
|
|
|
|
use lemmy_api_common::blocking;
|
|
|
|
|
use lemmy_apub_lib::traits::ApubObject;
|
|
|
|
|
use lemmy_db_schema::source::person::Person;
|
|
|
|
|
use lemmy_utils::LemmyError;
|
|
|
|
|
use lemmy_websocket::LemmyContext;
|
|
|
|
|
use log::info;
|
|
|
|
|
use serde::Deserialize;
|
2020-10-12 14:10:09 +00:00
|
|
|
|
|
|
|
|
#[derive(Deserialize)]
|
2021-03-10 22:33:55 +00:00
|
|
|
pub struct PersonQuery {
|
2020-10-12 14:10:09 +00:00
|
|
|
user_name: String,
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-10 22:33:55 +00:00
|
|
|
/// Return the ActivityPub json representation of a local person over HTTP.
|
2021-03-19 16:11:34 +00:00
|
|
|
pub(crate) async fn get_apub_person_http(
|
2021-03-10 22:33:55 +00:00
|
|
|
info: web::Path<PersonQuery>,
|
2020-10-12 14:10:09 +00:00
|
|
|
context: web::Data<LemmyContext>,
|
|
|
|
|
) -> Result<HttpResponse<Body>, LemmyError> {
|
|
|
|
|
let user_name = info.into_inner().user_name;
|
2021-03-10 22:33:55 +00:00
|
|
|
// TODO: this needs to be able to read deleted persons, so that it can send tombstones
|
2021-10-18 21:36:44 +00:00
|
|
|
let person: ApubPerson = blocking(context.pool(), move |conn| {
|
2021-03-10 22:33:55 +00:00
|
|
|
Person::find_by_name(conn, &user_name)
|
2020-10-12 14:10:09 +00:00
|
|
|
})
|
2021-10-18 21:36:44 +00:00
|
|
|
.await??
|
|
|
|
|
.into();
|
2021-01-12 16:12:41 +00:00
|
|
|
|
2021-03-10 22:33:55 +00:00
|
|
|
if !person.deleted {
|
2021-11-06 12:37:55 +00:00
|
|
|
let apub = person.into_apub(&context).await?;
|
2021-01-12 16:12:41 +00:00
|
|
|
|
|
|
|
|
Ok(create_apub_response(&apub))
|
|
|
|
|
} else {
|
2021-03-10 22:33:55 +00:00
|
|
|
Ok(create_apub_tombstone_response(&person.to_tombstone()?))
|
2021-01-12 16:12:41 +00:00
|
|
|
}
|
2020-10-12 14:10:09 +00:00
|
|
|
}
|
2020-11-18 16:04:35 +00:00
|
|
|
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 16:08:46 +00:00
|
|
|
pub async fn person_inbox(
|
|
|
|
|
request: HttpRequest,
|
|
|
|
|
payload: Payload,
|
|
|
|
|
_path: web::Path<String>,
|
|
|
|
|
context: web::Data<LemmyContext>,
|
|
|
|
|
) -> Result<HttpResponse, LemmyError> {
|
|
|
|
|
let unparsed = payload_to_string(payload).await?;
|
2021-10-25 17:22:34 +00:00
|
|
|
info!("Received person inbox activity {}", unparsed);
|
2021-11-03 17:33:51 +00:00
|
|
|
let activity_data: ActivityCommonFields = serde_json::from_str(&unparsed)?;
|
2021-10-28 15:25:26 +00:00
|
|
|
let activity = serde_json::from_str::<WithContext<PersonInboxActivities>>(&unparsed)?;
|
2021-11-03 17:33:51 +00:00
|
|
|
receive_person_inbox(activity.inner(), activity_data, request, &context).await
|
2021-08-19 21:24:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(in crate::http) async fn receive_person_inbox(
|
|
|
|
|
activity: PersonInboxActivities,
|
2021-11-03 17:33:51 +00:00
|
|
|
activity_data: ActivityCommonFields,
|
2021-08-19 21:24:33 +00:00
|
|
|
request: HttpRequest,
|
|
|
|
|
context: &LemmyContext,
|
|
|
|
|
) -> Result<HttpResponse, LemmyError> {
|
2021-11-03 17:33:51 +00:00
|
|
|
receive_activity(request, activity, activity_data, context).await
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 16:08:46 +00:00
|
|
|
}
|
|
|
|
|
|
2021-03-19 16:11:34 +00:00
|
|
|
pub(crate) async fn get_apub_person_outbox(
|
2021-03-10 22:33:55 +00:00
|
|
|
info: web::Path<PersonQuery>,
|
2020-11-18 16:04:35 +00:00
|
|
|
context: web::Data<LemmyContext>,
|
|
|
|
|
) -> Result<HttpResponse<Body>, LemmyError> {
|
2021-03-10 22:33:55 +00:00
|
|
|
let person = blocking(context.pool(), move |conn| {
|
2021-07-05 16:07:26 +00:00
|
|
|
Person::find_by_name(conn, &info.user_name)
|
2020-11-18 16:04:35 +00:00
|
|
|
})
|
|
|
|
|
.await??;
|
2021-11-01 13:05:20 +00:00
|
|
|
let outbox = PersonOutbox::new(person).await?;
|
2021-10-28 15:52:11 +00:00
|
|
|
Ok(create_apub_response(&outbox))
|
2020-11-18 16:04:35 +00:00
|
|
|
}
|