Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup network keys on uninstall (#2484)

Browse Source
This commit is contained in:
Aiden McClelland
2023-10-30 10:43:00 -06:00
committed by GitHub
parent 765b542264
commit 9e554bdecd
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/.sqlx/query-b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d.json generated Normal file
View File

@@ -0,0 +1,14 @@
{
"db_name": "PostgreSQL",
"query": "DELETE FROM network_keys WHERE package = $1",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Text"
]
},
"nullable": []
},
"hash": "b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d"
}

9
backend/src/install/cleanup.rs
View File

@@ -173,7 +173,7 @@ where
); );
cleanup(ctx, id, &version).await?; cleanup(ctx, id, &version).await?;
cleanup_folder(volume_dir, Arc::new(dependents_paths)).await; cleanup_folder(volume_dir, Arc::new(dependents_paths)).await;
remove_tor_keys(secrets, id).await?; remove_network_keys(secrets, id).await?;
ctx.db ctx.db
.mutate(|d| { .mutate(|d| {
@@ -188,12 +188,15 @@ where
} }
#[instrument(skip_all)] #[instrument(skip_all)]
pub async fn remove_tor_keys<Ex>(secrets: &mut Ex, id: &PackageId) -> Result<(), Error> pub async fn remove_network_keys<Ex>(secrets: &mut Ex, id: &PackageId) -> Result<(), Error>
where where
for<'a> &'a mut Ex: Executor<'a, Database = Postgres>, for<'a> &'a mut Ex: Executor<'a, Database = Postgres>,
{ {
sqlx::query!("DELETE FROM network_keys WHERE package = $1", &*id)
.execute(&mut *secrets)
.await?;
sqlx::query!("DELETE FROM tor WHERE package = $1", &*id) sqlx::query!("DELETE FROM tor WHERE package = $1", &*id)
.execute(secrets) .execute(&mut *secrets)
.await?; .await?;
Ok(()) Ok(())
} }