feat: Clean up LUKS decrypted volumes after use

Author: korewaChino

src/backend/install.rs

@@ -245,6 +245,23 @@ impl InstallationState {
             Self::dd_submarine(blockdev)?;
             InstallationType::set_cgpt_flags(blockdev)?;
         }
+        
+        tracing::info!("Cleaning up state...");
+        
+        if let Some(_key) = &self.encryption_key {
+            std::fs::remove_file(keyfile) // don't care if it fails
+                .unwrap_or_else(|e| tracing::warn!("Failed to remove keyfile: {e}"));
+            
+            // Close all mapped LUKS devices if exists
+            
+            if let Ok(mut cache) = super::repart_output::MAPPER_CACHE.try_write() {
+                if let Some(cache) = std::sync::Arc::get_mut(&mut cache) {
+                    cache.clear();
+                }
+            }
+            
+        }
+        
         tracing::info!("install() finished");
         Ok(())
     }

src/backend/repart_output.rs

@@ -1,12 +1,10 @@
 use bytesize::ByteSize;
 use color_eyre::eyre::{Context, OptionExt};
-use lsblk::Populate;
 use std::path::PathBuf;
 use std::{fmt::Write, sync::Arc};
 use sys_mount::MountFlags;
 use tiffin::{Container, MountTarget};
 
-use crate::INSTALLATION_STATE;
 use crate::{
     backend::repartcfg::{FileSystem, RepartConfig},
     util::sys::check_uefi,
@@ -48,15 +46,15 @@ impl MapperCache {
         }
     }
 
-    fn get(&self, node: &str) -> Option<&PathBuf> {
+    pub(crate) fn get(&self, node: &str) -> Option<&PathBuf> {
         self.cache.get(node)
     }
 
-    fn insert(&mut self, node: String, path: PathBuf) {
+    pub(crate) fn insert(&mut self, node: String, path: PathBuf) {
         self.cache.insert(node, path);
     }
 
-    fn clear(&mut self) {
+    pub(crate) fn clear(&mut self) {
         for (node, path) in self.cache.drain() {
             if let Err(e) = cryptsetup_close(&path.to_string_lossy()) {
                 tracing::error!(?node, ?e, "Failed to close mapper device");