mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
* feat(host): KDE Wayland 被控端防窥模式(隐私 / 关屏) viewer RPC 7 打开防窥时,采集和输入切到 KWin 虚拟输出(portal ScreenCast VIRTUAL), 再用 kscreen-doctor 禁用物理屏;隐私模式随后重新启用物理屏并全屏覆盖桌面壁纸。 防窥期间通过 KWin InputDevice 禁用本地键鼠,指针/按键/文字改走 uinput (KDE 不处理虚拟输出共享上的 portal 输入)。 - privacy_type 实测:1 关闭、2 隐私(壁纸)、3 关屏;SettingMetric 4/7 上报真实状态 - 恢复记录 + privacy-guard 子进程:主机以任何方式结束(含 SIGKILL)都恢复屏幕和输入 - src/privacy_screen/ 分层:控制器/协议/记录/守护/遮挡窗口共享,桌面实现走 Backend trait(kde/) - portal:Session::set_virtual,闭包恢复按当前源重开;编码器随 portal 尺寸变化重建 Refs #140 * fix(privacy): 按 Mac 客户端协议应答防窥请求,修复授权竞态 - FeatureFlag ff_private_screen=2(ENHANCED_PRIVACY),声明支持关屏 - 先回 RPC 7 应答再切换,避免客户端超时报 9998;切换失败发 ReportError -7 - 应答 RPC 25 update_screen_saver_req(RpcResponse 21),隐私模式不再被中止 - SettingMetric 4/7 上报开关与最近一次模式(host_settings.json privacy_type),状态变化推送 SystemStateChange 5 - portal 会话串行打开,打开失败回填一次性授权:快速重连时防窥切换与闭包恢复并发曾清空保存的授权 字段号与枚举取自官方 Mac 客户端的 SwiftProtobuf name map。 已知限制:Mac 客户端防窥菜单切换后仍显示"不启用",实际模式正确。 Refs #140 * fix(privacy): 处理 #146 评审意见 - 预检 uinput:injector 未打开 uinput(/dev/uinput 不可用或 UU_INPUT_BACKEND=native)时, 在改动输出和设备之前拒绝防窥(虚拟输出共享上 KDE 忽略 portal 输入) - leave() 中输入设备恢复失败在恢复输出后向上返回,保留 privacy-power.json 与 guard - record::ownership() 只缓存成功持锁,guard 轮询和 recover() 可重试 - 遮挡窗口就绪握手:privacy-wallpaper 建好窗口后输出 ready,5 秒内未就绪则报错并回滚 - rebase 到 main(#145):DMA-BUF 打开路径跳过虚拟输出、失败同样回填授权; #145 的 uinput 指针路径也按隐私模式的虚拟输出区域换算坐标 - README 表格压缩为一句,细节在 docs/privacy-screen.md Refs #140 * docs(privacy): 注明 ff_system_metrics=3 对应的枚举 Refs #140 * fix(privacy): resolve lifecycle and restoration review findings
62 lines
3.2 KiB
Rust
62 lines
3.2 KiB
Rust
//! Recovery record beside the config (`privacy-power.json`, 0600) and the process lock.
|
|
use super::Mode;
|
|
|
|
/// What a backend changed, so the guard or the next start can undo it after a crash.
|
|
/// `data` belongs to the backend named in `backend`.
|
|
#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
|
|
pub struct Record { pub backend: String, pub mode: Mode, pub data: serde_json::Value }
|
|
|
|
pub fn path() -> std::path::PathBuf { crate::config::path().with_file_name("privacy-power.json") }
|
|
pub fn pending() -> bool { path().exists() }
|
|
|
|
/// One process controls the outputs of a config directory (host, probe, guard). Only success is
|
|
/// kept: a lock still held by a dying host must be retried (the guard polls this).
|
|
pub fn ownership() -> Result<(), String> {
|
|
use std::os::{fd::AsRawFd, unix::fs::OpenOptionsExt};
|
|
static LOCK: std::sync::Mutex<Option<std::fs::File>> = std::sync::Mutex::new(None);
|
|
let mut held = LOCK.lock().map_err(|_| "privacy lock state poisoned")?;
|
|
if held.is_some() { return Ok(()); }
|
|
let path = path().with_extension("lock");
|
|
std::fs::create_dir_all(path.parent().ok_or("missing config directory")?).map_err(|e| e.kind().to_string())?;
|
|
let file = std::fs::OpenOptions::new().read(true).write(true).create(true).mode(0o600)
|
|
.open(path).map_err(|e| e.kind().to_string())?;
|
|
if unsafe { libc::flock(file.as_raw_fd(), libc::LOCK_EX | libc::LOCK_NB) } != 0 {
|
|
return Err("output control is owned by another process".into());
|
|
}
|
|
*held = Some(file);
|
|
Ok(())
|
|
}
|
|
|
|
pub fn load() -> Option<Record> { serde_json::from_slice(&std::fs::read(path()).ok()?).ok() }
|
|
fn store(record: &Record) -> Result<(), String> {
|
|
use std::{io::Write, os::unix::fs::OpenOptionsExt};
|
|
let path = path();
|
|
std::fs::create_dir_all(path.parent().ok_or("missing config directory")?).map_err(|e| e.kind().to_string())?;
|
|
let tmp = path.with_extension("tmp");
|
|
let mut file = std::fs::OpenOptions::new().write(true).create(true).truncate(true).mode(0o600)
|
|
.open(&tmp).map_err(|e| e.kind().to_string())?;
|
|
file.write_all(&serde_json::to_vec(record).map_err(|_| "invalid saved state")?).map_err(|e| e.kind().to_string())?;
|
|
file.sync_all().map_err(|e| e.kind().to_string())?;
|
|
std::fs::rename(tmp, path).map_err(|e| e.kind().to_string())
|
|
}
|
|
pub fn remove() -> Result<(), String> {
|
|
std::fs::remove_file(path()).or_else(|e| if e.kind() == std::io::ErrorKind::NotFound { Ok(()) } else { Err(e) })
|
|
.map_err(|e| format!("remove recovery record: {}", e.kind()))
|
|
}
|
|
|
|
/// Handed to `Backend::enter`: save what undoes a step before making it.
|
|
pub struct Journal { record: Record, saved: bool }
|
|
impl Journal {
|
|
pub fn new(backend: &str, mode: Mode) -> Self {
|
|
Self { record: Record { backend: backend.into(), mode, data: serde_json::Value::Null }, saved: false }
|
|
}
|
|
pub fn save<T: serde::Serialize>(&mut self, data: &T) -> Result<(), String> {
|
|
self.record.data = serde_json::to_value(data).map_err(|_| "invalid saved state")?;
|
|
store(&self.record)?;
|
|
self.saved = true;
|
|
Ok(())
|
|
}
|
|
/// The last saved record; None when the backend changed nothing.
|
|
pub fn into_record(self) -> Option<Record> { self.saved.then_some(self.record) }
|
|
}
|