From c99a587afc8ec105d51c0ff7a3b1706fb04c2c50 Mon Sep 17 00:00:00 2001 From: VallierDev <24893073+VallierDev@users.noreply.github.com> Date: Wed, 14 Oct 2026 23:59:04 +0800 Subject: [PATCH] Reject unknown arguments instead of starting a second host Any unrecognized first argument fell through to the server start-up, so a mistyped or missing subcommand launched a second full host next to the running service. Print usage and exit 2; help/-h/--help print usage. Co-Authored-By: Claude Opus 5.5 --- src/main.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main.rs b/src/main.rs index d0c773a..60d986a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -49,6 +49,15 @@ use webrtc::WebRtcSession; #[tokio::main] async fn main() -> Result<(), Box> { env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init(); + // An unknown argument must never fall through to starting a second full host server. + const SUBCOMMANDS: [&str; 8] = ["login", "unlock-check", "desktop-probe", "desktop-video-probe", "wayland-capture", + "wayland-input-probe", "clipboard-acceptance", "portal-acceptance"]; + if let Some(arg) = std::env::args().nth(1).filter(|a| !SUBCOMMANDS.contains(&a.as_str())) { + let usage = format!("usage: uuremote-server [{}]\n (no argument: run the host)", SUBCOMMANDS.join(" | ")); + if matches!(arg.as_str(), "help" | "-h" | "--help") { println!("{usage}"); return Ok(()); } + eprintln!("unknown argument: {arg}\n{usage}"); + std::process::exit(2); + } if std::env::args().nth(1).as_deref() == Some("clipboard-acceptance") { return tokio::task::spawn_blocking(clipboard_probe::run).await?.map_err(Into::into); }