mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-28 07:11:20 +00:00
1d38aad9d3
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit48a033b87f
. * Revert "Add blank lines under each line with `conn =`" This reverts commit773a6d3beb
. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commitd2c6263ea1
. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit2bf8574bc8
. * Revert "Fix apub::api::resolve_object" This reverts commit3e4059aabb
. * Revert "Fix apub::activities::block" This reverts commit3b02389abd
. * Revert "Fix api_common::utils" This reverts commit7dc73de613
. * Revert "Revert "Fix api_common::utils"" This reverts commitf740f115e5
. * Revert "Revert "Fix apub::activities::block"" This reverts commit2ee206af7c
. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit96ed8bf2e9
. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commitacc9ca1aed
. * Revert "Revert "aaaa"" This reverts commit443a2a00a5
. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commitab4e94aea5
. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commite4d1712646
. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
264 lines
8 KiB
Rust
264 lines
8 KiB
Rust
use crate::{
|
|
check_apub_id_valid_with_strictness,
|
|
local_site_data_cached,
|
|
objects::{instance::fetch_instance_actor_for_object, read_from_string_or_source_opt},
|
|
protocol::{
|
|
objects::{
|
|
person::{Person, UserTypes},
|
|
Endpoints,
|
|
},
|
|
ImageObject,
|
|
Source,
|
|
},
|
|
};
|
|
use activitypub_federation::{
|
|
config::Data,
|
|
protocol::verification::verify_domains_match,
|
|
traits::{Actor, Object},
|
|
};
|
|
use chrono::NaiveDateTime;
|
|
use lemmy_api_common::{
|
|
context::LemmyContext,
|
|
utils::{generate_outbox_url, local_site_opt_to_slur_regex},
|
|
};
|
|
use lemmy_db_schema::{
|
|
source::person::{Person as DbPerson, PersonInsertForm, PersonUpdateForm},
|
|
traits::{ApubActor, Crud},
|
|
utils::naive_now,
|
|
};
|
|
use lemmy_utils::{
|
|
error::LemmyError,
|
|
utils::{
|
|
markdown::markdown_to_html,
|
|
slurs::{check_slurs, check_slurs_opt},
|
|
time::convert_datetime,
|
|
},
|
|
};
|
|
use std::ops::Deref;
|
|
use url::Url;
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub struct ApubPerson(pub(crate) DbPerson);
|
|
|
|
impl Deref for ApubPerson {
|
|
type Target = DbPerson;
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl From<DbPerson> for ApubPerson {
|
|
fn from(p: DbPerson) -> Self {
|
|
ApubPerson(p)
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl Object for ApubPerson {
|
|
type DataType = LemmyContext;
|
|
type Kind = Person;
|
|
type Error = LemmyError;
|
|
|
|
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
|
|
Some(self.last_refreshed_at)
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn read_from_id(
|
|
object_id: Url,
|
|
context: &Data<Self::DataType>,
|
|
) -> Result<Option<Self>, LemmyError> {
|
|
Ok(
|
|
DbPerson::read_from_apub_id(&mut context.pool(), &object_id.into())
|
|
.await?
|
|
.map(Into::into),
|
|
)
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn delete(self, context: &Data<Self::DataType>) -> 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_json(self, _context: &Data<Self::DataType>) -> Result<Person, LemmyError> {
|
|
let kind = if self.bot_account {
|
|
UserTypes::Service
|
|
} else {
|
|
UserTypes::Person
|
|
};
|
|
|
|
let person = Person {
|
|
kind,
|
|
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)),
|
|
source: self.bio.clone().map(Source::new),
|
|
icon: self.avatar.clone().map(ImageObject::new),
|
|
image: self.banner.clone().map(ImageObject::new),
|
|
matrix_user_id: self.matrix_user_id.clone(),
|
|
published: Some(convert_datetime(self.published)),
|
|
outbox: generate_outbox_url(&self.actor_id)?.into(),
|
|
endpoints: self.shared_inbox_url.clone().map(|s| Endpoints {
|
|
shared_inbox: s.into(),
|
|
}),
|
|
public_key: self.public_key(),
|
|
updated: self.updated.map(convert_datetime),
|
|
inbox: self.inbox_url.clone().into(),
|
|
};
|
|
Ok(person)
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn verify(
|
|
person: &Person,
|
|
expected_domain: &Url,
|
|
context: &Data<Self::DataType>,
|
|
) -> Result<(), LemmyError> {
|
|
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_json(
|
|
person: Person,
|
|
context: &Data<Self::DataType>,
|
|
) -> Result<ApubPerson, LemmyError> {
|
|
let instance_id = fetch_instance_actor_for_object(&person.id, context).await?;
|
|
|
|
// Some Mastodon users have `name: ""` (empty string), need to convert that to `None`
|
|
// https://github.com/mastodon/mastodon/issues/25233
|
|
let display_name = person.name.filter(|n| !n.is_empty());
|
|
|
|
let person_form = PersonInsertForm {
|
|
name: person.preferred_username,
|
|
display_name,
|
|
banned: None,
|
|
ban_expires: None,
|
|
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: read_from_string_or_source_opt(&person.summary, &None, &person.source),
|
|
local: Some(false),
|
|
admin: Some(false),
|
|
bot_account: Some(person.kind == UserTypes::Service),
|
|
private_key: None,
|
|
public_key: person.public_key.public_key_pem,
|
|
last_refreshed_at: Some(naive_now()),
|
|
inbox_url: Some(person.inbox.into()),
|
|
shared_inbox_url: person.endpoints.map(|e| e.shared_inbox.into()),
|
|
matrix_user_id: person.matrix_user_id,
|
|
instance_id,
|
|
};
|
|
let person = DbPerson::upsert(&mut context.pool(), &person_form).await?;
|
|
|
|
Ok(person.into())
|
|
}
|
|
}
|
|
|
|
impl Actor for ApubPerson {
|
|
fn id(&self) -> Url {
|
|
self.actor_id.inner().clone()
|
|
}
|
|
|
|
fn public_key_pem(&self) -> &str {
|
|
&self.public_key
|
|
}
|
|
|
|
fn private_key_pem(&self) -> Option<String> {
|
|
self.private_key.clone()
|
|
}
|
|
|
|
fn inbox(&self) -> Url {
|
|
self.inbox_url.clone().into()
|
|
}
|
|
|
|
fn shared_inbox(&self) -> Option<Url> {
|
|
self.shared_inbox_url.clone().map(Into::into)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub(crate) mod tests {
|
|
use super::*;
|
|
use crate::{
|
|
objects::{
|
|
instance::{tests::parse_lemmy_instance, ApubSite},
|
|
tests::init_context,
|
|
},
|
|
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: &Data<LemmyContext>) -> (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();
|
|
ApubPerson::verify(&json, &url, context).await.unwrap();
|
|
let person = ApubPerson::from_json(json, context).await.unwrap();
|
|
assert_eq!(context.request_count(), 0);
|
|
(person, site)
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_parse_lemmy_person() {
|
|
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);
|
|
|
|
cleanup((person, site), &context).await;
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_parse_pleroma_person() {
|
|
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();
|
|
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();
|
|
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!(context.request_count(), 0);
|
|
assert_eq!(person.bio.as_ref().unwrap().len(), 873);
|
|
|
|
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();
|
|
}
|
|
}
|