ksud: extract binaries properly (#1253)

tiann · Jan 5, 2024 · 30e0085 · 30e0085
1 parent faf7a8e
commit 30e0085
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/userspace/ksud/src/module.rs b/userspace/ksud/src/module.rs
@@ -330,7 +330,7 @@ fn _install_module(zip: &str) -> Result<()> {
     // print banner
     println!(include_str!("banner"));
 
-    assets::ensure_binaries(true).with_context(|| "Failed to extract assets")?;
+    assets::ensure_binaries(false).with_context(|| "Failed to extract assets")?;
 
     // first check if workding dir is usable
     ensure_dir_exists(defs::WORKING_DIR).with_context(|| "Failed to create working dir")?;

diff --git a/userspace/ksud/src/utils.rs b/userspace/ksud/src/utils.rs
@@ -1,7 +1,7 @@
 use anyhow::{bail, Context, Error, Ok, Result};
 use std::{
-    fs::{create_dir_all, write, File, OpenOptions},
-    io::{ErrorKind::AlreadyExists, Write},
+    fs::{create_dir_all, remove_file, write, File, OpenOptions},
+    io::{ErrorKind::AlreadyExists, ErrorKind::NotFound, Write},
     path::Path,
 };
 
@@ -63,6 +63,13 @@ pub fn ensure_binary<T: AsRef<Path>>(
         )
     })?)?;
 
+    if let Err(e) = remove_file(path.as_ref()) {
+        if e.kind() != NotFound {
+            return Err(Error::from(e))
+                .with_context(|| format!("failed to unlink {}", path.as_ref().display()));
+        }
+    }
+
     write(&path, contents)?;
     #[cfg(unix)]
     set_permissions(&path, Permissions::from_mode(0o755))?;