Merge muvm-guest and muvm-server

We no longer need the server to be a separate binary.

Signed-off-by: Sasha Finkelstein <[email protected]>

Author: WhatAmISupposedToPutHere

crates/muvm/Cargo.toml

@@ -40,10 +40,6 @@ path = "src/guest/bin/muvm-guest.rs"
 name = "muvm-hidpipe"
 path = "src/hidpipe/bin/muvm-hidpipe.rs"
 
-[[bin]]
-name = "muvm-server"
-path = "src/server/bin/muvm-server.rs"
-
 [[bin]]
 name = "muvm-x11bridge"
 path = "src/x11bridge/bin/muvm-x11bridge.rs"

crates/muvm/src/bin/muvm.rs

@@ -384,7 +384,6 @@ fn main() -> Result<ExitCode> {
     }
 
     let muvm_guest_path = find_muvm_exec("muvm-guest")?;
-    let muvm_server_path = find_muvm_exec("muvm-server")?;
 
     let mut muvm_guest_args: Vec<String> = vec![
         muvm_guest_path
@@ -394,10 +393,6 @@ fn main() -> Result<ExitCode> {
         username,
         format!("{uid}", uid = getuid().as_raw()),
         format!("{gid}", gid = getgid().as_raw()),
-        muvm_server_path
-            .to_str()
-            .context("Failed to process `muvm-server` path as it contains invalid UTF-8")?
-            .to_owned(),
         command
             .to_str()
             .context("Failed to process command as it contains invalid UTF-8")?

crates/muvm/src/guest/bin/muvm-guest.rs

@@ -1,19 +1,17 @@
 use std::cmp;
 use std::os::fd::AsFd;
-use std::os::unix::process::CommandExt as _;
 use std::process::Command;
 
 use anyhow::{Context, Result};
-use log::debug;
 use muvm::env::find_muvm_exec;
 use muvm::guest::cli_options::options;
 use muvm::guest::fex::setup_fex;
 use muvm::guest::mount::mount_filesystems;
 use muvm::guest::net::configure_network;
+use muvm::guest::server::server_main;
 use muvm::guest::socket::setup_socket_proxy;
 use muvm::guest::user::setup_user;
 use muvm::guest::x11::setup_x11_forwarding;
-use nix::unistd::{setresgid, setresuid, Gid, Uid};
 use rustix::process::{getrlimit, setrlimit, Resource};
 
 fn main() -> Result<()> {
@@ -75,11 +73,8 @@ fn main() -> Result<()> {
 
     setup_x11_forwarding(run_path)?;
 
-    setresuid(options.uid, Uid::from(0), Uid::from(0))?;
-    setresgid(options.gid, Gid::from(0), Gid::from(0))?;
-    debug!(command:? = options.command, command_args:? = options.command_args; "exec");
-    let err = Command::new(&options.command)
-        .args(options.command_args)
-        .exec();
-    Err(err).with_context(|| format!("Failed to exec {:?}", options.command))?
+    let rt = tokio::runtime::Runtime::new().unwrap();
+    rt.block_on(async {
+        server_main(options.server_port, options.command, options.command_args).await
+    })
 }

crates/muvm/src/guest/cli_options.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use anyhow::Context;
-use bpaf::{any, construct, positional, OptionParser, Parser};
+use bpaf::{any, construct, env, positional, OptionParser, Parser};
 use nix::libc::{gid_t, uid_t};
 use nix::unistd::{Gid, Uid};
 
@@ -10,11 +10,18 @@ pub struct Options {
     pub username: String,
     pub uid: Uid,
     pub gid: Gid,
+    pub server_port: u32,
     pub command: PathBuf,
     pub command_args: Vec<String>,
 }
 
 pub fn options() -> OptionParser<Options> {
+    let server_port = env("MUVM_SERVER_PORT")
+        .short('p')
+        .help("TCP port to listen for command launch requests")
+        .argument("SERVER_PORT")
+        .fallback(3334)
+        .display_fallback();
     let username = positional("USER");
     let uid = positional::<String>("UID").parse(|s| {
         s.parse::<uid_t>()
@@ -33,6 +40,7 @@ pub fn options() -> OptionParser<Options> {
     .many();
 
     construct!(Options {
+        server_port,
         // positionals
         username,
         uid,

crates/muvm/src/guest/mod.rs

@@ -2,6 +2,8 @@ pub mod cli_options;
 pub mod fex;
 pub mod mount;
 pub mod net;
+pub mod server;
+pub mod server_worker;
 pub mod socket;
 pub mod user;
 pub mod x11;

crates/muvm/src/server/bin/muvm-server.rs crates/muvm/src/guest/server.rscrates/muvm/src/server/bin/muvm-server.rs renamed to crates/muvm/src/guest/server.rs

@@ -1,47 +1,34 @@
-use std::env;
-use std::os::unix::process::ExitStatusExt as _;
-
+use crate::guest::server_worker::{State, Worker};
 use anyhow::{Context, Result};
 use log::error;
-use muvm::server::cli_options::options;
-use muvm::server::worker::{State, Worker};
-use nix::unistd::{getgid, getuid, setresgid, setresuid, Gid, Uid};
+use std::env;
+use std::os::unix::process::ExitStatusExt as _;
+use std::path::PathBuf;
 use tokio::net::TcpListener;
 use tokio::process::Command;
 use tokio::sync::watch;
 use tokio_stream::wrappers::WatchStream;
 use tokio_stream::StreamExt as _;
 use uuid::Uuid;
 
-fn main() -> Result<()> {
+pub async fn server_main(
+    server_port: u32,
+    command: PathBuf,
+    command_args: Vec<String>,
+) -> Result<()> {
     let cookie = env::var("MUVM_SERVER_COOKIE")
         .with_context(|| "Could find server cookie as an environment variable")?;
 
-    let rt = tokio::runtime::Runtime::new().unwrap();
-    rt.block_on(async { tokio_main(cookie).await })
-}
-
-async fn tokio_main(cookie: String) -> Result<()> {
-    env_logger::init();
-
     let cookie = Uuid::try_parse(&cookie).context("Couldn't parse cookie as UUID v7")?;
-    let uid = getuid();
-    let gid = getgid();
-    setresuid(uid, uid, Uid::from(0))?;
-    setresgid(gid, gid, Gid::from(0))?;
-
-    let options = options().run();
 
-    let listener = TcpListener::bind(format!("0.0.0.0:{}", options.server_port)).await?;
+    let listener = TcpListener::bind(format!("0.0.0.0:{}", server_port)).await?;
     let (state_tx, state_rx) = watch::channel(State::new());
 
     let mut worker_handle = tokio::spawn(async move {
         let mut worker = Worker::new(cookie, listener, state_tx);
         worker.run().await;
     });
-    let command_status = Command::new(&options.command)
-        .args(options.command_args)
-        .status();
+    let command_status = Command::new(&command).args(command_args).status();
     tokio::pin!(command_status);
     let mut state_rx = WatchStream::new(state_rx);
 
@@ -69,12 +56,12 @@ async fn tokio_main(cookie: String) -> Result<()> {
                             if let Some(code) = status.code() {
                                 eprintln!(
                                     "{:?} process exited with status code: {code}",
-                                    options.command
+                                    command
                                 );
                             } else {
                                 eprintln!(
                                     "{:?} process terminated by signal: {}",
-                                    options.command,
+                                    command,
                                     status
                                         .signal()
                                         .expect("either one of status code or signal should be set")
@@ -85,7 +72,7 @@ async fn tokio_main(cookie: String) -> Result<()> {
                     Err(err) => {
                         eprintln!(
                             "Failed to execute {:?} as child process: {err}",
-                            options.command
+                            command
                         );
                     },
                 }

crates/muvm/src/server/worker.rs crates/muvm/src/guest/server_worker.rscrates/muvm/src/server/worker.rs renamed to crates/muvm/src/guest/server_worker.rs

@@ -9,6 +9,5 @@ pub mod net;
 pub mod types;
 
 pub mod guest;
-pub mod server;
 pub mod tty;
 pub mod utils;