update: fix mac static link

Author: hlhr202

Cargo.lock

@@ -8,7 +8,11 @@ members = [
 
 [workspace.dependencies]
 lazy_static = "1.4.0"
-reqwest = { version = "0.11.25", features = ["multipart", "blocking", "cookies"] }
+reqwest = { version = "0.11.25", features = [
+    "multipart",
+    "blocking",
+    "cookies",
+] }
 tokio = { version = "1.36.0", features = ["full"] }
 anyhow = "1.0.81"
 dotenvy = "0.15.7"
@@ -18,3 +22,4 @@ sudo = "0.6.0"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 home = "0.5.9"
+libc = "0.2.153"

Cargo.toml

@@ -13,7 +13,7 @@ anyhow = { workspace = true }
 ctrlc = "3.4.2"
 dotenvy = { workspace = true }
 lazy_static = "1.4.0"
-libc = "0.2.153"
+libc = { workspace = true }
 openconnect-sys = { path = "../openconnect-sys" }
 reqwest = { workspace = true }
 thiserror = { workspace = true }

crates/openconnect-core/Cargo.toml

@@ -35,6 +35,7 @@ serde_json = { workspace = true }
 sudo = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
+libc = { workspace = true }
 url = "2.5.0"
 
 [patch.crates-io]

crates/openconnect-gui/src-tauri/Cargo.toml

@@ -3,6 +3,8 @@
 
 mod oidc;
 mod state;
+use std::os::unix::fs::PermissionsExt;
+
 use openconnect_core::storage::{StoredConfigs, StoredConfigsJson};
 use state::AppState;
 use tauri::Manager;
@@ -63,11 +65,23 @@ async fn get_stored_configs() -> anyhow::Result<StoredConfigsJson, String> {
 }
 
 fn main() {
-    #[cfg(not(target_os = "windows"))]
+    #[cfg(target_os = "linux")]
     {
         sudo::escalate_if_needed().unwrap();
     }
 
+    #[cfg(target_os = "macos")]
+    {
+        #[cfg(debug_assertions)]
+        sudo::escalate_if_needed().unwrap();
+
+        unsafe {
+            if libc::geteuid() != 0 && openconnect_core::helper_reluanch_as_root() == 1 {
+                std::process::exit(0);
+            }
+        }
+    }
+
     tauri::Builder::default()
         .register_uri_scheme_protocol("oidcvpn", |app, _req| {
             let _app_state: tauri::State<'_, AppState> = app.state();
@@ -78,6 +92,30 @@ fn main() {
                 .body(b"Authenticated, close this window and return to the application.".to_vec())
         })
         .setup(|app| {
+            #[cfg(not(target_os = "windows"))]
+            {
+                let resource_path = app
+                    .path_resolver()
+                    .resolve_resource("vpnc-scripts/vpnc-script")
+                    .expect("failed to resolve resource");
+
+                let file = std::fs::OpenOptions::new()
+                    .write(false)
+                    .create(false)
+                    .append(false)
+                    .read(true)
+                    .open(resource_path)
+                    .expect("failed to open file");
+
+                let permissions = file.metadata().unwrap().permissions();
+                let is_executable = permissions.mode() & 0o111 != 0;
+                if !is_executable {
+                    let mut permissions = permissions;
+                    permissions.set_mode(0o755);
+                    file.set_permissions(permissions).unwrap();
+                }
+            }
+
             AppState::handle(app);
             Ok(())
         })

crates/openconnect-gui/src-tauri/src/main.rs

@@ -180,7 +180,8 @@ impl AppState {
 
     pub async fn disconnect(&self) -> anyhow::Result<()> {
         if let Some(client) = self.client.read().await.as_ref() {
-            client.disconnect();
+            let client = client.clone();
+            tauri::async_runtime::spawn_blocking(move || client.disconnect()).await?;
         }
 
         // self.client.write().await.take(); // TODO: wait a few seconds and drop the client

crates/openconnect-gui/src-tauri/src/state.rs

@@ -12,6 +12,9 @@
   "tauri": {
     "macOSPrivateApi": true,
     "allowlist": {
+      "fs": {
+        "scope": ["$RESOURCE/*"]
+      },
       "all": false,
       "shell": {
         "all": false,
@@ -51,6 +54,9 @@
         "icons/[email protected]",
         "icons/icon.icns",
         "icons/icon.ico"
+      ],
+      "resources": [
+        "vpnc-scripts/*"
       ]
     }
   }