mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-01 19:42:08 +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.
95 lines
2.4 KiB
Rust
95 lines
2.4 KiB
Rust
use crate::{
|
|
schema::federation_allowlist,
|
|
source::{
|
|
federation_allowlist::{FederationAllowList, FederationAllowListForm},
|
|
instance::Instance,
|
|
},
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::*, result::Error};
|
|
use diesel_async::{AsyncPgConnection, RunQueryDsl};
|
|
|
|
impl FederationAllowList {
|
|
pub async fn replace(pool: &DbPool, list_opt: Option<Vec<String>>) -> Result<(), Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
conn
|
|
.build_transaction()
|
|
.run(|conn| {
|
|
Box::pin(async move {
|
|
if let Some(list) = list_opt {
|
|
Self::clear(conn).await?;
|
|
|
|
for domain in list {
|
|
// Upsert all of these as instances
|
|
let instance = Instance::create_conn(conn, &domain).await?;
|
|
|
|
let form = FederationAllowListForm {
|
|
instance_id: instance.id,
|
|
updated: None,
|
|
};
|
|
insert_into(federation_allowlist::table)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
.await?;
|
|
}
|
|
Ok(())
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}) as _
|
|
})
|
|
.await
|
|
}
|
|
|
|
async fn clear(conn: &mut AsyncPgConnection) -> Result<usize, Error> {
|
|
diesel::delete(federation_allowlist::table)
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
source::{federation_allowlist::FederationAllowList, instance::Instance},
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_allowlist_insert_and_clear() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let allowed = Some(vec![
|
|
"tld1.xyz".to_string(),
|
|
"tld2.xyz".to_string(),
|
|
"tld3.xyz".to_string(),
|
|
]);
|
|
|
|
FederationAllowList::replace(pool, allowed).await.unwrap();
|
|
|
|
let allows = Instance::allowlist(pool).await.unwrap();
|
|
|
|
assert_eq!(3, allows.len());
|
|
assert_eq!(
|
|
vec![
|
|
"tld1.xyz".to_string(),
|
|
"tld2.xyz".to_string(),
|
|
"tld3.xyz".to_string()
|
|
],
|
|
allows
|
|
);
|
|
|
|
// Now test clearing them via Some(empty vec)
|
|
let clear_allows = Some(Vec::new());
|
|
|
|
FederationAllowList::replace(pool, clear_allows)
|
|
.await
|
|
.unwrap();
|
|
let allows = Instance::allowlist(pool).await.unwrap();
|
|
|
|
assert_eq!(0, allows.len());
|
|
|
|
Instance::delete_all(pool).await.unwrap();
|
|
}
|
|
}
|