chore(deps): update rust crate livekit-protocol to v0.7.12

Cargo.lock

@@ -104,7 +104,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.4",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -238,9 +238,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 
 [[package]]
 name = "cc"
-version = "1.4.4"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad534f4357a5264cce5019c989cf66a4f0dc4e0d1b1d15f8aacec0ff7360273"
+checksum = "509591b7bcd67f4ef775afad7662703b4935daaa6ec0e5605cfb1090b32a2b6d"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -338,9 +338,9 @@ checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
 
 [[package]]
 name = "combine"
-version = "4.6.8"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "memchr",
@@ -572,7 +572,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.4",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -614,9 +614,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.18.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
+checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
 
 [[package]]
 name = "enum-as-inner"
@@ -771,7 +771,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.4",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -854,9 +854,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.19"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8e5e5a340588f4452631496976cf8636d4a7ecf600239fdc27615d2530bc16"
+checksum = "a9f37a958b41b3b19ee2707c06439c0e9e547e847223eb791ecb0cb821c65e27"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1170,9 +1170,9 @@ checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa"
 
 [[package]]
 name = "icu_provider"
-version = "2.3.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73"
+checksum = "92a7ed671a6aad807a8651a2e1782a6598fda9ce5185dd8158549e95a91c6428"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -1397,9 +1397,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f198d1db720e4940b5a493201d199d9f24f568f8f746bd13706243a2f71598"
+checksum = "ffd9697dc4a9a62e2da93389f34400b77a28f0287711263cabb203b3ccb9c0e4"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
@@ -1517,9 +1517,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.34"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
 
 [[package]]
 name = "lru-cache"
