mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-09-22 11:30:03 +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
94 lines
2.5 KiB
Rust
94 lines
2.5 KiB
Rust
use crate::{
|
|
schema::federation_allowlist,
|
|
source::{
|
|
federation_allowlist::{FederationAllowList, FederationAllowListForm},
|
|
instance::Instance,
|
|
},
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::insert_into, result::Error};
|
|
use diesel_async::{AsyncPgConnection, RunQueryDsl};
|
|
|
|
impl FederationAllowList {
|
|
pub async fn replace(pool: &mut 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::read_or_create(&mut conn.into(), 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 pool = &mut pool.into();
|
|
let domains = vec![
|
|
"tld1.xyz".to_string(),
|
|
"tld2.xyz".to_string(),
|
|
"tld3.xyz".to_string(),
|
|
];
|
|
|
|
let allowed = Some(domains.clone());
|
|
|
|
FederationAllowList::replace(pool, allowed).await.unwrap();
|
|
|
|
let allows = Instance::allowlist(pool).await.unwrap();
|
|
let allows_domains = allows
|
|
.iter()
|
|
.map(|i| i.domain.clone())
|
|
.collect::<Vec<String>>();
|
|
|
|
assert_eq!(3, allows.len());
|
|
assert_eq!(domains, allows_domains);
|
|
|
|
// 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();
|
|
}
|
|
}
|