Use uuidv7 for stdout / stderr files

It's too easy to hit the same millisecond...

Signed-off-by: Teoh Han Hui <[email protected]>

Author: teohhanhui

Cargo.lock

@@ -27,3 +27,4 @@ tempfile = { version = "3.10.1", default-features = false }
 tokio = { version = "1.38.0", default-features = false }
 tokio-stream = { version = "0.1.15", default-features = false }
 utils = { path = "crates/utils", default-features = false }
+uuid = { version = "1.10.0", default-features = false }

Cargo.toml

@@ -54,11 +54,12 @@ pub fn mount_filesystems() -> Result<()> {
 
     // Expose the host filesystem (without any overlaid mounts) as /run/krun-host
     let host_path = Path::new("/run/krun-host");
-    std::fs::create_dir_all(&host_path)?;
+    std::fs::create_dir_all(host_path)?;
     mount_bind("/", host_path).context("Failed to bind-mount / on /run/krun-host")?;
 
     if Path::new("/tmp/.X11-unix").exists() {
-        // Mount a tmpfs for X11 sockets, so the guest doesn't clobber host X server sockets
+        // Mount a tmpfs for X11 sockets, so the guest doesn't clobber host X server
+        // sockets
         mount2(
             Some("tmpfs"),
             "/tmp/.X11-unix",

crates/krun-guest/src/mount.rs

@@ -25,7 +25,7 @@ where
             socket_path
                 .as_ref()
                 .to_str()
-                .expect("pulse_path should not contain invalid UTF-8")
+                .expect("socket_path should not contain invalid UTF-8")
         ))
         .arg(format!("VSOCK-CONNECT:2:{}", port))
         .stdin(Stdio::null())

crates/krun-guest/src/socket.rs

@@ -1,12 +1,13 @@
-use crate::socket::setup_socket_proxy;
-
-use anyhow::{anyhow, Context, Result};
-use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use std::env;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::Path;
 
+use anyhow::{anyhow, Context, Result};
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+
+use crate::socket::setup_socket_proxy;
+
 pub fn setup_x11_forwarding<P>(run_path: P) -> Result<()>
 where
     P: AsRef<Path>,
@@ -70,13 +71,13 @@ where
 
             wtr.write_u16::<BigEndian>(family)?;
             wtr.write_u16::<BigEndian>(addr.len().try_into()?)?;
-            wtr.write(&addr)?;
+            wtr.write_all(&addr)?;
             wtr.write_u16::<BigEndian>(display.len().try_into()?)?;
-            wtr.write(display)?;
+            wtr.write_all(display)?;
             wtr.write_u16::<BigEndian>(name.len().try_into()?)?;
-            wtr.write(&name)?;
+            wtr.write_all(&name)?;
             wtr.write_u16::<BigEndian>(data.len().try_into()?)?;
-            wtr.write(&data)?;
+            wtr.write_all(&data)?;
 
             break;
         }

crates/krun-guest/src/x11.rs

@@ -198,8 +198,8 @@ fn main() -> Result<()> {
 
     // Forward the native X11 display into the guest as a socket
     if let Ok(x11_display) = env::var("DISPLAY") {
-        if x11_display.starts_with(":") {
-            let socket_path = Path::new("/tmp/.X11-unix/").join(format!("X{}", &x11_display[1..]));
+        if let Some(x11_display) = x11_display.strip_prefix(":") {
+            let socket_path = Path::new("/tmp/.X11-unix/").join(format!("X{}", x11_display));
             if socket_path.exists() {
                 let socket_path = CString::new(
                     socket_path

crates/krun/src/bin/krun.rs

@@ -25,7 +25,8 @@ pub fn start_passt(server_port: u32) -> Result<UnixStream> {
 
     // SAFETY: The parent process should not keep the file descriptor of
     // `child_socket` open. It is a `UnixStream` so the file descriptor will be
-    // closed on drop. See https://doc.rust-lang.org/std/io/index.html#io-safety
+    // closed on drop.
+    // See https://doc.rust-lang.org/std/io/index.html#io-safety
     //
     // The `dup` call clears the `FD_CLOEXEC` flag on the new `child_fd`, which
     // should be inherited by the child process.

crates/krun/src/net.rs

@@ -10,6 +10,7 @@ publish = false
 [dependencies]
 anyhow = { workspace = true, features = ["std"] }
 serde = { workspace = true, features = ["derive"] }
+uuid = { workspace = true, features = ["std", "v7"] }
 
 [features]
 default = []

crates/utils/Cargo.toml

@@ -2,9 +2,9 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::path::Path;
 use std::process::Stdio;
-use std::time::{SystemTime, UNIX_EPOCH};
 
 use anyhow::{Context, Result};
+use uuid::Uuid;
 
 pub fn make_stdout_stderr<P>(command: P, envs: &HashMap<String, String>) -> Result<(Stdio, Stdio)>
 where
@@ -22,9 +22,9 @@ where
     } else {
         Path::new("/tmp")
     };
-    let ts = SystemTime::now().duration_since(UNIX_EPOCH)?.as_millis();
-    let path_stdout = base.join(format!("krun-{filename}-{ts}.stdout"));
-    let path_stderr = base.join(format!("krun-{filename}-{ts}.stderr"));
+    let uuid = Uuid::now_v7();
+    let path_stdout = base.join(format!("krun-{filename}-{uuid}.stdout"));
+    let path_stderr = base.join(format!("krun-{filename}-{uuid}.stderr"));
     Ok((
         File::create_new(path_stdout)?.into(),
         File::create_new(path_stderr)?.into(),