fix: don't deadlock on setup

oskardotglobal · oskardotglobal · commit a3781a7bbd36 · 2025-10-05T15:39:46.000+02:00
Signed-off-by: Oskar Manhart &lt;52569953+oskardotglobal@users.noreply.github.com&gt;
diff --git a/winapps-cli/src/main.rs b/winapps-cli/src/main.rs
@@ -34,29 +34,27 @@ fn main() -> Result<()> {
         .init();
 
     let config_lock = Config::try_get_lock()?;
-    let config = config_lock.read();
-
-    let client = Freerdp::new();
-    let backend = config.get_backend();
-
-    client.check_depends()?;
-    backend.check_depends()?;
+    config_lock.read().get_backend().check_depends()?;
 
     let cli = cli();
 
     match cli.clone().get_matches().subcommand() {
         Some(("setup", _)) => {
             info!("Running setup");
 
-            match inquire::MultiSelect::new("Select apps to link", config.get_available_apps()?)
+            let apps = config_lock.read().get_available_apps()?;
+
+            // TODO: Allow deleting apps, maybe pass installed apps
+            // so they can be deselected?
+            match inquire::MultiSelect::new("Select apps to link", apps)
                 .prompt_skippable()
                 .map_err(|e| winapps::Error::Command {
                     message: "Failed to display selection dialog".into(),
                     source: e.into(),
                 })? {
                 Some(apps) => apps
                     .into_iter()
-                    .try_for_each(|app| app.link(&mut config_lock.write(), "".into()))?,
+                    .try_for_each(|app| app.link(&mut config_lock.write()))?,
                 None => info!("No apps selected, skipping setup..."),
             };
 
@@ -66,18 +64,25 @@ fn main() -> Result<()> {
         Some(("connect", _)) => {
             info!("Connecting to remote");
 
+            let client = Freerdp::new();
+
+            client.check_depends()?;
             client.run_full_session()?;
             Ok(())
         }
 
         Some(("run", sub_matches)) => {
             info!("Connecting to app on remote");
 
+            let client = Freerdp::new();
+
+            client.check_depends()?;
+
             let args = sub_matches
-                .get_many::<String>("args")
+                .get_many::<String>("ARGS")
                 .map_or(Vec::new(), |args| args.map(|v| v.to_owned()).collect());
 
-            match sub_matches.get_one::<String>("name") {
+            match sub_matches.get_one::<String>("NAME") {
                 None => panic!("App is required and should never be None here"),
                 Some(app) => client.run_app(app.to_owned(), args),
             }?;
diff --git a/winapps-image/oem/install.ps1 b/winapps-image/oem/install.ps1
@@ -50,8 +50,6 @@ function Install-NetworkProfileCleanup
     }
 }
 
-Set-ExecutionPolicy Unrestricted
-
 # Run functions
 Copy-Item -Path "$PSScriptRoot\ExtractPrograms.ps1" -Destination "$env:windir" -Force
 
diff --git a/winapps/src/backend/mod.rs b/winapps/src/backend/mod.rs
@@ -5,7 +5,7 @@ use enum_dispatch::enum_dispatch;
 use crate::{
     backend::{container::Container, manual::Manual},
     command::Command,
-    config::{App, AppKind::Detected},
+    config::{App, AppKind},
     Config, Result,
 };
 
@@ -59,7 +59,7 @@ impl Config {
                         id: id.to_string(),
                         name: name.to_string(),
                         win_exec: path.to_string(),
-                        kind: Detected(icon.to_string()),
+                        kind: AppKind::FromBase64(icon.to_string()),
                     }),
                     _ => None,
                 }
diff --git a/winapps/src/command.rs b/winapps/src/command.rs
@@ -73,6 +73,7 @@ impl Command {
                     config.auth.username,
                     config.get_backend().get_host()
                 ),
+                "-oStrictHostKeyChecking=accept-new",
                 "-p",
                 &*config.auth.ssh_port.to_string(),
             ])
