more cleanup

Author: MikailBag

Cargo.toml

@@ -7,13 +7,11 @@ edition = "2018"
 [dependencies]
 rand = "0.8.3"
 serde = { version = "1.0.123", features = ["derive"] }
-serde_json = "1.0.62"
 backtrace = "0.3.56"
 thiserror = "1.0.23"
 anyhow = "1.0.38"
 once_cell = "1.5.2"
 futures-util = "0.3.12"
-tokio = { version = "1.2.0", features = ["net"] }
 tracing = "0.1.23"
 
 [target.'cfg(target_os="linux")'.dependencies]

minion-tests/src/master.rs

@@ -152,6 +152,9 @@ fn get_filter(matches: &clap::ArgMatches) -> Box<dyn Fn(&'static dyn TestCase) -
 }
 
 fn check_static() {
+    if cfg!(not(target_os = "linux")) {
+        return;
+    }
     let ldd_output = std::process::Command::new("ldd")
         .arg(std::env::current_exe().unwrap())
         .output()

src/windows/isolate.rs

@@ -20,6 +20,8 @@ use winapi::{
 pub(crate) struct Profile {
     /// Pointer to the Security Identifier (SID) of this container
     sid: PSID,
+    /// Profile name (used in destructor)
+    profile_name: Vec<u16>,
 }
 
 unsafe impl Send for Profile {}
@@ -33,7 +35,6 @@ impl Profile {
         let profile_name = OsString::from(format!("minion-sandbox-appcontainer-{}", sandbox_id));
         let mut profile_name: Vec<u16> = profile_name.encode_wide().collect();
         profile_name.push(0);
-        let profile_name = profile_name.as_ptr();
         let mut sid = std::ptr::null_mut();
         unsafe {
             let mut sid_string_repr = std::ptr::null_mut();
@@ -51,15 +52,15 @@ impl Profile {
         }
         unsafe {
             Cvt::hresult(CreateAppContainerProfile(
-                profile_name,
-                profile_name,
-                profile_name,
+                profile_name.as_ptr(),
+                profile_name.as_ptr(),
+                profile_name.as_ptr(),
                 std::ptr::null_mut(),
                 0,
                 &mut sid,
             ))?;
         }
-        Ok(Profile { sid })
+        Ok(Profile { sid, profile_name })
     }
     /// Returns `SECURITY_CAPABILITIES` representing this container.
     #[instrument(skip(self))]
@@ -75,6 +76,9 @@ impl Drop for Profile {
     fn drop(&mut self) {
         unsafe {
             FreeSid(self.sid);
+            if let Err(e) = Cvt::hresult(DeleteAppContainerProfile(self.profile_name.as_ptr())) {
+                tracing::warn!(error = %e, "Ignoring resource cleanup error");
+            }
         }
     }
 }

src/windows/spawn.rs

@@ -21,11 +21,10 @@ use winapi::{
         handleapi::INVALID_HANDLE_VALUE,
         minwinbase::SECURITY_ATTRIBUTES,
         processthreadsapi::{
-            CreateProcessW, DeleteProcThreadAttributeList, GetCurrentProcess,
+            CreateProcessW, DeleteProcThreadAttributeList,
             InitializeProcThreadAttributeList, UpdateProcThreadAttribute, PROCESS_INFORMATION,
             PROC_THREAD_ATTRIBUTE_LIST,
         },
-        userenv::{CreateAppContainerProfile, DeleteAppContainerProfile},
         winbase::{
             CreateFileMappingA, CREATE_UNICODE_ENVIRONMENT, EXTENDED_STARTUPINFO_PRESENT,
             STARTF_USESTDHANDLES, STARTUPINFOEXW,