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
75 lines
3.7 KiB
Rust
75 lines
3.7 KiB
Rust
//! Official protobuf maps: RpcRequest 7 {1 enable, 2 privacy_type, 3 setting_source};
|
|
//! RpcResponse 3 {1 error_code, 2 req_privacy_type, 3 cur_privacy_type}. Types: see `Mode`.
|
|
//! Field numbers and enums verified against the Mac UURemote SwiftProtobuf name maps.
|
|
use super::Mode;
|
|
|
|
pub struct Request { pub enable: bool, pub mode: Option<Mode>, requested: u64 }
|
|
|
|
pub fn parse(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Request)> {
|
|
use crate::protocol::{decode_wire, WireValue};
|
|
let body = |n| rpc.iter().find_map(|f| match &f.value { WireValue::Bytes(b) if f.number == n => Some(*b), _ => None });
|
|
let header = body(1)?.to_vec();
|
|
let req = decode_wire(body(7)?).ok()?;
|
|
let value = |n| req.iter().find_map(|f| match f.value { WireValue::Varint(v) if f.number == n => Some(v), _ => None }).unwrap_or(0);
|
|
log::info!("Privacy request: enable_value={} requested_type={} source={}", value(1), value(2), value(3));
|
|
Some((header, Request { enable: value(1) != 0, mode: Mode::from_type(value(2)), requested: value(2) }))
|
|
}
|
|
|
|
/// RpcResponse with the request's header, error_code 1 on failure, and the type now in effect.
|
|
pub fn response(header: &[u8], request: &Request, failed: bool, current: u8) -> Vec<u8> {
|
|
let mut payload = Vec::new();
|
|
if failed { payload.extend([8, 1]); }
|
|
if request.requested != 0 { payload.push(16); varint(request.requested, &mut payload); }
|
|
payload.extend([24, current]);
|
|
let mut out = vec![10];
|
|
varint(header.len() as u64, &mut out);
|
|
out.extend(header);
|
|
out.push(26);
|
|
varint(payload.len() as u64, &mut out);
|
|
out.extend(payload);
|
|
out
|
|
}
|
|
/// RpcRequest 25 update_screen_saver_req → RpcResponse 21 update_screen_saver_rsp (Mac UURemote
|
|
/// name maps). The viewer sends it before enabling picture mode (notifyScreensaverUpdate) and aborts
|
|
/// with error 9998 when it times out. The picture itself is the host's: answer an empty (success) one.
|
|
pub fn screensaver_response(rpc: &[crate::protocol::WireField]) -> Option<Vec<u8>> {
|
|
use crate::protocol::WireValue;
|
|
if !rpc.iter().any(|f| f.number == 25) { return None; }
|
|
let header = rpc.iter().find_map(|f| match &f.value { WireValue::Bytes(b) if f.number == 1 => Some(*b), _ => None })?;
|
|
let mut out = vec![10];
|
|
varint(header.len() as u64, &mut out);
|
|
out.extend(header);
|
|
out.extend([0xaa, 1, 0]); // field 21, length-delimited, empty
|
|
log::info!("Privacy screensaver update answered");
|
|
Some(out)
|
|
}
|
|
/// SystemStateChange { 5 PrivateScreenState { 1 error_code, 2 req_privacy_type, 3 cur_privacy_type } }
|
|
/// (field numbers from the Mac UURemote name map); the host pushes it when the state changes.
|
|
pub fn state_change(current: u8) -> Vec<u8> {
|
|
let state = [16, current, 24, current];
|
|
let mut out = vec![42, state.len() as u8];
|
|
out.extend(state);
|
|
out
|
|
}
|
|
fn varint(mut n: u64, out: &mut Vec<u8>) {
|
|
while n >= 128 { out.push((n as u8 & 127) | 128); n >>= 7; }
|
|
out.push(n as u8);
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
#[test]
|
|
fn parses_request_and_echoes_header() {
|
|
let bytes = [10, 2, 8, 42, 58, 4, 8, 1, 16, 3];
|
|
let (header, request) = parse(&crate::protocol::decode_wire(&bytes).unwrap()).unwrap();
|
|
assert!(request.enable);
|
|
assert_eq!(request.mode, Some(Mode::ScreenOff));
|
|
assert_eq!(response(&header, &request, true, 1), [10, 2, 8, 42, 26, 6, 8, 1, 16, 3, 24, 1]);
|
|
assert_eq!(response(&header, &request, false, 3), [10, 2, 8, 42, 26, 4, 16, 3, 24, 3]);
|
|
assert_eq!(state_change(2), [42, 4, 16, 2, 24, 2]);
|
|
let saver = crate::protocol::decode_wire(&[10, 2, 8, 7, 0xca, 1, 0]).unwrap();
|
|
assert_eq!(screensaver_response(&saver).unwrap(), [10, 2, 8, 7, 0xaa, 1, 0]);
|
|
}
|
|
}
|