agentHost: support connections over tunnels (#307948)

* wip

* clean up unused bits and make auth work correctly

* comments and fixes

Author: connor4312

cli/src/commands/agent_host.rs

@@ -31,7 +31,8 @@ use crate::{
 	async_pipe::{get_socket_name, listen_socket_rw_stream, AsyncRWAccepter},
 	auth::Auth,
 	constants::{
-		APPLICATION_NAME, CONTROL_PORT, IS_A_TTY, TUNNEL_CLI_LOCK_NAME, TUNNEL_SERVICE_LOCK_NAME,
+		AGENT_HOST_PORT, APPLICATION_NAME, CONTROL_PORT, IS_A_TTY, TUNNEL_CLI_LOCK_NAME,
+		TUNNEL_SERVICE_LOCK_NAME,
 	},
 	log,
 	state::LauncherPaths,
@@ -330,7 +331,8 @@ pub async fn user(ctx: CommandContext, user_args: TunnelUserSubCommands) -> Resu
 		}
 		TunnelUserSubCommands::Show => {
 			if let Ok(Some(sc)) = auth.get_current_credential() {
-				ctx.log.result(format!("logged in with provider {}", sc.provider));
+				ctx.log
+					.result(format!("logged in with provider {}", sc.provider));
 			} else {
 				ctx.log.result("not logged in");
 				return Ok(1);
@@ -649,7 +651,7 @@ async fn serve_with_csa(
 			dt.start_existing_tunnel(t).await
 		} else {
 			tokio::select! {
-				t = dt.start_new_launcher_tunnel(gateway_args.name.as_deref(), gateway_args.random_name, &[CONTROL_PORT]) => t,
+				t = dt.start_new_launcher_tunnel(gateway_args.name.as_deref(), gateway_args.random_name, &[CONTROL_PORT, AGENT_HOST_PORT]) => t,
 				_ = shutdown.wait() => return Ok(1),
 			}
 		}?;

cli/src/commands/tunnels.rs

@@ -12,6 +12,7 @@ use lazy_static::lazy_static;
 use crate::options::Quality;
 
 pub const CONTROL_PORT: u16 = 31545;
+pub const AGENT_HOST_PORT: u16 = 31546;
 
 /// Protocol version sent to clients. This can be used to indicate new or
 /// changed capabilities that clients may wish to leverage.
@@ -20,7 +21,8 @@ pub const CONTROL_PORT: u16 = 31545;
 ///      are compressed bidirectionally.
 ///  3 - The server's connection token is set to a SHA256 hash of the tunnel ID
 ///  4 - The server's msgpack messages are no longer length-prefixed
-pub const PROTOCOL_VERSION: u32 = 4;
+///  5 - The server now exposes an agent host connection
+pub const PROTOCOL_VERSION: u32 = 5;
 
 /// Prefix for the tunnel tag that includes the version.
 pub const PROTOCOL_VERSION_TAG_PREFIX: &str = "protocolv";

cli/src/constants.rs

@@ -13,6 +13,7 @@ pub mod shutdown_signal;
 pub mod singleton_client;
 pub mod singleton_server;
 
+pub mod agent_host;
 mod challenge;
 mod control_server;
 mod nosleep;