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

Merge pull request #590 from 64kramsystem/make_keyboard_hook_global_safe

Browse Source 
Remove `remote.rs` static mut booleans unsafe code, by using AtomicBool
This commit is contained in:
RustDesk 2022-05-25 09:52:36 +08:00 committed by GitHub
commit 6ad607348d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/ui/remote.rs
View File

@ -1,7 +1,10 @@
use std::{ use std::{
collections::HashMap, collections::HashMap,
ops::Deref, ops::Deref,
sync::{Arc, Mutex, RwLock}, sync::{
atomic::{AtomicBool, Ordering},
Arc, Mutex, RwLock,
},
}; };
use sciter::{ use sciter::{
@ -63,11 +66,11 @@ fn get_key_state(key: enigo::Key) -> bool {
ENIGO.lock().unwrap().get_key_state(key) ENIGO.lock().unwrap().get_key_state(key)
} }
static mut IS_IN: bool = false; static IS_IN: AtomicBool = AtomicBool::new(false);
static mut KEYBOARD_HOOKED: bool = false; static KEYBOARD_HOOKED: AtomicBool = AtomicBool::new(false);
static mut SERVER_KEYBOARD_ENABLED: bool = true; static SERVER_KEYBOARD_ENABLED: AtomicBool = AtomicBool::new(true);
static mut SERVER_FILE_TRANSFER_ENABLED: bool = true; static SERVER_FILE_TRANSFER_ENABLED: AtomicBool = AtomicBool::new(true);
static mut SERVER_CLIPBOARD_ENABLED: bool = true; static SERVER_CLIPBOARD_ENABLED: AtomicBool = AtomicBool::new(true);
#[cfg(windows)] #[cfg(windows)]
static mut IS_ALT_GR: bool = false; static mut IS_ALT_GR: bool = false;
@ -249,12 +252,9 @@ impl Handler {
if self.is_port_forward() || self.is_file_transfer() { if self.is_port_forward() || self.is_file_transfer() {
return; return;
} }
if unsafe { KEYBOARD_HOOKED } { if KEYBOARD_HOOKED.swap(true, Ordering::SeqCst) {
return; return;
} }
unsafe {
KEYBOARD_HOOKED = true;
}
log::info!("keyboard hooked"); log::info!("keyboard hooked");
let mut me = self.clone(); let mut me = self.clone();
let peer = self.peer_platform(); let peer = self.peer_platform();
@ -266,7 +266,7 @@ impl Handler {
std::env::set_var("KEYBOARD_ONLY", "y"); // pass to rdev std::env::set_var("KEYBOARD_ONLY", "y"); // pass to rdev
use rdev::{EventType::*, *}; use rdev::{EventType::*, *};
let func = move |evt: Event| { let func = move |evt: Event| {
if unsafe { !IS_IN || !SERVER_KEYBOARD_ENABLED } { if !IS_IN.load(Ordering::SeqCst) || !SERVER_KEYBOARD_ENABLED.load(Ordering::SeqCst) {
return; return;
} }
let (key, down) = match evt.event_type { let (key, down) = match evt.event_type {
@ -865,17 +865,13 @@ impl Handler {
fn enter(&mut self) { fn enter(&mut self) {
#[cfg(windows)] #[cfg(windows)]
crate::platform::windows::stop_system_key_propagate(true); crate::platform::windows::stop_system_key_propagate(true);
unsafe { IS_IN.store(true, Ordering::SeqCst);
IS_IN = true;
}
} }
fn leave(&mut self) { fn leave(&mut self) {
#[cfg(windows)] #[cfg(windows)]
crate::platform::windows::stop_system_key_propagate(false); crate::platform::windows::stop_system_key_propagate(false);
unsafe { IS_IN.store(false, Ordering::SeqCst);
IS_IN = false;
}
} }
fn send_mouse( fn send_mouse(
@ -1380,11 +1376,9 @@ impl Remote {
}; };
match Client::start(&self.handler.id, key, token, conn_type).await { match Client::start(&self.handler.id, key, token, conn_type).await {
Ok((mut peer, direct)) => { Ok((mut peer, direct)) => {
unsafe { SERVER_KEYBOARD_ENABLED.store(true, Ordering::SeqCst);
SERVER_KEYBOARD_ENABLED = true; SERVER_CLIPBOARD_ENABLED.store(true, Ordering::SeqCst);
SERVER_CLIPBOARD_ENABLED = true; SERVER_FILE_TRANSFER_ENABLED.store(true, Ordering::SeqCst);
SERVER_FILE_TRANSFER_ENABLED = true;
}
self.handler self.handler
.call("setConnectionType", &make_args!(peer.is_secured(), direct)); .call("setConnectionType", &make_args!(peer.is_secured(), direct));
@ -1462,11 +1456,9 @@ impl Remote {
if let Some(stop) = stop_clipboard { if let Some(stop) = stop_clipboard {
stop.send(()).ok(); stop.send(()).ok();
} }
unsafe { SERVER_KEYBOARD_ENABLED.store(false, Ordering::SeqCst);
SERVER_KEYBOARD_ENABLED = false; SERVER_CLIPBOARD_ENABLED.store(false, Ordering::SeqCst);
SERVER_CLIPBOARD_ENABLED = false; SERVER_FILE_TRANSFER_ENABLED.store(false, Ordering::SeqCst);
SERVER_FILE_TRANSFER_ENABLED = false;
}
} }
fn handle_job_status(&mut self, id: i32, file_num: i32, err: Option<String>) { fn handle_job_status(&mut self, id: i32, file_num: i32, err: Option<String>) {
@ -1518,8 +1510,8 @@ impl Remote {
} }
_ => {} _ => {}
} }
if !unsafe { SERVER_CLIPBOARD_ENABLED } if !SERVER_CLIPBOARD_ENABLED.load(Ordering::SeqCst)
|| !unsafe { SERVER_KEYBOARD_ENABLED } || !SERVER_KEYBOARD_ENABLED.load(Ordering::SeqCst)
|| lc.read().unwrap().disable_clipboard || lc.read().unwrap().disable_clipboard
{ {
continue; continue;
@ -1712,7 +1704,7 @@ impl Remote {
job.is_last_job = false; job.is_last_job = false;
allow_err!( allow_err!(
peer.send(&fs::new_send(id, job.remote.clone(), job.file_num, job.show_hidden)) peer.send(&fs::new_send(id, job.remote.clone(), job.file_num, job.show_hidden))
.await .await
); );
} }
} else { } else {
@ -1947,7 +1939,7 @@ impl Remote {
let json_str = serde_json::to_string(&job.gen_meta()).unwrap(); let json_str = serde_json::to_string(&job.gen_meta()).unwrap();
transfer_metas.write_jobs.push(json_str); transfer_metas.write_jobs.push(json_str);
} }
log::info!("meta: {:?}",transfer_metas); log::info!("meta: {:?}", transfer_metas);
config.transfer = transfer_metas; config.transfer = transfer_metas;
self.handler.save_config(config); self.handler.save_config(config);
true true
@ -1978,8 +1970,8 @@ impl Remote {
self.check_clipboard_file_context(); self.check_clipboard_file_context();
if !(self.handler.is_file_transfer() if !(self.handler.is_file_transfer()
|| self.handler.is_port_forward() || self.handler.is_port_forward()
|| !unsafe { SERVER_CLIPBOARD_ENABLED } || !SERVER_CLIPBOARD_ENABLED.load(Ordering::SeqCst)
|| !unsafe { SERVER_KEYBOARD_ENABLED } || !SERVER_KEYBOARD_ENABLED.load(Ordering::SeqCst)
|| self.handler.lc.read().unwrap().disable_clipboard) || self.handler.lc.read().unwrap().disable_clipboard)
{ {
let txt = self.old_clipboard.lock().unwrap().clone(); let txt = self.old_clipboard.lock().unwrap().clone();
@ -2181,16 +2173,12 @@ impl Remote {
log::info!("Change permission {:?} -> {}", p.permission, p.enabled); log::info!("Change permission {:?} -> {}", p.permission, p.enabled);
match p.permission.enum_value_or_default() { match p.permission.enum_value_or_default() {
Permission::Keyboard => { Permission::Keyboard => {
unsafe { SERVER_KEYBOARD_ENABLED.store(p.enabled, Ordering::SeqCst);
SERVER_KEYBOARD_ENABLED = p.enabled;
}
self.handler self.handler
.call2("setPermission", &make_args!("keyboard", p.enabled)); .call2("setPermission", &make_args!("keyboard", p.enabled));
} }
Permission::Clipboard => { Permission::Clipboard => {
unsafe { SERVER_CLIPBOARD_ENABLED.store(p.enabled, Ordering::SeqCst);
SERVER_CLIPBOARD_ENABLED = p.enabled;
}
self.handler self.handler
.call2("setPermission", &make_args!("clipboard", p.enabled)); .call2("setPermission", &make_args!("clipboard", p.enabled));
} }
@ -2199,9 +2187,7 @@ impl Remote {
.call2("setPermission", &make_args!("audio", p.enabled)); .call2("setPermission", &make_args!("audio", p.enabled));
} }
Permission::File => { Permission::File => {
unsafe { SERVER_FILE_TRANSFER_ENABLED.store(p.enabled, Ordering::SeqCst);
SERVER_FILE_TRANSFER_ENABLED = p.enabled;
}
if !p.enabled && self.handler.is_file_transfer() { if !p.enabled && self.handler.is_file_transfer() {
return true; return true;
} }
@ -2262,7 +2248,7 @@ impl Remote {
fn check_clipboard_file_context(&mut self) { fn check_clipboard_file_context(&mut self) {
#[cfg(windows)] #[cfg(windows)]
{ {
let enabled = unsafe { SERVER_FILE_TRANSFER_ENABLED } let enabled = SERVER_FILE_TRANSFER_ENABLED.load(Ordering::SeqCst)
&& self.handler.lc.read().unwrap().enable_file_transfer; && self.handler.lc.read().unwrap().enable_file_transfer;
if enabled == self.clipboard_file_context.is_none() { if enabled == self.clipboard_file_context.is_none() {
self.clipboard_file_context = if enabled { self.clipboard_file_context = if enabled {