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

Fix. Linux run commands, getent passwd (#7396)

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2024-03-15 17:26:33 +08:00 committed by GitHub
parent 8e5fbc8480
commit 48cd76b938
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/hbb_common/src/config.rs
View File

@ -25,6 +25,7 @@ use crate::{
decrypt_str_or_original, decrypt_vec_or_original, encrypt_str_or_original,
encrypt_vec_or_original, symmetric_crypt,
},
platform::linux::run_cmds,
};
pub const RENDEZVOUS_TIMEOUT: u64 = 12_000;
@ -402,21 +403,11 @@ fn patch(path: PathBuf) -> PathBuf {
#[cfg(target_os = "linux")]
{
if _tmp == "/root" {
if let Ok(output) = std::process::Command::new("whoami").output() {
let user = String::from_utf8_lossy(&output.stdout)
.to_string()
.trim()
.to_owned();
if let Ok(user) = run_cmds("whoami") {
if user != "root" {
let cmd = format!("getent passwd '{}' | awk -F':' '{{print $6}}'", user);
if let Ok(output) = std::process::Command::new(cmd).output() {
let home_dir = String::from_utf8_lossy(&output.stdout)
.to_string()
.trim()
.to_owned();
if !home_dir.is_empty() {
return home_dir.into();
}
if let Ok(output) = run_cmds(&cmd) {
return output.into();
}
return format!("/home/{user}").into();
}