Fixing permissions issues on Linux

Author: ssrlive

Cargo.toml

@@ -9,19 +9,19 @@ chrono = "0.4.41"
 dirs = "6.0.0"
 env_logger = "0.11.8"
 fltk = { version = "1.5.13", features = ["fltk-bundled"] }
-image = "0.25.6"
-log = "0.4.27"
+image = "0.25.8"
+log = "0.4.28"
 overtls = { version = "0.3.6" }
 qrcode = "0.14.1"
 rfd = { version = "0.15.4", default-features = false, features = ["xdg-portal", "tokio"] }
 rqrr = "0.10.0"
-run-as = { version = "1.2.2", default-features = false }
+run-as = { version = "1.2.4", default-features = false }
 screenshot = { version = "0.0.7", git = "https://github.com/ssrlive/screenshot-rs.git", rev = "36f877f" }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.143"
-tokio = { version = "1", features = ["full"] }
+tokio = { version = "1.47.1", features = ["full"] }
 tray-icon = { version = "0.21.1", default-features = false, features = ["libxdo", "common-controls-v6"] }
 tun2proxy = { version = "0.7.14", default-features = false }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-gtk = "0.18"
+gtk = "0.18.2"

README-CN.md

@@ -43,13 +43,7 @@ cargo build --release
 
 ### 運行
 
-Linux（需 root 權限）：
-
-```bash
-sudo ./target/release/overtls-gui
-```
-
-Windows/macOS：
+Windows/macOS/Linux：
 
 ```bash
 ./target/release/overtls-gui

README.md

@@ -45,13 +45,7 @@ cargo build --release
 
 ### Run
 
-On Linux (requires root privileges):
-
-```bash
-sudo ./target/release/overtls-gui
-```
-
-On Windows/macOS:
+On Windows/macOS/Linux:
 
 ```bash
 ./target/release/overtls-gui

src/content_table.rs

@@ -157,6 +157,7 @@ pub fn create_table(
                         Ok(json_str) => {
                             if std::fs::write(&path, json_str).is_ok() {
                                 log::debug!("Node exported to: {}", path.display());
+                                crate::states_manager::set_file_owner_if_needed(&path);
                             } else {
                                 rfd::MessageDialog::new()
                                     .set_title("Error")

src/core.rs

@@ -13,12 +13,8 @@ pub fn merge_system_settings_to_node_config(system_settings: &SystemSettings, no
 
 pub fn restart_as_admin() -> std::io::Result<std::process::ExitStatus> {
     log::debug!("Not running as admin, trying to elevate...");
-    let args: Vec<String> = std::env::args().collect();
-    run_as::Command::new(&args[0])
-        .args(&args[1..])
-        .gui(true)
-        .wait_to_complete(false)
-        .status()
+    run_as::restart_self_elevated(None, true, false, Some(std::time::Duration::from_secs(10)))?
+        .ok_or_else(|| std::io::Error::other("Non-blocking restart does not return exit status"))
 }
 
 pub fn main_task_block(

src/main.rs

@@ -34,27 +34,13 @@ async fn main() -> Result<(), BoxError> {
     // #[cfg(debug_assertions)]
     // env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("debug")).init();
 
-    // Check for root privileges on Linux
-    #[cfg(target_os = "linux")]
-    if !run_as::is_elevated() {
-        let program_name = std::env::args().next().unwrap_or_else(|| "overtls-gui".to_string());
-        let info = format!("This application requires root privileges to run on Linux.\n\nPlease run with: \nsudo {program_name}\n\n");
-        eprint!("{info}");
-        rfd::MessageDialog::new()
-            .set_title("Error")
-            .set_description(info)
-            .set_level(rfd::MessageLevel::Error)
-            .show();
-        std::process::exit(1);
-    }
-
     let (tx, rx) = std::sync::mpsc::channel();
 
     let state = states_manager::load_app_state();
     let system_settings = state.system_settings.clone().unwrap_or_default();
 
     if let Err(e) = log::set_boxed_logger(Box::new(system_settings.create_logger(tx))) {
-        eprintln!("Failed to set logger: {e}");
+        log::warn!("Failed to set logger: {e}");
     }
     // Note: No longer use log::set_max_level, as it is now controlled by the Logger internally
     log::set_max_level(log::LevelFilter::Trace);
@@ -331,6 +317,7 @@ async fn main() -> Result<(), BoxError> {
             Ok(json_str) => {
                 if std::fs::write(&path, json_str).is_ok() {
                     log::debug!("Node exported to: {}", path.display());
+                    states_manager::set_file_owner_if_needed(&path);
                     state_clone.borrow_mut().set_current_path(path.parent().unwrap_or(&origin_path));
                 } else {
                     rfd::MessageDialog::new()
@@ -652,6 +639,7 @@ async fn main() -> Result<(), BoxError> {
                 .unwrap_or(false);
             state.borrow_mut().system_settings = Some(new_settings);
             if tun2proxy_enable && !run_as::is_elevated() {
+                save_final_app_state(&state, &remote_nodes, &win, &current_node_index)?;
                 if let Ok(status) = core::restart_as_admin() {
                     log::debug!("Restarted as admin with status code {status}, exiting current instance.");
                     ::fltk::app::quit();

src/states_manager.rs

@@ -123,10 +123,28 @@ impl Drop for AppState {
     }
 }
 
+fn get_real_config_dir() -> PathBuf {
+    #[cfg(target_os = "linux")]
+    if let Ok(sudo_user) = std::env::var("SUDO_USER") {
+        let home_path = PathBuf::from("/home").join(&sudo_user).join(".config");
+        return home_path;
+    }
+    dirs::config_dir().unwrap_or_else(|| std::env::current_dir().unwrap())
+}
+
 fn get_config_path() -> PathBuf {
-    let mut path = dirs::config_dir().unwrap_or_else(|| std::env::current_dir().unwrap());
+    let mut path = get_real_config_dir();
     path.push(env!("CARGO_PKG_NAME"));
-    let _ = std::fs::create_dir_all(&path);
+    let _r = std::fs::create_dir_all(&path);
+    #[cfg(target_os = "linux")]
+    if _r.is_ok()
+        && run_as::is_elevated()
+        && let Ok(sudo_user) = std::env::var("SUDO_USER")
+        && path.starts_with(format!("/home/{sudo_user}/.config"))
+    {
+        // chown -R <sudo_user> <path>
+        let _ = std::process::Command::new("chown").arg("-R").arg(&sudo_user).arg(&path).status();
+    }
     path.push("config.json");
     path
 }
@@ -143,7 +161,19 @@ pub fn load_app_state() -> AppState {
 pub fn save_app_state(state: &AppState) -> std::io::Result<()> {
     let config_path = get_config_path();
     let contents = serde_json::to_string_pretty(state).map_err(|e| std::io::Error::other(format!("Failed to serialize state: {e}")))?;
-    std::fs::write(config_path, contents)
+    std::fs::write(&config_path, &contents)?;
+    set_file_owner_if_needed(&config_path);
+    Ok(())
+}
+
+/// If needed, set the specified file to be owned by sudo_user
+pub fn set_file_owner_if_needed<P: AsRef<std::path::Path>>(_path: P) {
+    #[cfg(target_os = "linux")]
+    if run_as::is_elevated()
+        && let Ok(sudo_user) = std::env::var("SUDO_USER")
+    {
+        let _ = std::process::Command::new("chown").arg(&sudo_user).arg(_path.as_ref()).status();
+    }
 }
 
 impl SystemSettings {