cleanup network keys on uninstall (#2484)

Start9Labs · Oct 30, 2023 · 9e554bd · 9e554bd
1 parent 765b542
commit 9e554bd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/backend/.sqlx/query-b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d.json b/backend/.sqlx/query-b203820ee1c553a4b246eac74b79bd10d5717b2a0ddecf22330b7d531aac7c5d.json
diff --git a/backend/src/install/cleanup.rs b/backend/src/install/cleanup.rs
@@ -173,7 +173,7 @@ where
     );
     cleanup(ctx, id, &version).await?;
     cleanup_folder(volume_dir, Arc::new(dependents_paths)).await;
-    remove_tor_keys(secrets, id).await?;
+    remove_network_keys(secrets, id).await?;
 
     ctx.db
         .mutate(|d| {
@@ -188,12 +188,15 @@ where
 }
 
 #[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
     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)
-        .execute(secrets)
+        .execute(&mut *secrets)
         .await?;
     Ok(())
 }