Multiproxy private cookies

Cargo.toml

@@ -31,6 +31,7 @@ axum = "0.8"
 axum-client-ip = "0.7"
 axum-extra = { version = "0.12", features = [
     "cookie-private",
+    "cookie-key-expansion",
     "typed-header",
     "query",
 ] }

crates/defguard/src/main.rs

@@ -40,7 +40,7 @@ use defguard_core::{
 use defguard_event_logger::{message::EventLoggerMessage, run_event_logger};
 use defguard_event_router::{RouterReceiverSet, run_event_router};
 use defguard_mail::{Mail, run_mail_handler};
-use defguard_proxy_manager::{ProxyOrchestrator, ProxyTxSet};
+use defguard_proxy_manager::{ProxyManager, ProxyTxSet};
 // use defguard_session_manager::run_session_manager;
 use secrecy::ExposeSecret;
 use tokio::sync::{broadcast, mpsc::unbounded_channel};
@@ -175,12 +175,12 @@ async fn main() -> Result<(), anyhow::Error> {
     }
 
     let proxy_tx = ProxyTxSet::new(wireguard_tx.clone(), mail_tx.clone(), bidi_event_tx.clone());
-    let proxy_orchestrator =
-        ProxyOrchestrator::new(pool.clone(), proxy_tx, Arc::clone(&incompatible_components));
+    let proxy_manager =
+        ProxyManager::new(pool.clone(), proxy_tx, Arc::clone(&incompatible_components));
 
     // run services
     tokio::select! {
-        res = proxy_orchestrator.run(&config.proxy_url) => error!("ProxyOrchestrator returned early: {res:?}"),
+        res = proxy_manager.run() => error!("ProxyManager returned early: {res:?}"),
         res = run_grpc_gateway_stream(
             pool.clone(),
             client_state,

crates/defguard_common/src/db/models/mod.rs

@@ -11,6 +11,7 @@ pub mod oauth2authorizedapp;
 pub mod oauth2client;
 pub mod oauth2token;
 pub mod polling_token;
+pub mod proxy;
 pub mod session;
 pub mod settings;
 pub mod user;

crates/defguard_common/src/db/models/proxy.rs

@@ -0,0 +1,15 @@
+use chrono::NaiveDateTime;
+use model_derive::Model;
+
+use crate::db::{Id, NoId};
+
+#[derive(Model)]
+pub struct Proxy<I = NoId> {
+    pub id: I,
+    pub name: String,
+    pub address: String,
+    pub port: i32,
+    pub public_address: String,
+    pub connected_at: Option<NaiveDateTime>,
+    pub disconnected_at: Option<NaiveDateTime>,
+}

crates/defguard_proxy_manager/Cargo.toml

@@ -21,6 +21,8 @@ semver.workspace = true
 tokio-stream.workspace = true
 
 axum.workspace = true
+axum-extra.workspace = true
+secrecy.workspace = true
 sqlx.workspace = true
 thiserror.workspace = true
 tokio.workspace = true