Fix build on macOS

Author: moubctez

src-tauri/Cargo.lock

@@ -31,10 +31,9 @@ use crate::{
         DB_POOL,
     },
     error::Error,
+    DEFAULT_ROUTE_IPV4, DEFAULT_ROUTE_IPV6,
 };
 
-const DEFAULT_ROUTE_IPV4: &str = "0.0.0.0/0";
-const DEFAULT_ROUTE_IPV6: &str = "::/0";
 pub const LOCATION_ID: &str = "locationId";
 pub const TUNNEL_ID: &str = "tunnelId";
 

src-tauri/core/src/database/models/tunnel_configuration.rs

@@ -30,7 +30,7 @@ use defguard_wireguard_rs::Userspace;
 use defguard_wireguard_rs::{
     error::WireguardInterfaceError, InterfaceConfiguration, WGApi, WireguardInterfaceApi,
 };
-#[cfg(unix)]
+#[cfg(target_os = "linux")]
 use nix::unistd::{chown, Group};
 #[cfg(unix)]
 use tokio::net::UnixListener;

src-tauri/daemon/src/daemon.rs

@@ -1,24 +1,25 @@
 use std::collections::HashSet;
 
+#[cfg(not(target_os = "macos"))]
+use defguard_client_core::{
+    connection::daemon_client::DAEMON_CLIENT, database::models::wireguard_keys::WireguardKeys,
+};
 use defguard_client_core::{
     database::models::{
         instance::{ClientTrafficPolicy, Instance},
         location::{infer_mfa_method, Location},
-        wireguard_keys::WireguardKeys,
         Id, NoId,
     },
     error::Error,
     into_location,
 };
-use defguard_client_proto::defguard::{
-    client::v1::{DeleteServiceLocationsRequest, SaveServiceLocationsRequest},
-    client_types::DeviceConfigResponse,
-};
-use sqlx::{Sqlite, SqliteExecutor, Transaction};
-
 #[cfg(not(target_os = "macos"))]
-use defguard_client_core::connection::daemon_client::DAEMON_CLIENT;
+use defguard_client_proto::defguard::client::v1::{
+    DeleteServiceLocationsRequest, SaveServiceLocationsRequest,
+};
+use defguard_client_proto::defguard::client_types::DeviceConfigResponse;
 use defguard_client_service_locations::to_service_location;
+use sqlx::{Sqlite, SqliteExecutor, Transaction};
 
 pub async fn locations_changed(
     transaction: &mut Transaction<'_, Sqlite>,

src-tauri/enterprise/config-sync/src/commands.rs

@@ -2,6 +2,18 @@ use core::fmt;
 use std::{collections::HashMap, env, str::FromStr};
 
 use chrono::{DateTime, Duration, Utc};
+use defguard_client_core::connection::active_connections::{
+    find_connection, get_connection_id_by_type, ACTIVE_CONNECTIONS,
+};
+#[cfg(not(target_os = "macos"))]
+use defguard_client_core::connection::daemon_client::DAEMON_CLIENT;
+#[cfg(not(target_os = "macos"))]
+use defguard_client_proto::defguard::client::v1::{
+    DeleteServiceLocationsRequest, RemoveInterfaceRequest, SaveServiceLocationsRequest,
+};
+use defguard_client_proto::defguard::{
+    client_types::DeviceConfigResponse, enterprise::posture::v2::DevicePostureData,
+};
 use serde::{Deserialize, Serialize};
 use struct_patch::Patch;
 use tauri::{AppHandle, Emitter, Manager, State};
@@ -47,16 +59,6 @@ use crate::{
     wg_config::parse_wireguard_config,
     CommonConnection, CommonConnectionInfo, CommonLocationStats, ConnectionType,
 };
-use defguard_client_core::connection::active_connections::{
-    find_connection, get_connection_id_by_type, ACTIVE_CONNECTIONS,
-};
-use defguard_client_core::connection::daemon_client::DAEMON_CLIENT;
-#[cfg(not(target_os = "macos"))]
-use defguard_client_proto::defguard::client::v1::{
-    DeleteServiceLocationsRequest, RemoveInterfaceRequest, SaveServiceLocationsRequest,
-};
-use defguard_client_proto::defguard::client_types::DeviceConfigResponse;
-use defguard_client_proto::defguard::enterprise::posture::v2::DevicePostureData;
 
 #[derive(Debug, Serialize, thiserror::Error)]
 #[serde(tag = "kind", content = "message", rename_all = "camelCase")]

src-tauri/src/commands.rs

@@ -1,3 +1,2 @@
-#[cfg(not(target_os = "macos"))]
 pub mod config;
 pub mod utils;

src-tauri/src/service/mod.rs

@@ -6,6 +6,16 @@ use std::{env, path::Path, process::Command};
 
 #[cfg(not(target_os = "macos"))]
 use defguard_client_common::{find_free_tcp_port, get_interface_name};
+#[cfg(windows)]
+use defguard_client_core::connection::active_connections::find_connection;
+#[cfg(not(target_os = "macos"))]
+use defguard_client_core::{
+    connection::daemon_client::DAEMON_CLIENT, DEFAULT_ROUTE_IPV4, DEFAULT_ROUTE_IPV6,
+};
+#[cfg(not(target_os = "macos"))]
+use defguard_client_proto::defguard::client::v1::{
+    CreateInterfaceRequest, ReadInterfaceDataRequest, RemoveInterfaceRequest,
+};
 #[cfg(not(target_os = "macos"))]
 use defguard_wireguard_rs::{key::Key, net::IpAddrMask, peer::Peer, InterfaceConfiguration};
 use sqlx::query;
@@ -45,16 +55,7 @@ use crate::{
     log_watcher::service_log_watcher::spawn_log_watcher_task,
     ConnectionType,
 };
-#[cfg(windows)]
-use defguard_client_core::connection::active_connections::find_connection;
-use defguard_client_core::connection::daemon_client::DAEMON_CLIENT;
-#[cfg(not(target_os = "macos"))]
-use defguard_client_proto::defguard::client::v1::{
-    CreateInterfaceRequest, ReadInterfaceDataRequest, RemoveInterfaceRequest,
-};
 
-pub(crate) static DEFAULT_ROUTE_IPV4: &str = "0.0.0.0/0";
-pub(crate) static DEFAULT_ROUTE_IPV6: &str = "::/0";
 // Work-around MFA propagation delay. FIXME: remove once Core API is corrected.
 #[cfg(target_os = "macos")]
 static TUNNEL_START_DELAY: Duration = Duration::from_secs(1);