Merge pull request #198 from DefGuard/dev

Merge dev into main

package.json

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

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "defguard-client"
-version = "0.2.0"
+version = "0.2.1"
 description = "Defguard desktop client"
 license = "Apache-2.0"
 homepage = "https://github.com/DefGuard/client"
@@ -19,7 +19,7 @@ anyhow = "1.0"
 base64 = "0.21"
 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.0" }
+defguard_wireguard_rs = { git = "https://github.com/DefGuard/wireguard-rs.git", rev = "v0.4.1" }
 dirs = "5.0"
 lazy_static = "1.4"
 local-ip-address = "0.5"

src-tauri/src/appstate.rs

@@ -93,7 +93,10 @@ impl AppState {
     }
 
     pub async fn close_all_connections(&self) -> Result<(), crate::error::Error> {
-        for connection in self.get_connections() {
+        info!("Closing all active connections...");
+        let active_connections = self.get_connections();
+        info!("Found {} active connections", active_connections.len());
+        for connection in active_connections {
             debug!("Found active connection");
             trace!("Connection: {connection:#?}");
             debug!("Removing interface");

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

@@ -161,9 +161,25 @@ async fn main() {
     );
 
     // run app
-    app.run(|_app_handle, event| {
-        if let tauri::RunEvent::ExitRequested { api, .. } = event {
-            api.prevent_exit();
+    app.run(|app_handle, event| match event {
+        // prevent shutdown on window close
+        tauri::RunEvent::ExitRequested { api, .. } => {
+            debug!("Received exit request");
+            api.prevent_exit()
+        }
+        // handle shutdown
+        tauri::RunEvent::Exit => {
+            info!("Exiting event loop...");
+            let app_state: State<AppState> = app_handle.state();
+            tokio::task::block_in_place(|| {
+                tokio::runtime::Handle::current().block_on(async {
+                    let _ = app_state.close_all_connections().await;
+                    app_handle.exit(0);
+                });
+            });
+        }
+        _ => {
+            trace!("Received event: {event:?}")
         }
     });
 }

src-tauri/src/tray.rs

@@ -59,6 +59,7 @@ pub fn handle_tray_event(app: &AppHandle, event: SystemTrayEvent) {
         }
         SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
             "quit" => {
+                info!("Received QUIT request. Initiating shutdown...");
                 let app_state: State<AppState> = app.state();
                 tokio::task::block_in_place(|| {
                     tokio::runtime::Handle::current().block_on(async {

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "defguard-client",
-    "version": "0.2.0"
+    "version": "0.2.1"
   },
   "tauri": {
     "systemTray": {

src/pages/client/pages/ClientAddTunnelPage/components/AddTunnelFormCard/AddTunnelFormCard.tsx

@@ -26,6 +26,8 @@ import {
   cidrRegex,
   patternValidEndpoint,
   patternValidIp,
+  patternValidIpV6,
+  patternValidIpV6WithPort,
   patternValidWireguardKey,
 } from '../../../../../../shared/patterns';
 import { routes } from '../../../../../../shared/routes';
@@ -100,13 +102,15 @@ export const AddTunnelFormCard = () => {
             return patternValidWireguardKey.test(value);
           }, LL.form.errors.invalid()),
         address: z.string().refine((value) => {
-          return patternValidIp.test(value);
+          return patternValidIp.test(value) || patternValidIpV6.test(value);
         }, LL.form.errors.invalid()),
         endpoint: z
           .string()
           .min(1, LL.form.errors.required())
           .refine((value) => {
-            return patternValidEndpoint.test(value);
+            return (
+              patternValidEndpoint.test(value) || patternValidIpV6WithPort.test(value)
+            );
           }, LL.form.errors.invalid()),
         dns: z
           .string()

src/pages/client/pages/ClientEditTunnelPage/components/EditTunnelFormCard.tsx

@@ -18,6 +18,8 @@ import {
   cidrRegex,
   patternValidEndpoint,
   patternValidIp,
+  patternValidIpV6,
+  patternValidIpV6WithPort,
   patternValidWireguardKey,
 } from '../../../../../shared/patterns';
 import { routes } from '../../../../../shared/routes';
@@ -137,18 +139,20 @@ export const EditTunnelFormCard = ({ tunnel, submitRef }: Props) => {
             return patternValidWireguardKey.test(value);
           }, LL.form.errors.invalid()),
         address: z.string().refine((value) => {
-          return patternValidIp.test(value);
+          return patternValidIp.test(value) || patternValidIpV6.test(value);
         }, LL.form.errors.invalid()),
         endpoint: z
           .string()
           .min(1, LL.form.errors.required())
           .refine((value) => {
-            return patternValidEndpoint.test(value);
+            return (
+              patternValidEndpoint.test(value) || patternValidIpV6WithPort.test(value)
+            );
           }, LL.form.errors.invalid()),
         dns: z
           .string()
           .refine((value) => {
-            if (value) {
+            if (value && value.length != 0) {
               return validateIpOrDomainList(value, ',', true);
             }
             return true;

src/shared/patterns.ts

@@ -75,3 +75,11 @@ export const cidrRegex =
 // Regular expression to match IPv4, IPv6, domain name, or localhost with port
 export const patternValidEndpoint =
   /^(localhost|\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b|\b(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}\b)(?::(\d+))?$/;
+
+// Copied from zod source code and added optional mask at the end to match WireguardRequirements
+export const patternValidIpV6 =
+  /^(([a-f0-9]{1,4}:){7}|::([a-f0-9]{1,4}:){0,6}|([a-f0-9]{1,4}:){1}:([a-f0-9]{1,4}:){0,5}|([a-f0-9]{1,4}:){2}:([a-f0-9]{1,4}:){0,4}|([a-f0-9]{1,4}:){3}:([a-f0-9]{1,4}:){0,3}|([a-f0-9]{1,4}:){4}:([a-f0-9]{1,4}:){0,2}|([a-f0-9]{1,4}:){5}:([a-f0-9]{1,4}:){0,1})([a-f0-9]{1,4}|(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2})))(?:\/128)?$/;
+
+// Reuse pattern from above to support format [ipv6]:port
+export const patternValidIpV6WithPort =
+  /^\[((([a-f0-9]{1,4}:){7}|::([a-f0-9]{1,4}:){0,6}|([a-f0-9]{1,4}:){1}:([a-f0-9]{1,4}:){0,5}|([a-f0-9]{1,4}:){2}:([a-f0-9]{1,4}:){0,4}|([a-f0-9]{1,4}:){3}:([a-f0-9]{1,4}:){0,3}|([a-f0-9]{1,4}:){4}:([a-f0-9]{1,4}:){0,2}|([a-f0-9]{1,4}:){5}:([a-f0-9]{1,4}:){0,1})([a-f0-9]{1,4}|(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2})))(\/128)?)\]:(\d{1,5})$/;

src/shared/validators/tunnel.ts

@@ -1,4 +1,4 @@
-import { patternValidDomain, patternValidIp } from '../patterns';
+import { patternValidDomain, patternValidIp, patternValidIpV6 } from '../patterns';
 
 // Returns flase when invalid
 export const validateIpOrDomain = (val: string, allowMask = false): boolean => {
@@ -13,12 +13,7 @@ export const validateIpList = (
 ): boolean => {
   const trimed = val.replace(' ', '');
   const split = trimed.split(splitWith);
-  for (const value of split) {
-    if (!validateIp(value, allowMasks)) {
-      return false;
-    }
-  }
-  return true;
+  return split.every((value) => validateIp(value, allowMasks));
 };
 
 // Returns flase when invalid
@@ -27,14 +22,9 @@ export const validateIpOrDomainList = (
   splitWith = ',',
   allowMasks = false,
 ): boolean => {
-  const trimed = val.replace(' ', '');
-  const split = trimed.split(splitWith);
-  for (const value of split) {
-    if (!(validateIp(value, allowMasks) && patternValidDomain.test(value))) {
-      return false;
-    }
-  }
-  return true;
+  // split and trim values
+  const split = val.split(splitWith).map((value) => value.trim());
+  return split.every((value) => validateIpOrDomain(value, allowMasks));
 };
 
 // Returns flase when invalid
@@ -50,5 +40,5 @@ export const validateIp = (ip: string, allowMask = false): boolean => {
       return ipValid && maskValid;
     }
   }
-  return patternValidIp.test(ip);
+  return patternValidIp.test(ip) || patternValidIpV6.test(ip);
 };