cleanup job

Author: MikailBag

src/windows/constrain.rs

@@ -3,12 +3,11 @@
 use std::{ffi::OsString, os::windows::ffi::OsStrExt};
 
 use crate::{
-    windows::{Cvt, Error},
+    windows::{util::OwnedHandle, Cvt, Error},
     ResourceUsageData,
 };
 
 use winapi::um::{
-    handleapi::CloseHandle,
     jobapi2::{
         AssignProcessToJobObject, CreateJobObjectW, QueryInformationJobObject,
         SetInformationJobObject, TerminateJobObject,
@@ -25,19 +24,17 @@ use winapi::um::{
 /// Responsible for resource isolation & adding & killing
 #[derive(Debug)]
 pub(crate) struct Job {
-    handle: HANDLE,
+    handle: OwnedHandle,
 }
 
-unsafe impl Send for Job {}
-unsafe impl Sync for Job {}
-
 impl Job {
     pub(crate) fn new(jail_id: &str) -> Result<Self, Error> {
         let name: OsString = format!("minion-sandbox-job-{}", jail_id).into();
         let name: Vec<u16> = name.encode_wide().collect();
         let handle = unsafe {
             Cvt::nonzero(CreateJobObjectW(std::ptr::null_mut(), name.as_ptr()) as i32)? as HANDLE
         };
+        let handle = OwnedHandle::new(handle);
         Ok(Self { handle })
     }
     pub(crate) fn enable_resource_limits(
@@ -60,7 +57,7 @@ impl Job {
             | JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
         unsafe {
             Cvt::nonzero(SetInformationJobObject(
-                self.handle,
+                self.handle.as_raw(),
                 JobObjectExtendedLimitInformation,
                 (&mut info as *mut JOBOBJECT_EXTENDED_LIMIT_INFORMATION).cast(),
                 sizeof::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>(),
@@ -69,16 +66,22 @@ impl Job {
         Ok(())
     }
     pub(crate) fn kill(&self) -> Result<(), Error> {
-        unsafe { Cvt::nonzero(TerminateJobObject(self.handle, 0xDEADBEEF)).map(|_| ()) }
+        unsafe { Cvt::nonzero(TerminateJobObject(self.handle.as_raw(), 0xDEADBEEF)).map(|_| ()) }
     }
     pub(crate) fn add_process(&self, process_handle: HANDLE) -> Result<(), Error> {
-        unsafe { Cvt::nonzero(AssignProcessToJobObject(self.handle, process_handle)).map(|_| ()) }
+        unsafe {
+            Cvt::nonzero(AssignProcessToJobObject(
+                self.handle.as_raw(),
+                process_handle,
+            ))
+            .map(|_| ())
+        }
     }
     pub(crate) fn resource_usage(&self) -> Result<crate::ResourceUsageData, Error> {
         let cpu = unsafe {
             let mut info: JOBOBJECT_BASIC_ACCOUNTING_INFORMATION = std::mem::zeroed();
             Cvt::nonzero(QueryInformationJobObject(
-                self.handle,
+                self.handle.as_raw(),
                 JobObjectBasicAccountingInformation,
                 (&mut info as *mut JOBOBJECT_BASIC_ACCOUNTING_INFORMATION).cast(),
                 sizeof::<JOBOBJECT_BASIC_ACCOUNTING_INFORMATION>(),
@@ -92,7 +95,7 @@ impl Job {
         let memory = unsafe {
             let mut info: JOBOBJECT_EXTENDED_LIMIT_INFORMATION = std::mem::zeroed();
             Cvt::nonzero(QueryInformationJobObject(
-                self.handle,
+                self.handle.as_raw(),
                 JobObjectExtendedLimitInformation,
                 (&mut info as *mut JOBOBJECT_EXTENDED_LIMIT_INFORMATION).cast(),
                 sizeof::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>(),
@@ -110,7 +113,7 @@ impl Job {
         unsafe {
             let mut info: JOBOBJECT_LIMIT_VIOLATION_INFORMATION = std::mem::zeroed();
             Cvt::nonzero(QueryInformationJobObject(
-                self.handle,
+                self.handle.as_raw(),
                 JobObjectLimitViolationInformation,
                 (&mut info as *mut JOBOBJECT_LIMIT_VIOLATION_INFORMATION).cast(),
                 sizeof::<JOBOBJECT_LIMIT_VIOLATION_INFORMATION>(),
@@ -127,14 +130,6 @@ impl Job {
     }
 }
 
-impl Drop for Job {
-    fn drop(&mut self) {
-        unsafe {
-            CloseHandle(self.handle);
-        }
-    }
-}
-
 fn sizeof<T>() -> u32 {
     let sz = std::mem::size_of::<T>();
     assert!(sz <= (u32::max_value() as usize));

src/windows/spawn.rs

@@ -21,9 +21,8 @@ use winapi::{
         handleapi::INVALID_HANDLE_VALUE,
         minwinbase::SECURITY_ATTRIBUTES,
         processthreadsapi::{
-            CreateProcessW, DeleteProcThreadAttributeList,
-            InitializeProcThreadAttributeList, UpdateProcThreadAttribute, PROCESS_INFORMATION,
-            PROC_THREAD_ATTRIBUTE_LIST,
+            CreateProcessW, DeleteProcThreadAttributeList, InitializeProcThreadAttributeList,
+            UpdateProcThreadAttribute, PROCESS_INFORMATION, PROC_THREAD_ATTRIBUTE_LIST,
         },
         winbase::{
             CreateFileMappingA, CREATE_UNICODE_ENVIRONMENT, EXTENDED_STARTUPINFO_PRESENT,