Revert "temp commit"
This reverts commit 88f0f67ee321429c94f3fc2419edd537382917de.
This commit is contained in:
chenbaiyu
parent
88f0f67ee3
commit
1995f9fa4e
@ -11,6 +11,7 @@ use std::{
|
||||
sync::{Arc, Mutex, RwLock},
|
||||
time::SystemTime,
|
||||
};
|
||||
use std::borrow::Borrow;
|
||||
|
||||
pub const APP_NAME: &str = "RustDesk";
|
||||
pub const RENDEZVOUS_TIMEOUT: u64 = 12_000;
|
||||
@ -673,92 +674,44 @@ impl Config {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn sync_config_to_user<P: AsRef<Path>>(target_username: String, to_dir: P) -> bool {
|
||||
let config1_root_file_path = Config::file_("");
|
||||
let config1_filename = config1_root_file_path.file_name();
|
||||
pub fn copy_and_reload_config_dir<P: AsRef<Path>>(
|
||||
target_username: String,
|
||||
from: P,
|
||||
) -> Result<bool, fs_extra::error::Error> {
|
||||
let to = Self::path("");
|
||||
let to_parent = to.parent().unwrap();
|
||||
|
||||
let config2_root_file_path = Config::file_("2");
|
||||
let config2_filename = config2_root_file_path.file_name();
|
||||
let mut options = fs_extra::dir::CopyOptions::new();
|
||||
options.overwrite = true;
|
||||
options.copy_inside = true;
|
||||
|
||||
let config1_to_file_path = to_dir
|
||||
.as_ref()
|
||||
.join(PathBuf::from(&config1_filename.unwrap()));
|
||||
let config2_to_file_path = to_dir
|
||||
.as_ref()
|
||||
.join(PathBuf::from(&config2_filename.unwrap()));
|
||||
let mut f = from.as_ref();
|
||||
|
||||
log::info!(
|
||||
"config1_root_path:{}",
|
||||
&config1_root_file_path.as_path().to_str().unwrap()
|
||||
);
|
||||
log::info!(
|
||||
"config2_root_path:{}",
|
||||
&config2_root_file_path.as_path().to_str().unwrap()
|
||||
);
|
||||
log::info!(
|
||||
"config1_to_path:{}",
|
||||
&config1_to_file_path.as_path().to_str().unwrap()
|
||||
);
|
||||
log::info!(
|
||||
"config2_to_path:{}",
|
||||
&config2_to_file_path.as_path().to_str().unwrap()
|
||||
);
|
||||
return match fs_extra::dir::copy(f, to_parent, &options) {
|
||||
Ok(count) => {
|
||||
if count > 0 {
|
||||
log::info!("{}",target_username);
|
||||
log::info!("{}",f.to_str().unwrap().to_string());
|
||||
log::info!("{}",to.to_str().unwrap().to_string());
|
||||
|
||||
match std::fs::copy(&config1_root_file_path, &config1_to_file_path) {
|
||||
Err(e) => log::error!(
|
||||
"copy config {} to user failed: {}",
|
||||
config1_filename.unwrap().to_str().unwrap(),
|
||||
e
|
||||
),
|
||||
_ => {}
|
||||
}
|
||||
std::process::Command::new("chown")
|
||||
.arg("-R")
|
||||
.arg(target_username)
|
||||
.arg(to.to_str().unwrap().to_string())
|
||||
.spawn();
|
||||
|
||||
match std::fs::copy(&config2_root_file_path, &config2_to_file_path) {
|
||||
Err(e) => log::error!(
|
||||
"copy config {} to user failed: {}",
|
||||
config2_filename.unwrap().to_str().unwrap(),
|
||||
e
|
||||
),
|
||||
_ => {}
|
||||
}
|
||||
|
||||
let success = std::process::Command::new("chown")
|
||||
.arg(&target_username.to_string())
|
||||
.arg(&config1_to_file_path.to_str().unwrap().to_string())
|
||||
.arg(&config2_to_file_path.to_str().unwrap().to_string())
|
||||
.spawn()
|
||||
.is_ok();
|
||||
|
||||
if success {
|
||||
CONFIG.write().unwrap().reload();
|
||||
CONFIG2.write().unwrap().reload();
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
pub fn sync_config_to_root<P: AsRef<Path>>(from_file_path: P) -> bool {
|
||||
if let Some(filename) = from_file_path.as_ref().file_name() {
|
||||
let to = Config::path(filename);
|
||||
return match std::fs::copy(from_file_path, &to) {
|
||||
Ok(count) => {
|
||||
if count > 0 {
|
||||
return std::process::Command::new("chown")
|
||||
.arg("root")
|
||||
.arg(&to.to_str().unwrap().to_string())
|
||||
.spawn()
|
||||
.is_ok();
|
||||
}
|
||||
false
|
||||
Ok(count > 0)
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("sync_config_to_root failed: {}", e);
|
||||
false
|
||||
log::error!("config copy failed: {}", e);
|
||||
Err(e)
|
||||
}
|
||||
};
|
||||
}
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
const PEERS: &str = "peers";
|
||||
|
||||
65
src/ipc.rs
65
src/ipc.rs
@ -1,20 +1,10 @@
|
||||
use hbb_common::log::info;
|
||||
use hbb_common::{
|
||||
allow_err, bail, bytes,
|
||||
bytes_codec::BytesCodec,
|
||||
config::{self, Config},
|
||||
futures::StreamExt as _,
|
||||
futures_util::sink::SinkExt,
|
||||
log, timeout, tokio,
|
||||
tokio::io::{AsyncRead, AsyncWrite},
|
||||
tokio_util::codec::Framed,
|
||||
ResultType,
|
||||
};
|
||||
use hbb_common::{allow_err, bail, bytes, bytes_codec::BytesCodec, config::{self, Config}, futures::StreamExt as _, futures_util::sink::SinkExt, log, timeout, tokio, tokio::io::{AsyncRead, AsyncWrite}, tokio_util::codec::Framed, ResultType};
|
||||
use parity_tokio_ipc::{
|
||||
Connection as Conn, ConnectionClient as ConnClient, Endpoint, Incoming, SecurityAttributes,
|
||||
};
|
||||
use serde_derive::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
use std::path::PathBuf;
|
||||
#[cfg(not(windows))]
|
||||
use std::{fs::File, io::prelude::*};
|
||||
|
||||
@ -93,22 +83,17 @@ pub enum Data {
|
||||
Socks(Option<config::Socks5Server>),
|
||||
FS(FS),
|
||||
Test,
|
||||
SyncConfigToRootReq {
|
||||
from: String,
|
||||
ConfigCopyReq {
|
||||
target_username: String,
|
||||
dir_path: String,
|
||||
},
|
||||
SyncConfigToRootResp(bool),
|
||||
SyncConfigToUserReq {
|
||||
username: String,
|
||||
to: String,
|
||||
},
|
||||
SyncConfigToUserResp(bool),
|
||||
ConfigCopyResp(Option<bool>),
|
||||
}
|
||||
|
||||
#[tokio::main(flavor = "current_thread")]
|
||||
pub async fn start(postfix: &str) -> ResultType<()> {
|
||||
let mut incoming = new_listener(postfix).await?;
|
||||
loop {
|
||||
log::info!("begin loop");
|
||||
if let Some(result) = incoming.next().await {
|
||||
match result {
|
||||
Ok(stream) => {
|
||||
@ -116,16 +101,13 @@ pub async fn start(postfix: &str) -> ResultType<()> {
|
||||
let postfix = postfix.to_owned();
|
||||
tokio::spawn(async move {
|
||||
loop {
|
||||
log::info!("begin loop");
|
||||
match stream.next().await {
|
||||
Err(err) => {
|
||||
log::trace!("ipc{} connection closed: {}", postfix, err);
|
||||
break;
|
||||
}
|
||||
Ok(Some(data)) => {
|
||||
log::info!("begin handle");
|
||||
handle(data, &mut stream).await;
|
||||
log::info!("end handle");
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
@ -266,27 +248,22 @@ async fn handle(data: Data, stream: &mut Connection) {
|
||||
let t = Config::get_nat_type();
|
||||
allow_err!(stream.send(&Data::NatType(Some(t))).await);
|
||||
}
|
||||
Data::SyncConfigToRootReq { from } => {
|
||||
info!("begin SyncConfigToRootReq, {}", from);
|
||||
allow_err!(
|
||||
stream
|
||||
.send(&Data::SyncConfigToRootResp(Config::sync_config_to_root(
|
||||
from
|
||||
)))
|
||||
.await
|
||||
);
|
||||
info!("begin SyncConfigToRootReq end");
|
||||
Data::ConfigCopyReq { target_username, dir_path } => {
|
||||
let from = PathBuf::from(dir_path);
|
||||
if !from.exists() {
|
||||
allow_err!(stream.send(&Data::ConfigCopyResp(None)).await);
|
||||
return;
|
||||
}
|
||||
|
||||
match Config::copy_and_reload_config_dir(target_username, from) {
|
||||
Ok(result) => {
|
||||
allow_err!(stream.send(&Data::ConfigCopyResp(Some(result))).await);
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("copy_and_reload_config_dir failed: {:?}",e);
|
||||
allow_err!(stream.send(&Data::ConfigCopyResp(Some(false))).await);
|
||||
}
|
||||
}
|
||||
Data::SyncConfigToUserReq { username, to } => {
|
||||
info!("begin SyncConfigToUserReq,{},{}", username, to);
|
||||
allow_err!(
|
||||
stream
|
||||
.send(&Data::SyncConfigToUserResp(Config::sync_config_to_user(
|
||||
username, to
|
||||
)))
|
||||
.await
|
||||
);
|
||||
info!("begin SyncConfigToUserReq end");
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
@ -335,7 +335,6 @@ pub fn is_installed() -> bool {
|
||||
}
|
||||
|
||||
pub fn start_daemon(){
|
||||
log::info!("{}",crate::username());
|
||||
if let Err(err) = crate::ipc::start("_daemon") {
|
||||
log::error!("Failed to start ipc_daemon: {}", err);
|
||||
std::process::exit(-1);
|
||||
|
||||
@ -14,7 +14,7 @@ use hbb_common::{
|
||||
timeout, tokio, ResultType, Stream,
|
||||
};
|
||||
use service::{GenericService, Service, ServiceTmpl, Subscriber};
|
||||
use std::path::PathBuf;
|
||||
use std::sync::mpsc::RecvError;
|
||||
use std::time::Duration;
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
@ -22,6 +22,7 @@ use std::{
|
||||
sync::{Arc, Mutex, RwLock, Weak},
|
||||
};
|
||||
|
||||
use hbb_common::log::info;
|
||||
#[cfg(target_os = "macos")]
|
||||
use notify::{watcher, RecursiveMode, Watcher};
|
||||
use parity_tokio_ipc::ConnectionClient;
|
||||
@ -274,9 +275,7 @@ pub async fn start_server(is_server: bool, _tray: bool) {
|
||||
log::info!("XAUTHORITY={:?}", std::env::var("XAUTHORITY"));
|
||||
}
|
||||
|
||||
tokio::spawn(async { sync_and_watch_config_dir().await });
|
||||
|
||||
log::info!("enter server");
|
||||
sync_and_watch_config_dir().await;
|
||||
|
||||
if is_server {
|
||||
std::thread::spawn(move || {
|
||||
@ -328,22 +327,19 @@ pub async fn start_server(is_server: bool, _tray: bool) {
|
||||
}
|
||||
}
|
||||
|
||||
async fn sync_and_watch_config_dir() {
|
||||
if crate::username() == "root"{
|
||||
return;
|
||||
}
|
||||
async fn sync_and_watch_config_dir() -> ResultType<()> {
|
||||
let mut conn = crate::ipc::connect(1000, "_daemon").await?;
|
||||
|
||||
match crate::ipc::connect(1000, "_daemon").await {
|
||||
Ok(mut conn) => {
|
||||
sync_config_to_user(&mut conn).await;
|
||||
sync_config_dir(&mut conn, "/var/root/Library/Preferences/com.carriez.RustDesk/".to_string()).await?;
|
||||
|
||||
tokio::spawn(async move {
|
||||
log::info!(
|
||||
"watching config dir: {}",
|
||||
Config::path("").to_str().unwrap().to_string()
|
||||
);
|
||||
|
||||
let (tx, rx) = std::sync::mpsc::channel();
|
||||
let mut watcher = watcher(tx, Duration::from_secs(2)).unwrap();
|
||||
let mut watcher = watcher(tx, Duration::from_secs(1)).unwrap();
|
||||
watcher
|
||||
.watch(Config::path("").as_path(), RecursiveMode::Recursive)
|
||||
.unwrap();
|
||||
@ -357,8 +353,7 @@ async fn sync_and_watch_config_dir() {
|
||||
"config file changed, call ipc_daemon to sync: {}",
|
||||
path.to_str().unwrap().to_string()
|
||||
);
|
||||
sync_config_to_root(&mut conn, path).await;
|
||||
log::info!("sync end");
|
||||
sync_config_dir(&mut conn, Config::path("").to_str().unwrap().to_string()).await;
|
||||
}
|
||||
x => {
|
||||
log::info!("another {:?}", x)
|
||||
@ -367,53 +362,31 @@ async fn sync_and_watch_config_dir() {
|
||||
Err(e) => println!("watch error: {:?}", e),
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
log::info!("connect ipc_daemon failed, skip config sync");
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn sync_config_to_user(conn: &mut ConnectionTmpl<ConnectionClient>) -> ResultType<()> {
|
||||
async fn sync_config_dir(conn: &mut ConnectionTmpl<ConnectionClient>, path: String) -> ResultType<()> {
|
||||
allow_err!(
|
||||
conn.send(&Data::SyncConfigToUserReq {
|
||||
username: crate::username(),
|
||||
to: Config::path("").to_str().unwrap().to_string(),
|
||||
conn.send(&Data::ConfigCopyReq {
|
||||
target_username: crate::username(),
|
||||
dir_path: path
|
||||
})
|
||||
.await
|
||||
);
|
||||
|
||||
if let Some(data) = conn.next_timeout(2000).await? {
|
||||
if let Ok(Some(data)) = conn.next_timeout(1000).await {
|
||||
match data {
|
||||
Data::SyncConfigToUserResp(success) => {
|
||||
log::info!("copy and reload config dir success: {:?}", success);
|
||||
}
|
||||
x => {
|
||||
log::info!("receive another {:?}", x)
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn sync_config_to_root(
|
||||
conn: &mut ConnectionTmpl<ConnectionClient>,
|
||||
from: PathBuf,
|
||||
) -> ResultType<()> {
|
||||
allow_err!(
|
||||
conn.send(&Data::SyncConfigToRootReq {
|
||||
from: from.to_str().unwrap().to_string()
|
||||
})
|
||||
.await
|
||||
);
|
||||
|
||||
if let Some(data) = conn.next_timeout(2000).await? {
|
||||
match data {
|
||||
Data::SyncConfigToRootResp(success) => {
|
||||
log::info!("copy config to root dir success: {:?}", success);
|
||||
Data::ConfigCopyResp(result) => match result {
|
||||
Some(success) => {
|
||||
if success {
|
||||
log::info!("copy and reload config dir success");
|
||||
} else {
|
||||
log::info!("copy config dir failed. may be first running");
|
||||
}
|
||||
}
|
||||
None => {}
|
||||
},
|
||||
x => {
|
||||
log::info!("receive another {:?}",x)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user