chore: more logs for enrollment process (#296)

src-tauri/Cargo.toml

@@ -14,6 +14,7 @@ authors = ["Defguard"]
 tauri-build = { version = "1.5", features = [] }
 tonic-build = { version = "0.12" }
 prost-build = { version = "0.13" }
+vergen-git2 = { version = "1.0", features = ["build"] }
 
 [dependencies]
 anyhow = "1.0"

src-tauri/build.rs

@@ -1,4 +1,10 @@
+use vergen_git2::{Emitter, Git2Builder};
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // set VERGEN_GIT_SHA env variable based on git commit hash
+    let git2 = Git2Builder::default().branch(true).sha(true).build()?;
+    Emitter::default().add_instructions(&git2)?.emit()?;
+
     // compiling protos using path on build time
     let mut config = prost_build::Config::new();
     // enable optional fields

src-tauri/src/bin/defguard-client.rs

@@ -31,6 +31,7 @@ use defguard_client::{
     periodic::{config::poll_config, version::poll_version},
     tray::{configure_tray_icon, handle_tray_event, reload_tray_menu},
     utils::load_log_targets,
+    VERSION,
 };
 use std::{env, str::FromStr};
 
@@ -142,6 +143,7 @@ async fn main() {
         .build(tauri::generate_context!())
         .expect("error while running tauri application");
 
+    info!("Starting ... version v{}", VERSION);
     // initialize database
     let app_handle = app.handle();
     debug!("Initializing database connection");

src-tauri/src/commands.rs

@@ -163,37 +163,66 @@ pub async fn save_device_config(
     app_state: State<'_, AppState>,
     handle: AppHandle,
 ) -> Result<SaveDeviceConfigResponse, Error> {
-    debug!("Received device configuration: {response:#?}.");
+    debug!("Saving device configuration: {response:#?}.");
 
     let mut transaction = app_state.get_pool().begin().await?;
     let instance_info = response
         .instance
         .expect("Missing instance info in device config response");
     let mut instance: Instance = instance_info.into();
+    if response.token.is_some() {
+        info!("Received polling token for instance {}", instance.name);
+    } else {
+        warn!(
+            "Missing polling token for instance {}, core and/or proxy services may need an update, configuration polling won't work",
+            instance.name,
+        );
+    }
     instance.token = response.token;
 
+    debug!("Saving instance {}", instance.name);
     let instance = instance.save(&mut *transaction).await?;
+    info!("Saved instance {}", instance.name);
 
     let device = response
         .device
         .expect("Missing device info in device config response");
+    debug!(
+        "Saving wireguard key {} for instance {}({})",
+        device.pubkey, instance.name, instance.id
+    );
     let mut keys = WireguardKeys::new(instance.id, device.pubkey, private_key);
     keys.save(&mut *transaction).await?;
+    info!(
+        "Saved wireguard key {} for instance {}({})",
+        keys.pubkey, instance.name, instance.id
+    );
     for location in response.configs {
         let new_location = device_config_to_location(location, instance.id);
-        new_location.save(&mut *transaction).await?;
+        debug!(
+            "Saving location {} for instance {}({})",
+            new_location.name, instance.name, instance.id
+        );
+        let new_location = new_location.save(&mut *transaction).await?;
+        info!(
+            "Saved location {} for instance {}({})",
+            new_location.name, instance.name, instance.id
+        );
     }
     transaction.commit().await?;
-    info!("Instance created.");
+    info!("Instance {}({:?}) created.", instance.name, instance.id);
     trace!("Created following instance: {instance:#?}");
     let locations = Location::find_by_instance_id(&app_state.get_pool(), instance.id).await?;
     trace!("Created following locations: {locations:#?}");
     handle.emit_all(INSTANCE_UPDATE, ())?;
+    info!(
+        "Device configuration saved for instance {}({})",
+        instance.name, instance.id,
+    );
     let res: SaveDeviceConfigResponse = SaveDeviceConfigResponse {
         locations,
         instance,
     };
-    info!("Device configuration saved.");
     reload_tray_menu(&handle).await;
     Ok(res)
 }

src-tauri/src/lib.rs

@@ -15,6 +15,8 @@ mod proto {
     tonic::include_proto!("defguard.proxy");
 }
 
+pub const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "-", env!("VERGEN_GIT_SHA"));
+
 /// Location type used in commands to check if we using tunnel or location
 #[derive(Debug, PartialEq, Deserialize, Serialize, Clone, Copy)]
 pub enum ConnectionType {