cli: add stdio control server

* signing: implement signing service on the web

* wip

* cli: implement stdio service

This is used to implement the exec server for WSL. Guarded behind a signed handshake.

* update distro

* rm debug

* address pr comments

Author: connor4312

cli/Cargo.lock

@@ -22,7 +22,7 @@ flate2 = { version = "1.0.22" }
 zip = { version = "0.5.13", default-features = false, features = ["time", "deflate"] }
 regex = { version = "1.5.5" }
 lazy_static = { version = "1.4.0" }
-sysinfo = { version = "0.27.7" }
+sysinfo = { version = "0.27.7", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 rmp-serde = "1.0"

cli/Cargo.toml

@@ -8,7 +8,7 @@ use std::process::Command;
 
 use clap::Parser;
 use cli::{
-	commands::{args, internal_wsl, tunnels, update, version, CommandContext},
+	commands::{args, tunnels, update, version, CommandContext},
 	constants::get_default_user_agent,
 	desktop, log,
 	state::LauncherPaths,
@@ -65,9 +65,6 @@ async fn main() -> Result<(), std::convert::Infallible> {
 			..
 		}) => match cmd {
 			args::StandaloneCommands::Update(args) => update::update(context!(), args).await,
-			args::StandaloneCommands::Wsl(args) => match args.command {
-				args::WslCommands::Serve => internal_wsl::serve(context!()).await,
-			},
 		},
 		args::AnyCli::Standalone(args::StandaloneCli { core: c, .. })
 		| args::AnyCli::Integrated(args::IntegratedCli { core: c, .. }) => match c.subcommand {
@@ -98,6 +95,8 @@ async fn main() -> Result<(), std::convert::Infallible> {
 				args::VersionSubcommand::Show => version::show(context!()).await,
 			},
 
+			Some(args::Commands::CommandShell) => tunnels::command_shell(context!()).await,
+
 			Some(args::Commands::Tunnel(tunnel_args)) => match tunnel_args.subcommand {
 				Some(args::TunnelSubcommand::Prune) => tunnels::prune(context!()).await,
 				Some(args::TunnelSubcommand::Unregister) => tunnels::unregister(context!()).await,

cli/src/bin/code/main.rs

@@ -6,7 +6,6 @@
 mod context;
 
 pub mod args;
-pub mod internal_wsl;
 pub mod tunnels;
 pub mod update;
 pub mod version;

cli/src/commands.rs

@@ -146,22 +146,6 @@ impl<'a> From<&'a CliCore> for CodeServerArgs {
 pub enum StandaloneCommands {
 	/// Updates the CLI.
 	Update(StandaloneUpdateArgs),
-
-	/// Internal commands for WSL serving.
-	#[clap(hide = true)]
-	Wsl(WslArgs),
-}
-
-#[derive(Args, Debug, Clone)]
-pub struct WslArgs {
-	#[clap(subcommand)]
-	pub command: WslCommands,
-}
-
-#[derive(Subcommand, Debug, Clone)]
-pub enum WslCommands {
-	/// Runs the WSL server on stdin/out
-	Serve,
 }
 
 #[derive(Args, Debug, Clone)]
@@ -187,6 +171,10 @@ pub enum Commands {
 
 	/// Changes the version of the editor you're using.
 	Version(VersionArgs),
+
+	/// Runs the control server on process stdin/stdout
+	#[clap(hide = true)]
+	CommandShell,
 }
 
 #[derive(Args, Debug, Clone)]

cli/src/commands/args.rs

@@ -25,13 +25,13 @@ use crate::{
 		code_server::CodeServerArgs,
 		create_service_manager, dev_tunnels, legal,
 		paths::get_all_servers,
-		protocol,
+		protocol, serve_stream,
 		shutdown_signal::ShutdownRequest,
 		singleton_client::do_single_rpc_call,
 		singleton_server::{
 			make_singleton_server, start_singleton_server, BroadcastLogSink, SingletonServerArgs,
 		},
-		Next, ServiceContainer, ServiceManager,
+		Next, ServeStreamParams, ServiceContainer, ServiceManager,
 	},
 	util::{
 		app_lock::AppMutex,
@@ -107,6 +107,25 @@ impl ServiceContainer for TunnelServiceContainer {
 	}
 }
 
+pub async fn command_shell(ctx: CommandContext) -> Result<i32, AnyError> {
+	let platform = PreReqChecker::new().verify().await?;
+	serve_stream(
+		tokio::io::stdin(),
+		tokio::io::stderr(),
+		ServeStreamParams {
+			log: ctx.log,
+			launcher_paths: ctx.paths,
+			platform,
+			requires_auth: true,
+			exit_barrier: ShutdownRequest::create_rx([ShutdownRequest::CtrlC]),
+			code_server_args: (&ctx.args).into(),
+		},
+	)
+	.await;
+
+	Ok(0)
+}
+
 pub async fn service(
 	ctx: CommandContext,
 	service_args: TunnelServiceSubCommands,

cli/src/commands/internal_wsl.rs

@@ -18,7 +18,8 @@ pub const CONTROL_PORT: u16 = 31545;
 ///  2 - Addition of `serve.compressed` property to control whether servermsg's
 ///      are compressed bidirectionally.
 ///  3 - The server's connection token is set to a SHA256 hash of the tunnel ID
-pub const PROTOCOL_VERSION: u32 = 3;
+///  4 - The server's msgpack messages are no longer length-prefixed
+pub const PROTOCOL_VERSION: u32 = 4;
 
 /// Prefix for the tunnel tag that includes the version.
 pub const PROTOCOL_VERSION_TAG_PREFIX: &str = "protocolv";