diff --git a/winapps/src/config/apps.rs b/winapps/src/config/apps.rs
@@ -4,7 +4,12 @@ use crate::{
     Config, Result,
 };
 use base64::{prelude::BASE64_STANDARD, Engine};
-use std::{fmt::Display, fs::write};
+use std::{
+    fmt::Display,
+    fs::{set_permissions, write, Permissions},
+    os::unix::fs::PermissionsExt,
+};
+use tracing::debug;
 
 impl PartialEq for App {
     fn eq(&self, other: &Self) -> bool {
@@ -21,51 +26,57 @@ impl Display for App {
 impl App {
     fn try_as_existing(&mut self) -> Result<&mut Self> {
         match self.kind.clone() {
-            AppKind::Detected(base64) => {
+            AppKind::FromBase64(base64) => {
                 let path = icons_dir()?.join(format!("{}.png", self.id));
                 write(path.clone(), BASE64_STANDARD.decode(base64)?)?;
 
-                self.kind = AppKind::Existing(path);
+                self.kind = AppKind::Existing;
 
                 Ok(self)
             }
-            AppKind::Existing(_) => Ok(self),
+            AppKind::Existing => Ok(self),
         }
     }
 
-    fn try_as_desktop_file(&mut self, exec: String) -> Result<String> {
+    fn try_as_desktop_file(&mut self) -> Result<String> {
+        debug!("Writing desktop icon for {}", self.id);
+
         match &self.kind {
-            AppKind::Detected(_) => self.try_as_existing()?.try_as_desktop_file(exec),
-            AppKind::Existing(path) => Ok(format!(
+            AppKind::FromBase64(_) => self.try_as_existing()?.try_as_desktop_file(),
+            AppKind::Existing => Ok(format!(
                 "[Desktop Entry]
 Name={}
-Exec={exec}
+Exec=winapps run {}
 Terminal=false
 Type=Application
 Icon={}
 StartupWMClass={}
-Comment={}",
+Comment={} (WinApps)",
                 self.name,
-                path.to_string_lossy(),
+                self.id,
+                icons_dir()?
+                    .join(format!("{}.png", self.id))
+                    .to_string_lossy(),
                 self.id,
                 self.name
             )),
         }
     }
 
-    pub fn link(mut self, config: &mut Config, exec: String) -> Result<()> {
+    pub fn link(mut self, config: &mut Config) -> Result<()> {
         self.try_as_existing()?;
 
-        write(
-            desktop_dir()?.join(format!("{}.desktop", self.id)),
-            self.try_as_desktop_file(exec)?,
-        )?;
+        let path = desktop_dir()?.join(format!("{}.desktop", self.id));
+
+        write(&path, self.try_as_desktop_file()?)?;
+        set_permissions(&path, Permissions::from_mode(0o750))?;
 
         if !config.linked_apps.contains(&self) {
-            config.linked_apps.push(self)
-        }
+            debug!("Writing app {} to config", self.id);
 
-        config.save()?;
+            config.linked_apps.push(self);
+            config.save()?;
+        }
 
         Ok(())
     }
diff --git a/winapps/src/config/mod.rs b/winapps/src/config/mod.rs
@@ -1,7 +1,7 @@
 use crate::Backends;
 use derive_new::new;
 use serde::{Deserialize, Serialize};
-use std::{path::PathBuf, sync::OnceLock};
+use std::sync::OnceLock;
 
 mod apps;
 mod operations;
@@ -79,16 +79,18 @@ pub struct FreerdpConfig {
     pub executable: String,
 }
 
-#[derive(Debug, Deserialize, Serialize, Clone)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone)]
 pub enum AppKind {
-    Detected(String),
-    Existing(PathBuf),
+    FromBase64(String),
+    #[default]
+    Existing,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct App {
     pub id: String,
     pub name: String,
     pub win_exec: String,
+    #[serde(skip)]
     pub kind: AppKind,
 }
diff --git a/winapps/src/config/operations.rs b/winapps/src/config/operations.rs
@@ -1,15 +1,13 @@
 use parking_lot::RwLock;
 use std::{
-    fs::{self, File},
-    io::Write,
+    fs::{self, write},
     net::IpAddr,
-    path::PathBuf,
     str::FromStr,
     sync::OnceLock,
 };
 use tracing::warn;
 
-use crate::{bail, dirs::path_ok, Config, Error, IntoResult, Result};
+use crate::{bail, dirs::config_dir, Config, Error, IntoResult, Result};
 
 static CONFIG: OnceLock<RwLock<Config>> = OnceLock::new();
 
@@ -28,7 +26,7 @@ impl Config {
     /// Reads the config from disk.
     fn try_new() -> Result<Self> {
         let config = Self::new();
-        let config_path = Self::get_path()?;
+        let config_path = config_dir()?.join("config.toml");
 
         let Ok(true) = config_path.try_exists() else {
             warn!("Config does not exist, writing default...");
@@ -53,48 +51,11 @@ impl Config {
         Ok(config)
     }
 
-    fn get_path() -> Result<PathBuf> {
-        let path = match dirs::config_dir() {
-            Some(path) => Ok(path),
-            None => "Could not find $XDG_CONFIG_HOME and no config path specified".into_result(),
-        }
-        .map(|path| path.join("winapps").join("config.toml"))?;
-
-        // SAFETY: We just set the parent, so there will always be one
-        let parent = path.parent().unwrap();
-        path_ok(parent)?;
-
-        Ok(path)
-    }
-
     pub fn save(&self) -> Result<()> {
-        let config_path = Self::get_path()?;
-        let serialized_config = toml::to_string_pretty(&self).into_result()?;
-
-        let mut config_file = match config_path.try_exists() {
-            Ok(true) => File::open(&config_path).into_result(),
-            Ok(false) => File::create(&config_path).into_result(),
-            Err(e) => Error::Io(e).into(),
-        }?;
-
-        if let Err(e) = write!(config_file, "{serialized_config}") {
-            bail!(e);
-        }
-
-        Ok(())
-    }
-
-    pub fn get_data_path() -> Result<PathBuf> {
-        let path = match dirs::data_dir() {
-            Some(path) => Ok(path),
-            None => "Could not find $XDG_DATA_HOME and no data path specified".into_result(),
-        }
-        .map(|path| path.join("winapps"))?;
-
-        // SAFETY: We just set the parent, so there will always be one
-        let parent = path.parent().unwrap();
-        path_ok(parent)?;
-
-        Ok(path)
+        write(
+            config_dir()?.join("config.toml"),
+            toml::to_string_pretty(&self).into_result()?,
+        )
+        .into_result()
     }
 }
diff --git a/winapps/src/dirs.rs b/winapps/src/dirs.rs
@@ -30,6 +30,16 @@ pub fn data_dir() -> Result<PathBuf> {
     Ok(data_dir)
 }
 
+/// Get the data dir and validates it exists
+pub fn config_dir() -> Result<PathBuf> {
+    let Some(config_dir) = dirs::config_dir().map(|path| path.join("winapps")) else {
+        bail!("Could not determine $XDG_CONFIG_HOME")
+    };
+
+    path_ok(config_dir.as_path())?;
+    Ok(config_dir)
+}
+
 /// Get the icons dir and validates it exists
 pub fn icons_dir() -> Result<PathBuf> {
     let Some(data_dir) = dirs::data_dir().map(|path| path.join("icons")) else {
diff --git a/winapps/src/remote_client/freerdp.rs b/winapps/src/remote_client/freerdp.rs
@@ -79,7 +79,7 @@ impl RemoteClient for Freerdp {
         };
 
         self.get_command()
-            .arg(format!("/app:program:{path}"))
+            .arg(format!("/app:program:{path},hidef:on"))
             .args(args.iter().map(|arg| {
                 if arg.contains("/") && home_regex.is_match(arg) {
                     home_regex

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ function Install-NetworkProfileCleanup`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`-Set-ExecutionPolicy Unrestricted`
`54`		`-`
`55`	`53`	`# Run functions`
`56`	`54`	`Copy-Item -Path "$PSScriptRoot\ExtractPrograms.ps1" -Destination "$env:windir" -Force`
`57`	`55`