weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

plugin_framework, mid commit

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-05-11 16:54:57 +08:00
parent 095ac46255
commit 8e117b6dde
6 changed files with 115 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/platform/linux.rs
View File

@@ -9,10 +9,10 @@ use hbb_common::{
regex::{Captures, Regex},
};
use std::{
string::String,
cell::RefCell,
path::{Path, PathBuf},
process::{Child, Command},
string::String,
sync::{
atomic::{AtomicBool, Ordering},
Arc,
@@ -453,9 +453,7 @@ pub fn get_active_username() -> String {
pub fn get_user_home_by_name(username: &str) -> Option<PathBuf> {
return match get_user_by_name(username) {
None => {
None
}
None => None,
Some(user) => {
let home = user.home_dir();
if Path::is_dir(home) {
@@ -464,7 +462,7 @@ pub fn get_user_home_by_name(username: &str) -> Option<PathBuf> {
None
}
}
}
};
}
pub fn get_active_user_home() -> Option<PathBuf> {
@@ -835,12 +833,7 @@ mod desktop {
}
fn get_display(&mut self) {
let display_envs = vec![
GNOME_SESSION_BINARY,
XFCE4_PANEL,
SDDM_GREETER,
PLASMA_X11,
];
let display_envs = vec![GNOME_SESSION_BINARY, XFCE4_PANEL, SDDM_GREETER, PLASMA_X11];
for diplay_env in display_envs {
self.display = get_env_tries("DISPLAY", &self.uid, diplay_env, 10);
if !self.display.is_empty() {
@@ -873,8 +866,8 @@ mod desktop {
auth_found = true;
} else if auth_found {
if std::path::Path::new(v).is_absolute()
&& std::path::Path::new(v).exists() {
&& std::path::Path::new(v).exists()
{
self.xauth = v.to_string();
} else {
if let Some(pid) = line.split_whitespace().nth(1) {
@@ -903,12 +896,7 @@ mod desktop {
fn get_xauth(&mut self) {
// try by direct access to window manager process by name
let display_envs = vec![
GNOME_SESSION_BINARY,
XFCE4_PANEL,
SDDM_GREETER,
PLASMA_X11,
];
let display_envs = vec![GNOME_SESSION_BINARY, XFCE4_PANEL, SDDM_GREETER, PLASMA_X11];
for diplay_env in display_envs {
self.xauth = get_env_tries("XAUTHORITY", &self.uid, diplay_env, 10);
if !self.xauth.is_empty() {
@@ -928,7 +916,7 @@ mod desktop {
gdm
} else {
let username = &self.username;
match get_user_home_by_name(username) {
match get_user_home_by_name(username) {
None => {
if username == "root" {
format!("/{}/.Xauthority", username)
@@ -942,7 +930,10 @@ mod desktop {
}
}
Some(home) => {
format!("{}/.Xauthority", home.as_path().to_string_lossy().to_string())
format!(
"{}/.Xauthority",
home.as_path().to_string_lossy().to_string()
)
}
}
};

21
src/platform/mod.rs
View File

@@ -54,6 +54,27 @@ pub fn get_active_username() -> String {
#[cfg(target_os = "android")]
pub const PA_SAMPLE_RATE: u32 = 48000;
#[cfg(any(target_os = "linux", target_os = "macos"))]
pub fn run_as_root(arg: Vec<&str>) -> ResultType<Option<Child>> {
let cmd = std::env::current_exe()?;
match cmd.to_str() {
Some(cmd) => {
let mut args = vec![cmd];
args.append(&mut arg.clone());
// -E required for opensuse
#[cfg(target_os = "linux")]
if is_opensuse() {
args.insert(0, "-E");
}
let task = Command::new("sudo").args(args).spawn()?;
Ok(Some(task))
}
None => {
bail!("Failed to get current exe as str");
}
}
}
#[cfg(test)]
mod tests {
use super::*;