Gateway wizard

crates/defguard/Cargo.toml

@@ -26,3 +26,4 @@ dotenvy = "0.15"
 secrecy = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
+tracing-subscriber = { workspace = true }

crates/defguard/src/main.rs

@@ -47,6 +47,7 @@ use tokio::sync::{
     broadcast,
     mpsc::{channel, unbounded_channel},
 };
+use tracing_subscriber::util::SubscriberInitExt;
 
 #[macro_use]
 extern crate tracing;
@@ -61,11 +62,13 @@ async fn main() -> Result<(), anyhow::Error> {
         .set(config.clone())
         .expect("Failed to initialize server config.");
 
-    // initialize tracing with version formatter
-    defguard_version::tracing::init(
-        defguard_version::Version::parse(VERSION)?,
+    let subscriber = tracing_subscriber::registry();
+    defguard_version::tracing::with_version_formatters(
+        &defguard_version::Version::parse(VERSION)?,
         &config.log_level,
-    )?;
+        subscriber,
+    )
+    .init();
 
     info!("Starting ... version v{VERSION}");
     debug!("Using config: {config:?}");

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

@@ -18,6 +18,7 @@ pub struct Gateway<I = NoId> {
     pub has_certificate: bool,
     pub certificate_expiry: Option<NaiveDateTime>,
     pub version: Option<String>,
+    pub name: String,
 }
 
 impl<I> Gateway<I> {
@@ -34,7 +35,7 @@ impl<I> Gateway<I> {
 
 impl Gateway {
     #[must_use]
-    pub fn new<S: Into<String>>(network_id: Id, url: S) -> Self {
+    pub fn new<S: Into<String>>(network_id: Id, url: S, name: S) -> Self {
         Self {
             id: NoId,
             network_id,
@@ -45,6 +46,7 @@ impl Gateway {
             has_certificate: false,
             certificate_expiry: None,
             version: None,
+            name: name.into(),
         }
     }
 }
@@ -120,6 +122,18 @@ impl Gateway<Id> {
 
         Ok(())
     }
+
+    // TODO: Split the URL into address and port fields just like in proxy
+    pub async fn find_by_url<'e, E>(executor: E, url: &str) -> Result<Option<Self>, sqlx::Error>
+    where
+        E: PgExecutor<'e>,
+    {
+        let record = query_as!(Self, "SELECT * FROM gateway WHERE url = $1", url)
+            .fetch_optional(executor)
+            .await?;
+
+        Ok(record)
+    }
 }
 
 impl fmt::Display for Gateway<Id> {