add clearnet functionality to frontend (#2814)

* add clearnet functionality to frontend

* add pattern and add sync db on rpcs

* add domain pattern

* show acme name instead of url if known

* dont blow up if domain not present after delete

* use common name for letsencrypt

* normalize urls

* refactor start-os ui net service

* backend migration and rpcs for serverInfo.host

* fix cors

* implement clearnet for main startos ui

* ability to add and remove tor addresses, including vanity

* add guard to prevent duplicate addresses

* misc bugfixes

* better heuristics for launching UIs

* fix ipv6 mocks

* fix ipv6 display bug

* rewrite url selection for launch ui

---------

Co-authored-by: Aiden McClelland <me@drbonez.dev>

core/startos/src/context/config.rs

@@ -108,8 +108,6 @@ pub struct ServerConfig {
     #[arg(long)]
     pub tor_socks: Option<SocketAddr>,
     #[arg(long)]
-    pub dns_bind: Option<Vec<SocketAddr>>,
-    #[arg(long)]
     pub revision_cache_size: Option<usize>,
     #[arg(long)]
     pub disable_encryption: Option<bool>,
@@ -125,7 +123,6 @@ impl ContextConfig for ServerConfig {
         self.os_partitions = self.os_partitions.take().or(other.os_partitions);
         self.tor_control = self.tor_control.take().or(other.tor_control);
         self.tor_socks = self.tor_socks.take().or(other.tor_socks);
-        self.dns_bind = self.dns_bind.take().or(other.dns_bind);
         self.revision_cache_size = self
             .revision_cache_size
             .take()

core/startos/src/context/rpc.rs

@@ -26,9 +26,9 @@ use crate::auth::Sessions;
 use crate::context::config::ServerConfig;
 use crate::db::model::Database;
 use crate::disk::OsPartitionInfo;
-use crate::init::check_time_is_synchronized;
+use crate::init::{check_time_is_synchronized, InitResult};
 use crate::lxc::{ContainerId, LxcContainer, LxcManager};
-use crate::net::net_controller::{NetController, PreInitNetController};
+use crate::net::net_controller::{NetController, NetService};
 use crate::net::utils::{find_eth_iface, find_wifi_iface};
 use crate::net::web_server::{UpgradableListener, WebServerAcceptorSetter};
 use crate::net::wifi::WpaCli;
@@ -53,6 +53,7 @@ pub struct RpcContextSeed {
     pub sync_db: watch::Sender<u64>,
     pub account: RwLock<AccountInfo>,
     pub net_controller: Arc<NetController>,
+    pub os_net_service: NetService,
     pub s9pk_arch: Option<&'static str>,
     pub services: ServiceMap,
     pub metrics_cache: RwLock<Option<crate::system::Metrics>>,
@@ -119,7 +120,7 @@ impl RpcContext {
         webserver: &WebServerAcceptorSetter<UpgradableListener>,
         config: &ServerConfig,
         disk_guid: Arc<String>,
-        net_ctrl: Option<PreInitNetController>,
+        init_result: Option<InitResult>,
         InitRpcContextPhases {
             mut load_db,
             mut init_net_ctrl,
@@ -133,7 +134,7 @@ impl RpcContext {
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
 
         load_db.start();
-        let db = if let Some(net_ctrl) = &net_ctrl {
+        let db = if let Some(InitResult { net_ctrl, .. }) = &init_result {
             net_ctrl.db.clone()
         } else {
             TypedPatchDb::<Database>::load(config.db().await?).await?
@@ -144,31 +145,28 @@ impl RpcContext {
         tracing::info!("Opened PatchDB");
 
         init_net_ctrl.start();
-        let net_controller = Arc::new(
-            NetController::init(
-                if let Some(net_ctrl) = net_ctrl {
-                    net_ctrl
-                } else {
-                    let net_ctrl = PreInitNetController::init(
-                        db.clone(),
-                        config
-                            .tor_control
-                            .unwrap_or(SocketAddr::from(([127, 0, 0, 1], 9051))),
-                        tor_proxy,
-                        &account.hostname,
-                        account.tor_key.clone(),
-                    )
-                    .await?;
-                    webserver.try_upgrade(|a| net_ctrl.net_iface.upgrade_listener(a))?;
-                    net_ctrl
-                },
-                config
-                    .dns_bind
-                    .as_deref()
-                    .unwrap_or(&[SocketAddr::from(([127, 0, 0, 1], 53))]),
-            )
-            .await?,
-        );
+        let (net_controller, os_net_service) = if let Some(InitResult {
+            net_ctrl,
+            os_net_service,
+        }) = init_result
+        {
+            (net_ctrl, os_net_service)
+        } else {
+            let net_ctrl = Arc::new(
+                NetController::init(
+                    db.clone(),
+                    config
+                        .tor_control
+                        .unwrap_or(SocketAddr::from(([127, 0, 0, 1], 9051))),
+                    tor_proxy,
+                    &account.hostname,
+                )
+                .await?,
+            );
+            webserver.try_upgrade(|a| net_ctrl.net_iface.upgrade_listener(a))?;
+            let os_net_service = net_ctrl.os_bindings().await?;
+            (net_ctrl, os_net_service)
+        };
         init_net_ctrl.complete();
         tracing::info!("Initialized Net Controller");
 
@@ -230,6 +228,7 @@ impl RpcContext {
             db,
             account: RwLock::new(account),
             net_controller,
+            os_net_service,
             s9pk_arch: if config.multi_arch_s9pks.unwrap_or(false) {
                 None
             } else {

core/startos/src/context/setup.rs

@@ -40,7 +40,7 @@ lazy_static::lazy_static! {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SetupResult {
-    pub tor_address: String,
+    pub tor_addresses: Vec<String>,
     #[ts(type = "string")]
     pub hostname: Hostname,
     #[ts(type = "string")]
@@ -51,7 +51,11 @@ impl TryFrom<&AccountInfo> for SetupResult {
     type Error = Error;
     fn try_from(value: &AccountInfo) -> Result<Self, Self::Error> {
         Ok(Self {
-            tor_address: format!("https://{}", value.tor_key.public().get_onion_address()),
+            tor_addresses: value
+                .tor_keys
+                .iter()
+                .map(|tor_key| format!("https://{}", tor_key.public().get_onion_address()))
+                .collect(),
             hostname: value.hostname.clone(),
             lan_address: value.hostname.lan_address(),
             root_ca: String::from_utf8(value.root_ca_cert.to_pem()?)?,