konevsa/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix check_process on mac since normal user can not get system's

Browse Source 
process's command line arguments
This commit is contained in:
rustdesk 2024-04-09 19:33:39 +08:00
parent f34a8ef0e5
commit ea1d4adfa6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common.rs
View File

@ -1240,8 +1240,14 @@ pub async fn get_next_nonkeyexchange_msg(
None None
} }
#[allow(unused_mut)]
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
pub fn check_process(arg: &str, same_uid: bool) -> bool { pub fn check_process(arg: &str, mut same_uid: bool) -> bool {
#[cfg(target_os = "macos")]
if !crate::platform::is_root() {
log::warn!("Can not get other process's command line arguments on macos without root");
same_uid = true;
}
use hbb_common::sysinfo::System; use hbb_common::sysinfo::System;
let mut sys = System::new(); let mut sys = System::new();
sys.refresh_processes(); sys.refresh_processes();

2
src/server/connection.rs
View File

@ -958,7 +958,7 @@ impl Connection {
} }
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
if crate::is_server() && Config::get_option("allow-only-conn-window-open") == "Y" { if crate::is_server() && Config::get_option("allow-only-conn-window-open") == "Y" {
if !crate::check_process("", false) { if !crate::check_process("", !crate::platform::is_root()) {
self.send_login_error("The main window is not open").await; self.send_login_error("The main window is not open").await;
return false; return false;
} }