@@ -1615,7 +1615,7 @@ dependencies = [
 [[package]]
 name = "mtp"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "mtp-client",
  "mtp-codec",
@@ -1631,7 +1631,7 @@ dependencies = [
 [[package]]
 name = "mtp-client"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "mtp-codec",
  "mtp-common",
@@ -1644,7 +1644,7 @@ dependencies = [
 [[package]]
 name = "mtp-codec"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "base64 0.23.1",
  "byteorder",
@@ -1658,9 +1658,10 @@ dependencies = [
 [[package]]
 name = "mtp-common"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "quinn",
+ "rustls",
  "thiserror 2.0.20",
  "wtransport",
 ]
@@ -1668,7 +1669,7 @@ dependencies = [
 [[package]]
 name = "mtp-crypto"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "argon2",
  "base64 0.22.1",
@@ -1691,7 +1692,7 @@ dependencies = [
 [[package]]
 name = "mtp-files"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "mtp-crypto",
  "rand 0.10.2",
@@ -1702,7 +1703,7 @@ dependencies = [
 [[package]]
 name = "mtp-host"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "mtp-codec",
  "mtp-common",
@@ -1718,7 +1719,7 @@ dependencies = [
 [[package]]
 name = "mtp-transport"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "async-trait",
  "mtp-codec",
@@ -1738,7 +1739,7 @@ dependencies = [
 [[package]]
 name = "mtp-type-map"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "serde",
  "serde_yaml",
@@ -1747,7 +1748,7 @@ dependencies = [
 [[package]]
 name = "mtp-webserver"
 version = "0.3.0"
-source = "git+https://git.methanium.net/Methanium/mtp.git#c30315af944bda05ecdb9c4e9cc350cb99cf7b2e"
+source = "git+https://git.methanium.net/Methanium/mtp.git#a5c8d4f0c898c78351e9d54124886c86e789a22a"
 dependencies = [
  "async-trait",
  "bytes",
@@ -2391,9 +2392,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "rand"
-version = "0.8.8"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
+checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -2689,9 +2690,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.15"
+version = "0.103.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
+checksum = "0527518605e68109d875e248ea259b6758801cf165e4b2c2733ae3b51f12535a"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -2791,7 +2792,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.4",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -2882,7 +2883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09057cb2149ad4cbd2da1e26b351f9a4c354219421229c69c3063e6f61947c4a"
 dependencies = [
  "digest 0.11.3",
- "keccak 0.2.2",
+ "keccak 0.2.1",
  "sponge-cursor",
 ]
 
@@ -3018,9 +3019,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.4"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3097,7 +3098,7 @@ checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.4",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -3180,7 +3181,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.4",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -3327,7 +3328,7 @@ dependencies = [
  "idna 0.4.0",
  "ipnet",
  "once_cell",
- "rand 0.8.8",
+ "rand 0.8.7",
  "smallvec",
  "thiserror 1.0.69",
  "tinyvec",
@@ -3348,7 +3349,7 @@ dependencies = [
  "lru-cache",
  "once_cell",
  "parking_lot",
- "rand 0.8.8",
+ "rand 0.8.7",
  "resolv-conf",
  "smallvec",
  "thiserror 1.0.69",
@@ -3457,9 +3458,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.26.0"
+version = "1.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5772d71c9be8a8a6ac2117d949c5b224c1b72241bb611d9a3012edcf8af7812"
+checksum = "2cefc03fd367c0c6d4305de1b312cf00248c4114f4a0418ce6a6af769e3b0bd9"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",
@@ -4005,9 +4006,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.8"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8"
+checksum = "94b5c6b5976d66c1d703c4fd17d3f5e43c8cedaacf604961b171adc7130896d8"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -4016,13 +4017,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.6"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da"
+checksum = "9f212a141d820099d57ffafb9569be9617a6f27d3dc881fbee8fb56642f917a9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.4",
+ "syn 3.0.3",
 ]
 
 [[package]]

flake.nix

@@ -145,12 +145,6 @@
                 description = "Port the Omikron server listens on for incoming QUIC connections.";
               };
 
-              bindAddress = lib.mkOption {
-                type = lib.types.str;
-                default = "0.0.0.0";
-                description = "IP address to bind the Omikron server to.";
-              };
-
               omegaHost = lib.mkOption {
                 type = lib.types.str;
                 default = "tensamin.net";
@@ -195,7 +189,6 @@
 
                 environment = {
                   RHO_PORT = toString cfg.rhoPort;
-                  BIND_ADDRESS = cfg.bindAddress;
                   OMEGA_HOST = cfg.omegaHost;
                   OMEGA_PORT = toString cfg.omegaPort;
                 };

mtp-type-maps

@@ -1 +1 @@
-Subproject commit 486541b9483356ff49ff3ec7016f87d3ecbeaa0e
+Subproject commit a297dcce60bc6e84696c6a16f5fd510beb2ca643

src/anonymous_clients/anonymous_client_connection.rs

@@ -31,7 +31,7 @@ pub struct AnonymousClientConnection {
 
 impl AnonymousClientConnection {
     pub async fn from_general(general: Arc<GeneralConnection>, user_id: u64) -> Arc<Self> {
-        let username = generate_username(user_id);
+        let username: String = generate_username();
         Arc::new(Self {
             state: general.state.clone(),
             user_id: user_id,
@@ -47,7 +47,6 @@ impl AnonymousClientConnection {
         })
     }
     pub fn start(self: Arc<Self>) {
-        anonymous_manager::add_anonymous_user(self.clone());
         let self_clone = self.clone();
         tokio::spawn(async move {
             while let Ok(cv) = self_clone.receiver.receive().await {
@@ -633,13 +632,10 @@ impl AnonymousClientConnection {
         }
     }
 
+    /// Handle connection close
     pub async fn handle_close(&self) {
-        *self.is_open.write().await = false;
+
-        self.state
+        // TODO delete temp user
-            .call_manager
-            .remove_user_from_calls(self.user_id)
-            .await;
-        anonymous_manager::remove_anonymous_user(self.user_id).await;
     }
 }
 

src/anonymous_clients/anonymous_manager.rs

@@ -1,5 +1,4 @@
 use dashmap::DashMap;
-use dashmap::mapref::entry::Entry;
 use once_cell::sync::Lazy;
 use rand::prelude::{IndexedRandom, RngExt};
 use std::sync::Arc;
@@ -8,20 +7,15 @@ use crate::anonymous_clients::anonymous_client_connection::AnonymousClientConnec
 
 static ANONYMOUS_USERS: Lazy<DashMap<u64, Arc<AnonymousClientConnection>>> =
     Lazy::new(|| DashMap::new());
-static ANONYMOUS_USERNAMES: Lazy<DashMap<String, u64>> = Lazy::new(|| DashMap::new());
 
-pub fn add_anonymous_user(connection: Arc<AnonymousClientConnection>) {
+#[allow(dead_code)]
+pub async fn add_anonymous_user(connection: Arc<AnonymousClientConnection>) {
     ANONYMOUS_USERS.insert(connection.get_user_id(), connection);
 }
 
 #[allow(dead_code)]
 pub async fn remove_anonymous_user(user_id: u64) {
-    if let Some((_, connection)) = ANONYMOUS_USERS.remove(&user_id) {
+    ANONYMOUS_USERS.remove(&user_id);
-        let username = connection.get_user_name().await;
-        ANONYMOUS_USERNAMES.remove_if(&username, |_, reserved_user_id| {
-            *reserved_user_id == user_id
-        });
-    }
 }
 
 pub async fn get_anonymous_user(user_id: u64) -> Option<Arc<AnonymousClientConnection>> {
@@ -31,52 +25,30 @@ pub async fn get_anonymous_user(user_id: u64) -> Option<Arc<AnonymousClientConne
 pub async fn get_anonymous_user_by_name(
     username: String,
 ) -> Option<Arc<AnonymousClientConnection>> {
-    let user_id = ANONYMOUS_USERNAMES
+    let users: Vec<_> = ANONYMOUS_USERS
-        .get(&username.to_lowercase())?
+        .iter()
-        .value()
+        .map(|ref_multi| ref_multi.value().clone())
-        .to_owned();
+        .collect();
-    get_anonymous_user(user_id).await
+
+    for user_conn in users {
+        if user_conn.get_user_name().await == username {
+            return Some(user_conn);
+        }
+    }
+
+    return None;
 }
 
-pub fn generate_username(user_id: u64) -> String {
+// TODO: implement check if taken
+pub fn generate_username() -> String {
     let adjectives = ["Swift", "Clever", "Brave", "Sneaky", "Fierce"];
     let nouns = ["Tiger", "Eagle", "Shark", "Wolf", "Dragon"];
 
     let mut rng = rand::rng();
-    loop {
+    let adj = adjectives.choose(&mut rng).unwrap();
-        let Some(adj) = adjectives.choose(&mut rng) else {
+    let noun = nouns.choose(&mut rng).unwrap();
-            continue;
-        };
-        let Some(noun) = nouns.choose(&mut rng) else {
-            continue;
-        };
-        let username = format!("{}{}{}", adj, noun, rng.random_range(0..10000));
-        let canonical_username = username.to_lowercase();
 
-        if reserve_username(canonical_username, user_id) {
+    let number: u16 = rng.random_range(0..10000);
-            return username;
-        }
-    }
-}
 
-fn reserve_username(username: String, user_id: u64) -> bool {
+    format!("{}{}{}", adj, noun, number)
-    if let Entry::Vacant(entry) = ANONYMOUS_USERNAMES.entry(username) {
-        entry.insert(user_id);
-        true
-    } else {
-        false
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn username_reservation_is_unique() {
-        let username = "anonymous-manager-reservation-test".to_string();
-        assert!(reserve_username(username.clone(), 1));
-        assert!(!reserve_username(username.clone(), 2));
-        ANONYMOUS_USERNAMES.remove(&username);
-    }
 }

src/app_state.rs

@@ -113,3 +113,38 @@ impl AppState {
         Keyring::from_bytes(&bytes).map_err(|error| error.to_string())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::net::{IpAddr, Ipv4Addr};
+
+    #[tokio::test]
+    async fn permits_are_released_after_a_session_ends() {
+        let limits = RhoConnectionLimits::new(1, 1, 1);
+        let permit = limits.all.clone().try_acquire_owned().unwrap();
+        assert!(limits.all.clone().try_acquire_owned().is_err());
+        drop(permit);
+        assert!(limits.all.clone().try_acquire_owned().is_ok());
+    }
+
+    #[tokio::test]
+    async fn anonymous_pool_does_not_consume_global_authenticated_capacity() {
+        let limits = RhoConnectionLimits::new(2, 1, 1);
+        let _anonymous = limits.anonymous.clone().try_acquire_owned().unwrap();
+        assert!(limits.anonymous.clone().try_acquire_owned().is_err());
+        let _authenticated = limits.all.clone().try_acquire_owned().unwrap();
+        assert!(limits.all.clone().try_acquire_owned().is_ok());
+    }
+
+    #[test]
+    fn per_ip_permits_are_released() {
+        let limits = RhoConnectionLimits::new(2, 2, 1);
+        let ip = IpAddr::V4(Ipv4Addr::LOCALHOST);
+        let permit = limits.try_acquire_anonymous_per_ip(ip).unwrap();
+        assert!(limits.try_acquire_anonymous_per_ip(ip).is_none());
+        drop(permit);
+        assert_eq!(limits.anonymous_count_for_ip(ip), 0);
+        assert!(limits.try_acquire_anonymous_per_ip(ip).is_some());
+    }
+}

src/calls/call_group.rs

@@ -262,7 +262,6 @@ impl CallGroup {
             .write()
             .await
             .retain(|caller| caller.user_id != user_id);
-        self.secrets.write().await.remove(&user_id);
     }
 
     pub async fn get_short_link(self: Arc<Self>) -> Option<String> {

src/calls/call_manager.rs

@@ -78,13 +78,6 @@ impl CallManager {
         call_groups
     }
 
-    pub async fn remove_user_from_calls(&self, user_id: u64) {
-        let call_groups = self.get_call_groups(user_id).await;
-        for call_group in call_groups {
-            call_group.remove_caller(user_id).await;
-        }
-    }
-
     pub async fn get_call_token(&self, user_id: u64, call_id: Uuid) -> Result<String, CallError> {
         if let Some(cg) = self.groups.get(&call_id) {
             let mut members = cg.members.write().await;
@@ -228,30 +221,6 @@ mod tests {
         );
     }
 
-    #[tokio::test]
-    async fn removing_user_from_calls_removes_membership_and_invitation_secret() {
-        let call_id = Uuid::new_v4();
-        let sender_id = 55;
-        let anonymous_user_id = 66;
-        let group = Arc::new(CallGroup::new(
-            call_id,
-            Arc::new(Caller::new(sender_id, call_id, true)),
-        ));
-        let manager = CallManager::default();
-        manager.groups.insert(call_id, group.clone());
-
-        assert!(
-            manager
-                .add_invite(call_id, sender_id, anonymous_user_id, envelope("anonymous"),)
-                .await
-        );
-
-        manager.remove_user_from_calls(anonymous_user_id).await;
-
-        assert!(group.get_caller(anonymous_user_id).await.is_none());
-        assert!(group.get_secret_for_user(anonymous_user_id).await.is_none());
-    }
-
     #[test]
     fn self_invites_are_not_forwarded() {
         let manager = CallManager::default();

src/config.rs

@@ -1,9 +1,8 @@
-use std::{env, net::IpAddr, time::Duration};
+use std::{env, time::Duration};
 
 use thiserror::Error;
 
 const DEFAULT_RHO_PORT: u16 = 443;
-const DEFAULT_BIND_ADDRESS: &str = "0.0.0.0";
 const DEFAULT_OMEGA_HOST: &str = "tensamin.net";
 const DEFAULT_OMEGA_PORT: u16 = 9187;
 const DEFAULT_OMEGA_SYNC_TIMEOUT_SECONDS: u64 = 20;
@@ -22,7 +21,6 @@ pub struct LiveKitConfig {
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Config {
     pub rho_port: u16,
-    pub bind_address: IpAddr,
     pub omega_host: String,
     pub omega_port: u16,
     pub omikron_id: u64,
@@ -54,7 +52,6 @@ pub enum ConfigError {
 impl Config {
     pub fn from_environment() -> Result<Self, ConfigError> {
         let rho_port = parse_or_default("RHO_PORT", DEFAULT_RHO_PORT)?;
-        let bind_address = parse_bind_address(env::var("BIND_ADDRESS").ok())?;
         let omega_port = parse_or_default("OMEGA_PORT", DEFAULT_OMEGA_PORT)?;
         let omikron_id = parse_or_default("ID", 0_u64)?;
         // Each synchronization request is bounded by this timeout. After
@@ -90,7 +87,6 @@ impl Config {
 
         Ok(Self {
             rho_port,
-            bind_address,
             omega_host,
             omega_port,
             omikron_id,
@@ -104,16 +100,15 @@ impl Config {
     }
 }
 
-fn parse_bind_address(value: Option<String>) -> Result<IpAddr, ConfigError> {
+fn parse_positive_or_default(name: &'static str, default: usize) -> Result<usize, ConfigError> {
-    value
+    let value = parse_or_default(name, default)?;
-        .as_deref()
+    if value == 0 {
-        .unwrap_or(DEFAULT_BIND_ADDRESS)
+        return Err(ConfigError::InvalidValue {
-        .trim()
+            name,
-        .parse()
+            kind: "positive number",
-        .map_err(|_| ConfigError::InvalidValue {
+        });
-            name: "BIND_ADDRESS",
+    }
-            kind: "IP address",
+    Ok(value)
-        })
 }
 
 fn parse_or_default<T>(name: &'static str, default: T) -> Result<T, ConfigError>
@@ -186,23 +181,4 @@ mod tests {
             }))
         );
     }
-
-    #[test]
-    fn parses_configured_bind_address() {
-        assert_eq!(
-            parse_bind_address(Some("10.200.2.0".to_string())),
-            Ok(IpAddr::V4(std::net::Ipv4Addr::new(10, 200, 2, 0)))
-        );
-    }
-
-    #[test]
-    fn rejects_invalid_bind_address() {
-        assert_eq!(
-            parse_bind_address(Some("not-an-address".to_string())),
-            Err(ConfigError::InvalidValue {
-                name: "BIND_ADDRESS",
-                kind: "IP address",
-            })
-        );
-    }
 }

src/main.rs

@@ -9,7 +9,7 @@ mod rho;
 mod services;
 mod util;
 
-use std::{fmt::Write, path::PathBuf};
+use std::path::PathBuf;
 
 use dotenv::dotenv;
 use once_cell::sync::Lazy;
@@ -30,7 +30,7 @@ use crate::{
     omega::omega_connection::{OmegaConnection, start_task_cleanup_loop},
     rho::rho_manager::RhoManager,
     rho::server::start,
-    util::logger::{PrintType, startup},
+    util::logger::startup,
 };
 
 #[tokio::main]
@@ -57,18 +57,15 @@ async fn main() {
             return;
         }
     };
-    let public_key = match omega_database_public_key(&keyring) {
+    let keyring =
-        Ok(public_key) => public_key,
+        match load_or_create_keyring(identity_secret.as_slice(), KEYRING_PATH, PUBLIC_KEY_PATH) {
-        Err(error) => {
+            Ok(keyring) => keyring,
-            eprintln!("Unable to serialize public key for Omega: {error}");
+            Err(error) => {
-            return;
+                eprintln!("Unable to load Omikron identity: {error}");
-        }
+                return;
-    };
+            }
-    log!(
+        };
-        0,
+    drop(identity_secret);
-        PrintType::Omikron,
-        "Omikron public_key for Omega enrollment: {public_key}"
-    );
 
     let omega_keyring = match keyring_for_omega(&keyring) {
         Ok(keyring) => keyring,
@@ -103,34 +100,3 @@ fn keyring_for_omega(keyring: &Keyring) -> Result<Keyring, String> {
     let bytes = keyring.try_to_bytes().map_err(|error| error.to_string())?;
     Keyring::from_bytes(&bytes).map_err(|error| error.to_string())
 }
-
-fn omega_database_public_key(keyring: &Keyring) -> Result<String, String> {
-    let public_key = keyring
-        .public_key_bundle()
-        .try_as_bytes()
-        .map_err(|error| error.to_string())?;
-    omega_database_blob_literal(&public_key)
-}
-
-fn omega_database_blob_literal(public_key: &[u8]) -> Result<String, String> {
-    let mut literal = String::with_capacity(3 + public_key.len() * 2);
-    literal.push_str("X'");
-    for byte in public_key {
-        write!(&mut literal, "{byte:02X}").map_err(|error| error.to_string())?;
-    }
-    literal.push('\'');
-    Ok(literal)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn public_key_blob_literal_is_valid_mysql_hex_syntax() {
-        assert_eq!(
-            omega_database_blob_literal(&[0x00, 0x1A, 0xFF]),
-            Ok("X'001AFF'".to_string())
-        );
-    }
-}

src/rho/server.rs

@@ -1,3 +1,4 @@
+use std::net::{IpAddr, Ipv4Addr};
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -142,7 +143,7 @@ pub async fn start(state: Arc<AppState>) -> Result<(), Box<dyn std::error::Error
     let key_pem = load_file_vec("certs", "key.pem").expect("Error loading Keyfile");
 
     let host_config = HostConfig::new(
-        state.config.bind_address,
+        IpAddr::from(Ipv4Addr::new(0, 0, 0, 0)),
         state.config.rho_port,
         cert_pem,
         key_pem,
@@ -172,8 +173,7 @@ pub async fn start(state: Arc<AppState>) -> Result<(), Box<dyn std::error::Error
     log!(
         0,
         PrintType::General,
-        "Server listening on {}:{}.",
+        "Server listening on port {}.",
-        state.config.bind_address,
         state.config.rho_port
     );
 

src/util/logger.rs

@@ -205,7 +205,7 @@ fn format_data_container(data: Vec<(DataTypeId, DataValue)>, version: Version) -
             let key_str = key.to_string();
 
             match value {
-                DataValue::Str(s) => format!("{}=\"{}\"", key_str, abbreviate_string(&s)),
+                DataValue::Str(s) => format!("{}=\"{}\"", key_str, s),
 
                 DataValue::Container(inner) => {
                     let inner_formatted = format_data_container(inner, version.clone());
@@ -238,7 +238,7 @@ fn format_array(arr: Vec<DataValue>, version: Version) -> String {
     let parts: Vec<String> = arr
         .into_iter()
         .map(|value| match value {
-            DataValue::Str(s) => format!("\"{}\"", abbreviate_string(&s)),
+            DataValue::Str(s) => format!("\"{}\"", s),
 
             DataValue::Container(inner) => {
                 let inner_formatted = format_data_container(inner, version.clone());
@@ -266,31 +266,6 @@ fn format_array(arr: Vec<DataValue>, version: Version) -> String {
     parts.join(", ")
 }
 
-fn abbreviate_string(value: &str) -> String {
-    const EDGE_LENGTH: usize = 4;
-
-    let chars: Vec<char> = value.chars().collect();
-    if chars.len() <= EDGE_LENGTH * 2 {
-        return value.to_string();
-    }
-
-    let prefix: String = chars.iter().take(EDGE_LENGTH).collect();
-    let suffix: String = chars.iter().rev().take(EDGE_LENGTH).rev().collect();
-    format!("{prefix}...{suffix}")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::abbreviate_string;
-
-    #[test]
-    fn abbreviates_only_strings_longer_than_eight_characters() {
-        assert_eq!(abbreviate_string("12345678"), "12345678");
-        assert_eq!(abbreviate_string("123456789"), "1234...6789");
-        assert_eq!(abbreviate_string("YWJjZGVmZ2hpag=="), "YWJj...ag==");
-    }
-}
-
 #[macro_export]
 macro_rules! log_cv {
     ($kind:expr, $cv:expr) => {