mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-28 15:21:22 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
247 lines
7 KiB
Rust
247 lines
7 KiB
Rust
use crate::{
|
|
check_apub_id_valid_with_strictness,
|
|
fetch_local_site_data,
|
|
local_instance,
|
|
objects::read_from_string_or_source_opt,
|
|
protocol::{
|
|
objects::{
|
|
instance::{Instance, InstanceType},
|
|
LanguageTag,
|
|
},
|
|
ImageObject,
|
|
Source,
|
|
},
|
|
ActorType,
|
|
};
|
|
use activitypub_federation::{
|
|
core::object_id::ObjectId,
|
|
deser::values::MediaTypeHtml,
|
|
traits::{Actor, ApubObject},
|
|
utils::verify_domains_match,
|
|
};
|
|
use chrono::NaiveDateTime;
|
|
use lemmy_api_common::utils::local_site_opt_to_slur_regex;
|
|
use lemmy_db_schema::{
|
|
source::{
|
|
actor_language::SiteLanguage,
|
|
instance::Instance as DbInstance,
|
|
site::{Site, SiteInsertForm},
|
|
},
|
|
traits::Crud,
|
|
utils::{naive_now, DbPool},
|
|
};
|
|
use lemmy_utils::{
|
|
error::LemmyError,
|
|
utils::{check_slurs, check_slurs_opt, convert_datetime, markdown_to_html},
|
|
};
|
|
use lemmy_websocket::LemmyContext;
|
|
use std::ops::Deref;
|
|
use tracing::debug;
|
|
use url::Url;
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct ApubSite(Site);
|
|
|
|
impl Deref for ApubSite {
|
|
type Target = Site;
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl From<Site> for ApubSite {
|
|
fn from(s: Site) -> Self {
|
|
ApubSite(s)
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl ApubObject for ApubSite {
|
|
type DataType = LemmyContext;
|
|
type ApubType = Instance;
|
|
type DbType = Site;
|
|
type Error = LemmyError;
|
|
|
|
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
|
|
Some(self.last_refreshed_at)
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn read_from_apub_id(
|
|
object_id: Url,
|
|
data: &Self::DataType,
|
|
) -> Result<Option<Self>, LemmyError> {
|
|
Ok(
|
|
Site::read_from_apub_id(data.pool(), object_id)
|
|
.await?
|
|
.map(Into::into),
|
|
)
|
|
}
|
|
|
|
async fn delete(self, _data: &Self::DataType) -> Result<(), LemmyError> {
|
|
unimplemented!()
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn into_apub(self, data: &Self::DataType) -> Result<Self::ApubType, LemmyError> {
|
|
let site_id = self.id;
|
|
let langs = SiteLanguage::read(data.pool(), site_id).await?;
|
|
let language = LanguageTag::new_multiple(langs, data.pool()).await?;
|
|
|
|
let instance = Instance {
|
|
kind: InstanceType::Service,
|
|
id: ObjectId::new(self.actor_id()),
|
|
name: self.name.clone(),
|
|
content: self.sidebar.as_ref().map(|d| markdown_to_html(d)),
|
|
source: self.sidebar.clone().map(Source::new),
|
|
summary: self.description.clone(),
|
|
media_type: self.sidebar.as_ref().map(|_| MediaTypeHtml::Html),
|
|
icon: self.icon.clone().map(ImageObject::new),
|
|
image: self.banner.clone().map(ImageObject::new),
|
|
inbox: self.inbox_url.clone().into(),
|
|
outbox: Url::parse(&format!("{}/site_outbox", self.actor_id))?,
|
|
public_key: self.get_public_key(),
|
|
language,
|
|
published: convert_datetime(self.published),
|
|
updated: self.updated.map(convert_datetime),
|
|
};
|
|
Ok(instance)
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn verify(
|
|
apub: &Self::ApubType,
|
|
expected_domain: &Url,
|
|
data: &Self::DataType,
|
|
_request_counter: &mut i32,
|
|
) -> Result<(), LemmyError> {
|
|
let local_site_data = fetch_local_site_data(data.pool()).await?;
|
|
|
|
check_apub_id_valid_with_strictness(apub.id.inner(), true, &local_site_data, data.settings())?;
|
|
verify_domains_match(expected_domain, apub.id.inner())?;
|
|
|
|
let slur_regex = &local_site_opt_to_slur_regex(&local_site_data.local_site);
|
|
|
|
check_slurs(&apub.name, slur_regex)?;
|
|
check_slurs_opt(&apub.summary, slur_regex)?;
|
|
Ok(())
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn from_apub(
|
|
apub: Self::ApubType,
|
|
data: &Self::DataType,
|
|
_request_counter: &mut i32,
|
|
) -> Result<Self, LemmyError> {
|
|
let apub_id = apub.id.inner().to_owned();
|
|
let instance = DbInstance::create_from_actor_id(data.pool(), &apub_id).await?;
|
|
|
|
let site_form = SiteInsertForm {
|
|
name: apub.name.clone(),
|
|
sidebar: read_from_string_or_source_opt(&apub.content, &None, &apub.source),
|
|
updated: apub.updated.map(|u| u.clone().naive_local()),
|
|
icon: apub.icon.clone().map(|i| i.url.into()),
|
|
banner: apub.image.clone().map(|i| i.url.into()),
|
|
description: apub.summary.clone(),
|
|
actor_id: Some(apub.id.clone().into()),
|
|
last_refreshed_at: Some(naive_now()),
|
|
inbox_url: Some(apub.inbox.clone().into()),
|
|
public_key: Some(apub.public_key.public_key_pem.clone()),
|
|
private_key: None,
|
|
instance_id: instance.id,
|
|
};
|
|
let languages = LanguageTag::to_language_id_multiple(apub.language, data.pool()).await?;
|
|
|
|
let site = Site::create(data.pool(), &site_form).await?;
|
|
SiteLanguage::update(data.pool(), languages, &site).await?;
|
|
Ok(site.into())
|
|
}
|
|
}
|
|
|
|
impl ActorType for ApubSite {
|
|
fn actor_id(&self) -> Url {
|
|
self.actor_id.to_owned().into()
|
|
}
|
|
fn private_key(&self) -> Option<String> {
|
|
self.private_key.to_owned()
|
|
}
|
|
}
|
|
|
|
impl Actor for ApubSite {
|
|
fn public_key(&self) -> &str {
|
|
&self.public_key
|
|
}
|
|
|
|
fn inbox(&self) -> Url {
|
|
self.inbox_url.clone().into()
|
|
}
|
|
}
|
|
|
|
/// Instance actor is at the root path, so we simply need to clear the path and other unnecessary
|
|
/// parts of the url.
|
|
pub fn instance_actor_id_from_url(mut url: Url) -> Url {
|
|
url.set_fragment(None);
|
|
url.set_path("");
|
|
url.set_query(None);
|
|
url
|
|
}
|
|
|
|
/// try to fetch the instance actor (to make things like instance rules available)
|
|
pub(in crate::objects) async fn fetch_instance_actor_for_object(
|
|
object_id: Url,
|
|
context: &LemmyContext,
|
|
request_counter: &mut i32,
|
|
) {
|
|
// try to fetch the instance actor (to make things like instance rules available)
|
|
let instance_id = instance_actor_id_from_url(object_id);
|
|
let site = ObjectId::<ApubSite>::new(instance_id.clone())
|
|
.dereference(context, local_instance(context).await, request_counter)
|
|
.await;
|
|
if let Err(e) = site {
|
|
debug!("Failed to dereference site for {}: {}", instance_id, e);
|
|
}
|
|
}
|
|
|
|
pub(crate) async fn remote_instance_inboxes(pool: &DbPool) -> Result<Vec<Url>, LemmyError> {
|
|
Ok(
|
|
Site::read_remote_sites(pool)
|
|
.await?
|
|
.into_iter()
|
|
.map(|s| ApubSite::from(s).shared_inbox_or_inbox())
|
|
.collect(),
|
|
)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub(crate) mod tests {
|
|
use super::*;
|
|
use crate::{objects::tests::init_context, protocol::tests::file_to_json_object};
|
|
use lemmy_db_schema::traits::Crud;
|
|
use serial_test::serial;
|
|
|
|
pub(crate) async fn parse_lemmy_instance(context: &LemmyContext) -> ApubSite {
|
|
let json: Instance = file_to_json_object("assets/lemmy/objects/instance.json").unwrap();
|
|
let id = Url::parse("https://enterprise.lemmy.ml/").unwrap();
|
|
let mut request_counter = 0;
|
|
ApubSite::verify(&json, &id, context, &mut request_counter)
|
|
.await
|
|
.unwrap();
|
|
let site = ApubSite::from_apub(json, context, &mut request_counter)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(request_counter, 0);
|
|
site
|
|
}
|
|
|
|
#[actix_rt::test]
|
|
#[serial]
|
|
async fn test_parse_lemmy_instance() {
|
|
let context = init_context().await;
|
|
let site = parse_lemmy_instance(&context).await;
|
|
|
|
assert_eq!(site.name, "Enterprise");
|
|
assert_eq!(site.description.as_ref().unwrap().len(), 15);
|
|
|
|
Site::delete(context.pool(), site.id).await.unwrap();
|
|
}
|
|
}
|