mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-03-26 22:51:03 +03:00
* feat(macos): add privacy mode support for macOS ## Summary Add privacy mode functionality for macOS platform, allowing remote desktop sessions to hide the screen content from local users. ## Changes ### Core Implementation (src/platform/macos.mm) - Implement screen blackout using CGDisplayGammaTable API - Implement input blocking using CGEventTap to intercept keyboard/mouse - Store and restore original gamma values for proper cleanup ### Privacy Mode Integration (src/privacy_mode.rs, src/privacy_mode/macos.rs) - Add macOS privacy mode implementation with PrivacyMode trait - Register macOS privacy mode in PRIVACY_MODE_CREATOR - Set DEFAULT_PRIVACY_MODE_IMPL for macOS platform - Implement get_supported_privacy_mode_impl() for macOS ### Connection Handling (src/server/connection.rs) - Add supported_privacy_mode_impl to platform_additions for macOS - Enable privacy mode toggle in client UI when connecting via LAN IP ### Localization (src/lang/*.rs) - Add "privacy_mode_impl_macos_tip" translation for en/cn/tw ## Safety & Security - Implements Drop trait to ensure cleanup on normal exit - macOS system automatically restores gamma table on process termination - CGEventTap is automatically released when process terminates - Tested with SIGKILL to verify crash recovery ## Testing - Verified privacy mode toggle works via both ID and LAN IP connection - Verified screen recovery after process crash (kill -9) - Verified input restoration after process termination * refactor: use existing 'Privacy mode' translation key * refactor: rename gamma channel variables for better readability - rename r/g/b to red/green/blue to avoid variable shadowing confusion * fix: add error handling for gamma table restoration with fallback to system reset * fix: add error handling for CGEventTapCreate failure in privacy mode * fix: only set display to black if original gamma was saved successfully * fix: add error handling for CGSetDisplayTransferByTable when setting display to black * fix: improve event tap callback to properly distinguish remote input from local input * fix: missing macos.rs * Fix: Add display validation before restoring gamma values * Fix: Add mutex lock for thread safety in MacSetPrivacyMode * Fix: Handle return values and add missing mouse events in macos privacy mode * fix: only set conn_id after privacy mode is successfully turned on * fix: reimplement privacy mode with stable display identification Address code review concern: original gamma values stored with DisplayID as key could become stale if display list changes between privacy mode activations (e.g., display reconnected with different ID). Solution: - Use UUID instead of DisplayID as storage key (stable across reconnections) - Clear g_originalGammas when privacy mode is turned off - Register CGDisplayReconfigurationCallback to handle hot-plug events - Validate display state via FindDisplayIdByUUID() before restoration Key features: - UUID-based display identification (stable across reconnections) - Hot-plug support via CGDisplayReconfigurationCallback - EventTap auto re-enable on system timeout - Fallback to CGDisplayRestoreColorSyncSettings() for recovery - Detailed error logging with display name/ID/UUID * fix: ensure EventTap runs on main thread and improve gamma restore error handling - Add SetupEventTapOnMainThread() to create EventTap on main thread using dispatch_sync, avoiding potential issues when called from background threads - Add TeardownEventTapOnMainThread() for consistent cleanup on main thread - Check [NSThread isMainThread] to avoid deadlock when already on main thread - Add error tracking for gamma restoration during cleanup - Use CGDisplayRestoreColorSyncSettings() as fallback when individual gamma restoration fails * fix: remove invalid eventMask bits that caused undefined behavior in input blocking * fix: address code review comments for macos privacy mode implementation Changes to src/privacy_mode/macos.rs: - Add check_on_conn_id() in turn_on_privacy() to prevent duplicate activation - Add check_off_conn_id() in turn_off_privacy() to validate connection ID - Add self.conn_id = 0 in clear() to reset connection state Changes to src/platform/macos.mm: - Add link comment for ENIGO_INPUT_EXTRA_VALUE referencing libs/enigo/src/macos/macos_impl.rs - Fix NSLog format string mismatch (5 placeholders vs 4 values) - Make ApplyBlackoutToDisplay() return bool for proper error handling - Return false when UUID is empty since privacy mode requires ALL displays - Add else branches with logging for: - CGGetDisplayTransferByTable failures - Zero gamma table capacity (not supported) - Zero blackout capacity - Remove unused g_uuidToDisplayId variable (was only written, never read) * fix(macos): add early return with privacy mode exit on display hotplug failures Why large-scale changes are needed: The code review suggested adding early return when errors occur in DisplayReconfigurationCallback. However, simply returning early is not enough - when a newly connected display cannot be blacked out, we must exit privacy mode entirely to maintain security guarantees. The challenge is that DisplayReconfigurationCallback already holds g_privacyModeMutex, so calling MacSetPrivacyMode(false) directly would cause a deadlock. This necessitated: 1. Extract TurnOffPrivacyModeInternal() - a lock-free internal function that can be safely called from within the callback 2. Refactor MacSetPrivacyMode(false) branch to use this internal function 3. Add early returns with TurnOffPrivacyModeInternal() calls at each failure point in DisplayReconfigurationCallback Changes in DisplayReconfigurationCallback: - UUID empty: log + exit privacy mode + early return - Gamma table capacity zero: log + exit privacy mode + early return - CGGetDisplayTransferByTable fails: log + exit privacy mode + early return - ApplyBlackoutToDisplay fails: log + exit privacy mode + early return * fix(macos): address code review feedback and improve privacy mode stability Code Review Fixes: - Add detailed comments for potential deadlock scenarios in dispatch_sync with g_privacyModeMutex (SetupEventTapOnMainThread/TeardownEventTapOnMainThread) - Use async dispatch for privacy mode shutdown from DisplayReconfigurationCallback to avoid unregistering callback from within itself - Extract RestoreAllGammas() helper function to reduce code duplication - Fix Drop implementation in macos.rs to call self.clear() for consistency - Add comment explaining why _state parameter is ignored on macOS - Define DISPLAY_RECONFIG_MONITOR_DURATION_MS and GAMMA_CHECK_INTERVAL_MS constants - Add gamma restoration when UUID retrieval fails during privacy mode activation Privacy Mode Stability Improvements (Continuous Resolution Changes): - Implement continuous gamma value monitoring with timer polling after display reconfiguration to handle rapid successive resolution changes - Monitor gamma values every 200ms for 5 seconds after each resolution change - Automatically reapply blackout if system (ColorSync) restores gamma - Add IsDisplayBlackedOut() to detect if display gamma has been restored - Use timestamp-based debouncing: monitoring period automatically extends when new reconfig events occur during active monitoring - Ensure blackout remains effective even under continuous resolution changes where macOS may asynchronously restore gamma values multiple times This ensures privacy mode remains stable and effective when users rapidly change display resolution multiple times in succession. --------- Co-authored-by: libin <libin.chat@outlook.com>
432 lines
12 KiB
Rust
432 lines
12 KiB
Rust
use crate::ui_interface::get_option;
|
|
#[cfg(windows)]
|
|
use crate::{
|
|
display_service,
|
|
ipc::{connect, Data},
|
|
platform::is_installed,
|
|
};
|
|
#[cfg(windows)]
|
|
use hbb_common::tokio;
|
|
use hbb_common::{anyhow::anyhow, bail, lazy_static, tokio::sync::oneshot, ResultType};
|
|
use serde_derive::{Deserialize, Serialize};
|
|
use std::{
|
|
collections::HashMap,
|
|
sync::{Arc, Mutex},
|
|
};
|
|
|
|
#[cfg(windows)]
|
|
pub mod win_exclude_from_capture;
|
|
#[cfg(windows)]
|
|
mod win_input;
|
|
#[cfg(windows)]
|
|
pub mod win_mag;
|
|
#[cfg(windows)]
|
|
pub mod win_topmost_window;
|
|
|
|
#[cfg(target_os = "macos")]
|
|
pub mod macos;
|
|
|
|
#[cfg(windows)]
|
|
mod win_virtual_display;
|
|
#[cfg(windows)]
|
|
pub use win_virtual_display::restore_reg_connectivity;
|
|
|
|
pub const INVALID_PRIVACY_MODE_CONN_ID: i32 = 0;
|
|
pub const OCCUPIED: &'static str = "Privacy occupied by another one.";
|
|
pub const TURN_OFF_OTHER_ID: &'static str =
|
|
"Failed to turn off privacy mode that belongs to someone else.";
|
|
pub const NO_PHYSICAL_DISPLAYS: &'static str = "no_need_privacy_mode_no_physical_displays_tip";
|
|
|
|
pub const PRIVACY_MODE_IMPL_WIN_MAG: &str = "privacy_mode_impl_mag";
|
|
pub const PRIVACY_MODE_IMPL_WIN_EXCLUDE_FROM_CAPTURE: &str =
|
|
"privacy_mode_impl_exclude_from_capture";
|
|
pub const PRIVACY_MODE_IMPL_WIN_VIRTUAL_DISPLAY: &str = "privacy_mode_impl_virtual_display";
|
|
|
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
|
#[serde(tag = "t", content = "c")]
|
|
pub enum PrivacyModeState {
|
|
OffSucceeded,
|
|
OffByPeer,
|
|
OffUnknown,
|
|
}
|
|
|
|
pub trait PrivacyMode: Sync + Send {
|
|
fn is_async_privacy_mode(&self) -> bool;
|
|
|
|
fn init(&self) -> ResultType<()>;
|
|
fn clear(&mut self);
|
|
fn turn_on_privacy(&mut self, conn_id: i32) -> ResultType<bool>;
|
|
fn turn_off_privacy(&mut self, conn_id: i32, state: Option<PrivacyModeState>)
|
|
-> ResultType<()>;
|
|
|
|
fn pre_conn_id(&self) -> i32;
|
|
|
|
fn get_impl_key(&self) -> &str;
|
|
|
|
#[inline]
|
|
fn check_on_conn_id(&self, conn_id: i32) -> ResultType<bool> {
|
|
let pre_conn_id = self.pre_conn_id();
|
|
if pre_conn_id == conn_id {
|
|
return Ok(true);
|
|
}
|
|
if pre_conn_id != INVALID_PRIVACY_MODE_CONN_ID {
|
|
bail!(OCCUPIED);
|
|
}
|
|
Ok(false)
|
|
}
|
|
|
|
#[inline]
|
|
fn check_off_conn_id(&self, conn_id: i32) -> ResultType<()> {
|
|
let pre_conn_id = self.pre_conn_id();
|
|
if pre_conn_id != INVALID_PRIVACY_MODE_CONN_ID
|
|
&& conn_id != INVALID_PRIVACY_MODE_CONN_ID
|
|
&& pre_conn_id != conn_id
|
|
{
|
|
bail!(TURN_OFF_OTHER_ID)
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
lazy_static::lazy_static! {
|
|
pub static ref DEFAULT_PRIVACY_MODE_IMPL: String = {
|
|
#[cfg(windows)]
|
|
{
|
|
if win_exclude_from_capture::is_supported() {
|
|
PRIVACY_MODE_IMPL_WIN_EXCLUDE_FROM_CAPTURE
|
|
} else {
|
|
if display_service::is_privacy_mode_mag_supported() {
|
|
PRIVACY_MODE_IMPL_WIN_MAG
|
|
} else {
|
|
if is_installed() {
|
|
PRIVACY_MODE_IMPL_WIN_VIRTUAL_DISPLAY
|
|
} else {
|
|
""
|
|
}
|
|
}
|
|
}.to_owned()
|
|
}
|
|
#[cfg(not(windows))]
|
|
{
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
macos::PRIVACY_MODE_IMPL.to_owned()
|
|
}
|
|
#[cfg(not(target_os = "macos"))]
|
|
{
|
|
"".to_owned()
|
|
}
|
|
}
|
|
};
|
|
|
|
static ref PRIVACY_MODE: Arc<Mutex<Option<Box<dyn PrivacyMode>>>> = {
|
|
let mut cur_impl = get_option("privacy-mode-impl-key".to_owned());
|
|
if !get_supported_privacy_mode_impl().iter().any(|(k, _)| k == &cur_impl) {
|
|
cur_impl = DEFAULT_PRIVACY_MODE_IMPL.to_owned();
|
|
}
|
|
|
|
let privacy_mode = match PRIVACY_MODE_CREATOR.lock().unwrap().get(&(&cur_impl as &str)) {
|
|
Some(creator) => Some(creator(&cur_impl)),
|
|
None => None,
|
|
};
|
|
Arc::new(Mutex::new(privacy_mode))
|
|
};
|
|
}
|
|
|
|
pub type PrivacyModeCreator = fn(impl_key: &str) -> Box<dyn PrivacyMode>;
|
|
lazy_static::lazy_static! {
|
|
static ref PRIVACY_MODE_CREATOR: Arc<Mutex<HashMap<&'static str, PrivacyModeCreator>>> = {
|
|
#[cfg(not(windows))]
|
|
let mut map: HashMap<&'static str, PrivacyModeCreator> = HashMap::new();
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
map.insert(macos::PRIVACY_MODE_IMPL, |impl_key: &str| {
|
|
Box::new(macos::PrivacyModeImpl::new(impl_key))
|
|
});
|
|
}
|
|
#[cfg(windows)]
|
|
let mut map: HashMap<&'static str, PrivacyModeCreator> = HashMap::new();
|
|
#[cfg(windows)]
|
|
{
|
|
if win_exclude_from_capture::is_supported() {
|
|
map.insert(win_exclude_from_capture::PRIVACY_MODE_IMPL, |impl_key: &str| {
|
|
Box::new(win_exclude_from_capture::PrivacyModeImpl::new(impl_key))
|
|
});
|
|
} else {
|
|
map.insert(win_mag::PRIVACY_MODE_IMPL, |impl_key: &str| {
|
|
Box::new(win_mag::PrivacyModeImpl::new(impl_key))
|
|
});
|
|
}
|
|
|
|
map.insert(win_virtual_display::PRIVACY_MODE_IMPL, |impl_key: &str| {
|
|
Box::new(win_virtual_display::PrivacyModeImpl::new(impl_key))
|
|
});
|
|
}
|
|
Arc::new(Mutex::new(map))
|
|
};
|
|
}
|
|
|
|
#[inline]
|
|
pub fn init() -> Option<ResultType<()>> {
|
|
Some(PRIVACY_MODE.lock().unwrap().as_ref()?.init())
|
|
}
|
|
|
|
#[inline]
|
|
pub fn clear() -> Option<()> {
|
|
Some(PRIVACY_MODE.lock().unwrap().as_mut()?.clear())
|
|
}
|
|
|
|
#[inline]
|
|
pub fn switch(impl_key: &str) {
|
|
let mut privacy_mode_lock = PRIVACY_MODE.lock().unwrap();
|
|
if let Some(privacy_mode) = privacy_mode_lock.as_ref() {
|
|
if privacy_mode.get_impl_key() == impl_key {
|
|
return;
|
|
}
|
|
}
|
|
|
|
if let Some(creator) = PRIVACY_MODE_CREATOR.lock().unwrap().get(impl_key) {
|
|
*privacy_mode_lock = Some(creator(impl_key));
|
|
}
|
|
}
|
|
|
|
fn get_supported_impl(impl_key: &str) -> String {
|
|
let supported_impls = get_supported_privacy_mode_impl();
|
|
if supported_impls.iter().any(|(k, _)| k == &impl_key) {
|
|
return impl_key.to_owned();
|
|
};
|
|
// TODO: Is it a good idea to use fallback here? Because user do not know the fallback.
|
|
// fallback
|
|
let mut cur_impl = get_option("privacy-mode-impl-key".to_owned());
|
|
if !get_supported_privacy_mode_impl()
|
|
.iter()
|
|
.any(|(k, _)| k == &cur_impl)
|
|
{
|
|
// fallback
|
|
cur_impl = DEFAULT_PRIVACY_MODE_IMPL.to_owned();
|
|
}
|
|
cur_impl
|
|
}
|
|
|
|
pub async fn turn_on_privacy(impl_key: &str, conn_id: i32) -> Option<ResultType<bool>> {
|
|
if is_async_privacy_mode() {
|
|
turn_on_privacy_async(impl_key.to_string(), conn_id).await
|
|
} else {
|
|
turn_on_privacy_sync(impl_key, conn_id)
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
fn is_async_privacy_mode() -> bool {
|
|
PRIVACY_MODE
|
|
.lock()
|
|
.unwrap()
|
|
.as_ref()
|
|
.map_or(false, |m| m.is_async_privacy_mode())
|
|
}
|
|
|
|
#[inline]
|
|
async fn turn_on_privacy_async(impl_key: String, conn_id: i32) -> Option<ResultType<bool>> {
|
|
let (tx, rx) = oneshot::channel();
|
|
std::thread::spawn(move || {
|
|
let res = turn_on_privacy_sync(&impl_key, conn_id);
|
|
let _ = tx.send(res);
|
|
});
|
|
// Wait at most 7.5 seconds for the result.
|
|
// Because it may take a long time to turn on the privacy mode with amyuni idd.
|
|
// Some laptops may take time to plug in a virtual display.
|
|
match hbb_common::timeout(7500, rx).await {
|
|
Ok(res) => match res {
|
|
Ok(res) => res,
|
|
Err(e) => Some(Err(anyhow!(e.to_string()))),
|
|
},
|
|
Err(e) => Some(Err(anyhow!(e.to_string()))),
|
|
}
|
|
}
|
|
|
|
fn turn_on_privacy_sync(impl_key: &str, conn_id: i32) -> Option<ResultType<bool>> {
|
|
// Check if privacy mode is already on or occupied by another one
|
|
let mut privacy_mode_lock = PRIVACY_MODE.lock().unwrap();
|
|
|
|
// Check or switch privacy mode implementation
|
|
let impl_key = get_supported_impl(impl_key);
|
|
|
|
let mut cur_impl_key = "".to_string();
|
|
if let Some(privacy_mode) = privacy_mode_lock.as_ref() {
|
|
cur_impl_key = privacy_mode.get_impl_key().to_string();
|
|
let check_on_conn_id = privacy_mode.check_on_conn_id(conn_id);
|
|
match check_on_conn_id.as_ref() {
|
|
Ok(true) => {
|
|
if cur_impl_key == impl_key {
|
|
// Same peer, same implementation.
|
|
return Some(Ok(true));
|
|
} else {
|
|
// Same peer, switch to new implementation.
|
|
}
|
|
}
|
|
Err(_) => return Some(check_on_conn_id),
|
|
_ => {}
|
|
}
|
|
}
|
|
|
|
if cur_impl_key != impl_key {
|
|
if let Some(creator) = PRIVACY_MODE_CREATOR
|
|
.lock()
|
|
.unwrap()
|
|
.get(&(&impl_key as &str))
|
|
{
|
|
if let Some(privacy_mode) = privacy_mode_lock.as_mut() {
|
|
privacy_mode.clear();
|
|
}
|
|
|
|
*privacy_mode_lock = Some(creator(&impl_key));
|
|
} else {
|
|
return Some(Err(anyhow!("Unsupported privacy mode: {}", impl_key)));
|
|
}
|
|
}
|
|
|
|
// turn on privacy mode
|
|
Some(privacy_mode_lock.as_mut()?.turn_on_privacy(conn_id))
|
|
}
|
|
|
|
#[inline]
|
|
pub fn turn_off_privacy(conn_id: i32, state: Option<PrivacyModeState>) -> Option<ResultType<()>> {
|
|
Some(
|
|
PRIVACY_MODE
|
|
.lock()
|
|
.unwrap()
|
|
.as_mut()?
|
|
.turn_off_privacy(conn_id, state),
|
|
)
|
|
}
|
|
|
|
#[inline]
|
|
pub fn check_on_conn_id(conn_id: i32) -> Option<ResultType<bool>> {
|
|
Some(
|
|
PRIVACY_MODE
|
|
.lock()
|
|
.unwrap()
|
|
.as_ref()?
|
|
.check_on_conn_id(conn_id),
|
|
)
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
#[tokio::main(flavor = "current_thread")]
|
|
async fn set_privacy_mode_state(
|
|
conn_id: i32,
|
|
state: PrivacyModeState,
|
|
impl_key: String,
|
|
ms_timeout: u64,
|
|
) -> ResultType<()> {
|
|
let mut c = connect(ms_timeout, "_cm").await?;
|
|
c.send(&Data::PrivacyModeState((conn_id, state, impl_key)))
|
|
.await
|
|
}
|
|
|
|
pub fn get_supported_privacy_mode_impl() -> Vec<(&'static str, &'static str)> {
|
|
#[cfg(target_os = "windows")]
|
|
{
|
|
let mut vec_impls = Vec::new();
|
|
|
|
if win_exclude_from_capture::is_supported() {
|
|
vec_impls.push((
|
|
PRIVACY_MODE_IMPL_WIN_EXCLUDE_FROM_CAPTURE,
|
|
"privacy_mode_impl_mag_tip",
|
|
));
|
|
} else {
|
|
if display_service::is_privacy_mode_mag_supported() {
|
|
vec_impls.push((PRIVACY_MODE_IMPL_WIN_MAG, "privacy_mode_impl_mag_tip"));
|
|
}
|
|
}
|
|
|
|
if is_installed() && crate::platform::windows::is_self_service_running() {
|
|
vec_impls.push((
|
|
PRIVACY_MODE_IMPL_WIN_VIRTUAL_DISPLAY,
|
|
"privacy_mode_impl_virtual_display_tip",
|
|
));
|
|
}
|
|
|
|
vec_impls
|
|
}
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
// No translation is intended for privacy_mode_impl_macos_tip as it is a
|
|
// placeholder for macOS specific privacy mode implementation which currently
|
|
// doesn't provide multiple modes like Windows does.
|
|
vec![(macos::PRIVACY_MODE_IMPL, "privacy_mode_impl_macos_tip")]
|
|
}
|
|
#[cfg(not(any(target_os = "windows", target_os = "macos")))]
|
|
{
|
|
Vec::new()
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn get_cur_impl_key() -> Option<String> {
|
|
PRIVACY_MODE
|
|
.lock()
|
|
.unwrap()
|
|
.as_ref()
|
|
.map(|pm| pm.get_impl_key().to_owned())
|
|
}
|
|
|
|
#[inline]
|
|
pub fn is_current_privacy_mode_impl(impl_key: &str) -> bool {
|
|
PRIVACY_MODE
|
|
.lock()
|
|
.unwrap()
|
|
.as_ref()
|
|
.map(|pm| pm.get_impl_key() == impl_key)
|
|
.unwrap_or(false)
|
|
}
|
|
|
|
#[inline]
|
|
#[cfg(not(windows))]
|
|
pub fn check_privacy_mode_err(
|
|
_privacy_mode_id: i32,
|
|
_display_idx: usize,
|
|
_timeout_millis: u64,
|
|
) -> String {
|
|
"".to_owned()
|
|
}
|
|
|
|
#[inline]
|
|
#[cfg(windows)]
|
|
pub fn check_privacy_mode_err(
|
|
privacy_mode_id: i32,
|
|
display_idx: usize,
|
|
timeout_millis: u64,
|
|
) -> String {
|
|
// win magnifier implementation requires a test of creating a capturer.
|
|
if is_current_privacy_mode_impl(PRIVACY_MODE_IMPL_WIN_MAG) {
|
|
crate::video_service::test_create_capturer(privacy_mode_id, display_idx, timeout_millis)
|
|
} else {
|
|
"".to_owned()
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn is_privacy_mode_supported() -> bool {
|
|
!DEFAULT_PRIVACY_MODE_IMPL.is_empty()
|
|
}
|
|
|
|
#[inline]
|
|
pub fn get_privacy_mode_conn_id() -> Option<i32> {
|
|
PRIVACY_MODE
|
|
.lock()
|
|
.unwrap()
|
|
.as_ref()
|
|
.map(|pm| pm.pre_conn_id())
|
|
}
|
|
|
|
#[inline]
|
|
pub fn is_in_privacy_mode() -> bool {
|
|
PRIVACY_MODE
|
|
.lock()
|
|
.unwrap()
|
|
.as_ref()
|
|
.map(|pm| pm.pre_conn_id() != INVALID_PRIVACY_MODE_CONN_ID)
|
|
.unwrap_or(false)
|
|
}
|