compiles

Author: MikailBag

Cargo.toml

@@ -5,10 +5,8 @@ authors = ["Mikail Bagishov <bagishov.mikail@yandex.ru>"]
 edition = "2018"
 
 [dependencies]
-
 rand = "0.7.3"
 serde = { version = "1.0.106", features = ["derive"] }
-serde_json = "1.0.51"
 backtrace = "0.3.46"
 thiserror = "1.0.19"
 anyhow = "1.0.32"
@@ -19,6 +17,7 @@ procfs = "0.7.8"
 nix = {git = "https://github.com/nix-rust/nix"}
 libc = "0.2.68"
 errno = "0.2.5"
+serde_json = "1.0.51"
 
 [target.'cfg(target_os="windows")'.dependencies]
 winapi = { version = "0.3.9", features = ["std", "processthreadsapi", "jobapi2", "errhandlingapi",

minion-ffi/src/lib.rs

@@ -2,7 +2,7 @@
 #![cfg_attr(minion_nightly, warn(unsafe_op_in_unsafe_fn))]
 use minion::{self};
 use std::{
-    ffi::{CStr, OsStr, OsString},
+    ffi::{CStr,  OsString},
     mem::{self},
     os::raw::c_char,
 };
@@ -42,11 +42,23 @@ pub enum WaitOutcome {
 
 /// # Safety
 /// `buf` must be valid, readable pointer
+#[cfg(target_os = "linux")]
 unsafe fn get_string(buf: *const c_char) -> OsString {
     use std::os::unix::ffi::OsStrExt;
     let buf = unsafe { CStr::from_ptr(buf) };
     let buf = buf.to_bytes();
-    let s = OsStr::from_bytes(buf);
+    let s = std::ffi::OsStr::from_bytes(buf);
+    s.to_os_string()
+}
+/// # Safety
+/// `buf` must be valid, readable pointer
+#[cfg(target_os = "windows")]
+unsafe fn get_string(buf: *const c_char) -> OsString {
+    use std::os::windows::ffi::OsStringExt;
+    let buf = unsafe { CStr::from_ptr(buf) };
+    let buf = buf.to_bytes();
+    assert!(buf.len() % 2 == 0);
+    let s = OsString::from_wide(unsafe { buf.align_to::<u16>().1 });
     s.to_os_string()
 }
 

minion-tests/src/tests/simple.rs

@@ -53,7 +53,16 @@ impl crate::TestCase for TTlFork {
         #[cfg(target_os = "linux")]
         nix::unistd::fork().unwrap();
         #[cfg(target_os = "winfows")]
-        winapi::um::
+        unsafe {
+            winapi::um::processthreadsapi::CreateThread(
+                std::ptr::null_mut(),
+                0,
+                exceed_time_limit,
+                self,
+                0,
+                std::ptr::null_mut(),
+            );
+        }
         exceed_time_limit()
     }
     fn check(&self, cp: &mut dyn ChildProcess, _: &dyn Sandbox) {
@@ -74,7 +83,12 @@ impl crate::TestCase for TIdle {
         checks that it still will be killed"
     }
     fn test(&self) -> ! {
+        #[cfg(target_os = "linux")]
         nix::unistd::sleep(1_000_000_000);
+        #[cfg(target_os = "windows")]
+        unsafe {
+            winapi::um::synchapi::Sleep(1_000_000_000);
+        };
         std::process::exit(0)
     }
     fn check(&self, cp: &mut dyn ChildProcess, _: &dyn Sandbox) {
@@ -150,6 +164,7 @@ impl crate::TestCase for TSecurity {
     fn description(&self) -> &'static str {
         "verifies that isolated program can not make certain bad things"
     }
+    #[cfg(target_os = "linux")]
     fn test(&self) -> ! {
         // Check we can not read pid1's environment.
         let err = std::fs::read("/proc/1/environ").unwrap_err();
@@ -167,6 +182,11 @@ impl crate::TestCase for TSecurity {
         assert!(matches!(err, nix::Error::Sys(nix::errno::Errno::EPERM)));
         std::process::exit(24)
     }
+    #[cfg(target_os = "windows")]
+    fn test(&self) -> ! {
+        // TODO
+        std::process::exit(24)
+    }
     fn check(&self, cp: &mut dyn ChildProcess, _sb: &dyn Sandbox) {
         super::assert_exit_code(cp, 24);
         super::assert_empty(&mut cp.stdout().unwrap());

src/erased.rs

@@ -58,7 +58,6 @@ pub trait ChildProcess {
         &self,
         timeout: Option<std::time::Duration>,
     ) -> anyhow::Result<crate::WaitOutcome>;
-    fn poll(&self) -> anyhow::Result<()>;
     fn is_finished(&self) -> bool;
 }
 
@@ -90,9 +89,6 @@ impl<C: crate::ChildProcess> ChildProcess for C {
     ) -> anyhow::Result<crate::WaitOutcome> {
         self.wait_for_exit(timeout).map_err(Into::into)
     }
-    fn poll(&self) -> anyhow::Result<()> {
-        self.poll().map_err(Into::into)
-    }
     fn is_finished(&self) -> bool {
         self.is_finished()
     }

src/windows.rs

@@ -27,7 +27,7 @@ impl crate::Backend for WindowsBackend {
     type ChildProcess = child::WindowsChildProcess;
 
     fn new_sandbox(&self, options: crate::SandboxOptions) -> Result<Self::Sandbox, Self::Error> {
-        todo!()
+        sandbox::WindowsSandbox::create()
     }
 
     fn spawn(

src/windows/sandbox.rs

@@ -18,6 +18,12 @@ pub struct WindowsSandbox {
     job: HANDLE,
 }
 
+impl WindowsSandbox {
+    pub(in crate::windows) fn create() -> Result<Self, Error> {
+        todo!()
+    }
+}
+
 impl crate::Sandbox for WindowsSandbox {
     type Error = Error;
 
@@ -78,7 +84,6 @@ impl crate::Sandbox for WindowsSandbox {
             let viol = info.ViolationLimitFlags & JOB_OBJECT_LIMIT_JOB_TIME;
             Ok(viol != 0)
         }
- 
     }
 
     fn check_real_tle(&self) -> Result<bool, Self::Error> {