mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-09 17:09:22 +00:00
35cbae61bc
* Respond directly with LemmyError Instrument Perform implementations for more precise traces Use ApiError to format JSON errors when messages are present Keep SpanTrace output in LemmyError Display impl * Hide SpanTrace debug output from LemmyError * Don't log when entering spans, only when leaving * Update actix-web * Update actix-rt * Add newline after error info in LemmyError Display impl * Propogate span information to blocking operations * Instrument apub functions * Use skip_all for more instrument attributes, don't skip 'self' in some api actions * Make message a static string * Send proper JSON over websocket * Add 'message' to LemmyError display if present * Use a quieter root span builder, don't pretty-print logs * Keep passwords and emails out of logs * Re-enable logging Login * Instrument feeds * Emit our own errors * Move error log after status code recording * Make Sensitive generic over the inner type * Remove line that logged secrets
86 lines
2.6 KiB
Rust
86 lines
2.6 KiB
Rust
use crate::{
|
|
activity_lists::PersonInboxActivities,
|
|
context::WithContext,
|
|
http::{
|
|
create_apub_response,
|
|
create_apub_tombstone_response,
|
|
payload_to_string,
|
|
receive_activity,
|
|
ActivityCommonFields,
|
|
},
|
|
objects::person::ApubPerson,
|
|
protocol::collections::person_outbox::PersonOutbox,
|
|
};
|
|
use actix_web::{body::AnyBody, 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 serde::Deserialize;
|
|
use tracing::info;
|
|
|
|
#[derive(Deserialize)]
|
|
pub struct PersonQuery {
|
|
user_name: String,
|
|
}
|
|
|
|
/// Return the ActivityPub json representation of a local person over HTTP.
|
|
#[tracing::instrument(skip_all)]
|
|
pub(crate) async fn get_apub_person_http(
|
|
info: web::Path<PersonQuery>,
|
|
context: web::Data<LemmyContext>,
|
|
) -> Result<HttpResponse<AnyBody>, LemmyError> {
|
|
let user_name = info.into_inner().user_name;
|
|
// TODO: this needs to be able to read deleted persons, so that it can send tombstones
|
|
let person: ApubPerson = blocking(context.pool(), move |conn| {
|
|
Person::find_by_name(conn, &user_name)
|
|
})
|
|
.await??
|
|
.into();
|
|
|
|
if !person.deleted {
|
|
let apub = person.into_apub(&context).await?;
|
|
|
|
Ok(create_apub_response(&apub))
|
|
} else {
|
|
Ok(create_apub_tombstone_response(&person.to_tombstone()?))
|
|
}
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
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?;
|
|
info!("Received person inbox activity {}", unparsed);
|
|
let activity_data: ActivityCommonFields = serde_json::from_str(&unparsed)?;
|
|
let activity = serde_json::from_str::<WithContext<PersonInboxActivities>>(&unparsed)?;
|
|
receive_person_inbox(activity.inner(), activity_data, request, &context).await
|
|
}
|
|
|
|
pub(in crate::http) async fn receive_person_inbox(
|
|
activity: PersonInboxActivities,
|
|
activity_data: ActivityCommonFields,
|
|
request: HttpRequest,
|
|
context: &LemmyContext,
|
|
) -> Result<HttpResponse, LemmyError> {
|
|
receive_activity(request, activity, activity_data, context).await
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
pub(crate) async fn get_apub_person_outbox(
|
|
info: web::Path<PersonQuery>,
|
|
context: web::Data<LemmyContext>,
|
|
) -> Result<HttpResponse<AnyBody>, LemmyError> {
|
|
let person = blocking(context.pool(), move |conn| {
|
|
Person::find_by_name(conn, &info.user_name)
|
|
})
|
|
.await??;
|
|
let outbox = PersonOutbox::new(person).await?;
|
|
Ok(create_apub_response(&outbox))
|
|
}
|