Merge pull request #243 from DefGuard/dev

Merge dev -> main

.github/pull_request_template.md

@@ -7,7 +7,7 @@
 
 #### Documentation ###
 
-- [ ] If testing requires changes in the environment or deployment, please **update the documentation** (https://defguard.gitbook.io) first and **attach the link to the documentation** section in this pool request
+- [ ] If testing requires changes in the environment or deployment, please **update the documentation** (https://defguard.gitbook.io) first and **attach the link to the documentation** section in this pull request
 - [ ] I have commented on my code, particularly in hard-to-understand areas
 
 #### Testing ### 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "defguard-client",
   "private": false,
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "scripts": {
     "dev": "npm-run-all --parallel vite typesafe-i18n",

src-tauri/Cargo.toml

@@ -1,13 +1,14 @@
 [package]
 name = "defguard-client"
-version = "0.3.0"
+version = "0.4.0"
 description = "Defguard desktop client"
 license = ""
 homepage = "https://github.com/DefGuard/client"
 repository = "https://github.com/DefGuard/client"
 default-run = "defguard-client"
 edition = "2021"
 rust-version = "1.60"
+authors = ["Defguard"]
 
 [build-dependencies]
 tauri-build = { version = "1.5", features = [] }
@@ -16,10 +17,10 @@ prost-build = { version = "0.12" }
 
 [dependencies]
 anyhow = "1.0"
-base64 = "0.21"
+base64 = "0.22"
 clap = { version = "4.4", features = ["derive", "env"] }
 chrono = { version = "0.4", features = ["serde"] }
-defguard_wireguard_rs = { git = "https://github.com/DefGuard/wireguard-rs.git", rev = "v0.4.4" }
+defguard_wireguard_rs = { git = "https://github.com/DefGuard/wireguard-rs.git", rev = "v0.4.5" }
 dirs = "5.0"
 lazy_static = "1.4"
 local-ip-address = "0.5"
@@ -31,13 +32,28 @@ rust-ini = "0.20"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_with = "3.5"
-sqlx = { version = "0.7", features = ["chrono", "sqlite", "runtime-tokio", "uuid", "macros"] }
+sqlx = { version = "0.7", features = [
+    "chrono",
+    "sqlite",
+    "runtime-tokio",
+    "uuid",
+    "macros",
+] }
 struct-patch = "0.4"
 strum = { version = "0.25", features = ["derive"] }
 dark-light = "1.0"
 webbrowser = "0.8"
 
-tauri = { version = "1.5", features = [ "dialog-all", "clipboard-all", "http-all", "window-all", "system-tray", "native-tls-vendored", "icon-png", "fs-all"] }
+tauri = { version = "1.5", features = [
+    "dialog-all",
+    "clipboard-all",
+    "http-all",
+    "window-all",
+    "system-tray",
+    "native-tls-vendored",
+    "icon-png",
+    "fs-all",
+] }
 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
@@ -48,10 +64,7 @@ tonic = "0.10"
 tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
-x25519-dalek = { version = "2", features = [
-    "getrandom",
-    "static_secrets",
-] }
+x25519-dalek = { version = "2", features = ["getrandom", "static_secrets"] }
 reqwest = { version = "0.11", features = ["json"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
@@ -64,7 +77,7 @@ nix = { version = "0.28", features = ["net"] }
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!
-custom-protocol = [ "tauri/custom-protocol" ]
+custom-protocol = ["tauri/custom-protocol"]
 
 [dev-dependencies]
 tokio = { version = "1.34", features = ["full"] }

src-tauri/src/appstate.rs

@@ -71,6 +71,7 @@ impl AppState {
             info!("Removed connection from active connections: {removed_connection:#?}");
             Some(removed_connection)
         } else {
+            debug!("No active connection found with location_id: {location_id}");
             None
         }
     }
@@ -97,11 +98,15 @@ impl AppState {
         let active_connections = self.get_connections();
         info!("Found {} active connections", active_connections.len());
         for connection in active_connections {
-            debug!("Found active connection");
+            debug!(
+                "Found active connection with location {}",
+                connection.location_id
+            );
             trace!("Connection: {connection:#?}");
-            debug!("Removing interface");
+            debug!("Removing interface {}", connection.interface_name);
             disconnect_interface(connection, self).await?;
         }
+        info!("All active connections closed");
         Ok(())
     }
 
@@ -123,7 +128,7 @@ impl AppState {
             debug!("Found connection: {connection:#?}");
             Some(connection.to_owned())
         } else {
-            error!("Element with id: {id}, connection_type: {connection_type:?} not found.");
+            error!("Couldn't find connection with id: {id}, connection_type: {connection_type:?} in active connections.");
             None
         }
     }