mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 08:50:40 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
73c503a244 | ||
|
|
3bce605eaa | ||
|
|
ebdd362452 | ||
|
|
26811018e0 | ||
|
|
c3959c01e9 | ||
|
|
ef14f76422 | ||
|
|
480819e369 | ||
|
|
f4f16aafe4 |
No files matched your search
Generated
+1
-1
@@ -2772,7 +2772,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "uu-remote-linux"
|
||||
version = "0.2.43"
|
||||
version = "0.2.47"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"async-trait",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "uu-remote-linux"
|
||||
version = "0.2.43"
|
||||
version = "0.2.47"
|
||||
edition = "2021"
|
||||
default-run = "uuremote-server"
|
||||
authors = ["uu-remote-linux contributors"]
|
||||
|
||||
+10
-1
@@ -25,6 +25,12 @@
|
||||
|
||||
## Appearance / 外观
|
||||
|
||||
Signed-in graphical hosts report the system wallpaper for disconnected device cards in official clients
|
||||
(no desktop-window screenshot). GNOME/Cinnamon, KDE and Xfce are supported; checks run every 60 seconds
|
||||
and unchanged content is not uploaded again. Other desktops can set `UU_WALLPAPER=/absolute/path/image.png`
|
||||
(PNG/JPEG/WebP). Set `UU_WALLPAPER_UPLOAD=0` to disable; guest and headless hosts skip reporting.
|
||||
See [protocol evidence and limitations](docs/wallpaper-protocol.md).
|
||||
|
||||
Choose **System / Light / Dark** (default: System) in the viewer's **Settings → General → Appearance**, or via the gear settings button in host / tool windows.
|
||||
The choice is saved to `$XDG_CONFIG_HOME/uuremote/theme` (default `~/.config/uuremote/theme`).
|
||||
|
||||
@@ -151,7 +157,7 @@ On niri, `niri msg --json outputs` enumerates enabled monitors. Normal and 90/18
|
||||
| True color (4:4:4) | Supported (v0.1.15): the default FFmpeg pipeline with NVENC / libx264 encodes H.264 High 4:4:4; `inproc-av` native NVENC encodes H.264 High 4:4:4 / HEVC FRExt; VAAPI stays 4:2:0 and reports that to the client |
|
||||
| HDR | Not implemented |
|
||||
| Super screen / virtual display | Not implemented |
|
||||
| Privacy screen on the host | Experimental, KDE Plasma Wayland (portal) only; see [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||
| Privacy screen on the host | Experimental, KDE Plasma Wayland (portal) only; off, picture and screen-off status labels verified with Mac 4.43.0; see [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||
| Microphone (viewer audio played on the host) | Not implemented (needs a virtual sound card) |
|
||||
| Plugins such as the WoW queue notifier | Not supported; the client is told that no plugins exist |
|
||||
| Linux login screen | The system login screen (before anyone logs in to the Linux desktop) cannot be controlled yet; use headless mode or a virtual desktop (see below). This is about the Linux login: **without a UU account** the host can now be used through remote assistance |
|
||||
@@ -458,6 +464,7 @@ flowchart LR
|
||||
|
||||
## Security and privacy
|
||||
|
||||
- By default, signed-in graphical hosts upload the current wallpaper image to UU's file service for device-card backgrounds. Set `UU_WALLPAPER_UPLOAD=0` to disable this upload.
|
||||
- Logs never contain keystrokes, terminal text, clipboard contents, file contents, passwords or tokens.
|
||||
- For auto unlock the password is stored in the **viewer** (the official client). The host only checks it
|
||||
once with PAM; it is never written to disk or logs.
|
||||
@@ -640,6 +647,8 @@ GNOME-to-official-Mac bidirectional clipboard synchronization is still unverifie
|
||||
- Frames are decoded at the host's native resolution and scaled to the window with linear filtering; a host resolution
|
||||
change restarts the decoder. `UU_VIEWER_SIZE=WxH` forces a fixed letterboxed canvas instead.
|
||||
|
||||
The SDL remote desktop window disables local IME text composition and forwards physical keys; use the remote host’s input method and its language toggle (for example, Shift) to enter Chinese.
|
||||
|
||||
Mac targets use native macOS keycodes; Windows / Linux targets retain Windows VK. Keys follow physical positions, without
|
||||
automatically translating Ctrl to Command; on a Mac target the PC Super / Windows key acts as Command. Only verified target
|
||||
platform values 1 (Windows / this project's Linux host) and 4 (Mac) are accepted; unknown values fail explicitly. Account
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
## 外观 / Appearance
|
||||
|
||||
已登录的图形主机会上报系统壁纸,供官方客户端的设备卡片在未连接时显示背景图(不是桌面窗口截图)。支持 GNOME/Cinnamon、KDE、Xfce;每 60 秒检查一次,内容不变则不重复上传。其他桌面可用 `UU_WALLPAPER=/绝对路径/图片.png` 指定 PNG/JPEG/WebP;`UU_WALLPAPER_UPLOAD=0` 关闭。访客和无桌面模式跳过上报。协议依据与限制见 [设备壁纸上报](docs/wallpaper-protocol.md)。
|
||||
|
||||
在控制端的 **设置 → 常规 → 外观**,或主机 / 工具窗口的齿轮设置按钮中选择 **跟随系统 / 浅色 / 深色**(默认跟随系统)。
|
||||
选择保存在 `$XDG_CONFIG_HOME/uuremote/theme`(默认 `~/.config/uuremote/theme`)。
|
||||
|
||||
@@ -136,7 +138,7 @@ niri 会话通过 `niri msg --json outputs` 枚举已启用的显示器。普通
|
||||
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;`inproc-av` 原生 NVENC 输出 H.264 High 4:4:4 / HEVC FRExt;VAAPI 管线仍为 4:2:0,并如实回报给客户端 |
|
||||
| HDR | 未实现 |
|
||||
| 超级屏 / 虚拟显示器 | 未实现 |
|
||||
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal),见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal);Mac 4.43.0 已验证不启用、隐私屏保、关闭显示屏三种状态回显,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
||||
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
||||
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
||||
@@ -402,6 +404,7 @@ flowchart LR
|
||||
|
||||
## 安全与隐私
|
||||
|
||||
- 已登录的图形主机默认会将当前壁纸图片上传到 UU 的文件服务,供设备卡片显示背景;可用 `UU_WALLPAPER_UPLOAD=0` 关闭上传。
|
||||
- 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。
|
||||
- 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。
|
||||
- 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。
|
||||
@@ -563,6 +566,8 @@ GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不
|
||||
以 CaptureSettingSync 回报为准。两种色度均由 FFmpeg 转为 RGB24 显示。
|
||||
- 按被控端原始分辨率解码,窗口缩放使用线性过滤;被控端分辨率变化时自动重启解码器。`UU_VIEWER_SIZE=WxH` 可改为固定的留黑边画布。
|
||||
|
||||
SDL 远程画面窗口关闭本地输入法的文本组合,按物理键转发;输入中文时请使用被控端的输入法及其中英切换键(例如 Shift)。
|
||||
|
||||
Mac 目标使用 macOS 原生键码,Windows / Linux 目标保留 Windows VK。键盘按物理键位置转发,不自动把 Ctrl 改成 Command;
|
||||
控制 Mac 时,PC 键盘的 Super / Win 键对应 Command。仅接受已验证的目标平台值 1(Windows / 本项目 Linux 主机)和 4(Mac),
|
||||
未知值会报错,不猜测键码。账号连接缺少平台字段时查询目标设备;远程协助必须由连接响应提供平台。只看模式不需要此识别。
|
||||
|
||||
+44
-3
@@ -63,13 +63,54 @@ is aimed at the virtual output's region. Needs GTK3.
|
||||
`{1 error_code, 2 req_privacy_type, 3 cur_privacy_type}`;PrivateScreenType 2 隐私/picture, 3 关屏/screen off。
|
||||
主机先应答再切换(客户端约数秒超时,报 9998);切换失败发 ReportError -7。
|
||||
The host answers before switching (the viewer times out with 9998); a failed switch sends ReportError -7.
|
||||
成功不发送 ReportError;Mac 4.43.0 的 -9 是系统会话变化提示,不是防窥成功通知。
|
||||
Success does not send ReportError; -9 in Mac 4.43.0 reports a system session change, not privacy success.
|
||||
- RPC 25 `update_screen_saver_req` → RpcResponse 21:开启隐私模式前发送,主机回空成功应答,画面仍用本机壁纸。
|
||||
Sent before picture mode; answered empty (success), the host keeps its own wallpaper.
|
||||
- FeatureFlag 4 `ff_private_screen` = 2 (ENHANCED_PRIVACY);SettingMetric 4 `private_screen`、7 `private_screen_type`
|
||||
(最近一次开启的模式,存于 host_settings.json `privacy_type`);SystemStateChange 5 `PrivateScreenState` 在状态变化时推送。
|
||||
上报当前实际模式(1 关闭、2 屏保、3 关屏),不使用 host_settings.json 中的历史选项;SystemStateChange 5
|
||||
`PrivateScreenState` 在状态变化时推送。
|
||||
SettingMetric 4/7 report the effective mode (1 off, 2 picture, 3 screen off), not the saved preference;
|
||||
SystemStateChange 5 is sent after a switch.
|
||||
|
||||
已知限制:官方 Mac 客户端的防窥菜单在切换后仍回显"不启用",实际模式正确;客户端未回读上述状态。
|
||||
Known limitation: the official Mac viewer's menu still shows "off" after switching although the mode applies.
|
||||
Mac 4.43.0 从 CONTROL 发送请求,但只在 TEXT 接收分支处理上述 RPC 应答与 SystemMetrics。
|
||||
防窥与屏保应答走 TEXT;SystemMetrics 同步发送到 TEXT,并保留 CONTROL 上报以兼容其他客户端。
|
||||
每个 peer 独立排队,TEXT 打开后才发送;待发 SystemMetrics 只保留最新一条,其他应答最多 64 条,
|
||||
按入队顺序发送。满队列时丢弃新增应答并记录一次警告,不阻塞 CONTROL 请求处理。
|
||||
SystemMetrics 优先读取非零的 field 7,仅在其为 0 时回退
|
||||
到 field 4。SystemMetrics field 1 `metrics` 必须列出本次报告的类型(general=1、setting=2),
|
||||
否则客户端直接忽略消息内容。已用原签名 Mac 4.43.0 客户端验证三种模式的安全浮层回显,
|
||||
关屏后断开恢复物理屏与输入设备,再次连接回显“不启用”。
|
||||
Mac 4.43.0 sends requests on CONTROL, but handles these RPC responses and SystemMetrics only on TEXT.
|
||||
Privacy/screensaver replies use TEXT; SystemMetrics are also sent on TEXT, retaining CONTROL for other
|
||||
viewers. Each peer queues messages until its TEXT channel opens, retaining only the latest pending
|
||||
SystemMetrics and up to 64 other replies in FIFO order. Excess replies are dropped with one warning
|
||||
per peer, without blocking CONTROL request handling. Nonzero field 7 takes precedence over
|
||||
field 4. SystemMetrics field 1 `metrics` must list the reported sections (general=1, setting=2), or the
|
||||
viewer ignores the payload. The original signed Mac 4.43.0 viewer was verified for all three labels,
|
||||
physical-screen/input restoration on disconnect, and an off label after reconnecting.
|
||||
|
||||
官方主机侧依据:原签名 Mac `UURemoteServer` 4.43.0(626),arm64 UUID
|
||||
`7E10CB24-F516-3728-8375-BA5EC124A2C5`。`SystemMetricsHandler.handleSystemMetrics`(`0x10000a96c`)
|
||||
按请求填充各节,general 分支在 `0x10000abe8` 追加 `1`,setting helper(`0x10000a230`)
|
||||
在 `0x10000a64c` 追加 `2`;`GvPb_SystemMetrics.traverse`(`0x100423840`)将列表按 packed enum
|
||||
写入 field 1。发送链 `0x10000b11c → 0x10018e948 → ControlledSendTextData:data:` 使用 TEXT。
|
||||
这是静态主机代码依据:请求 general 和 setting 时得到 `[1,2]`,不是抓包,也不表示每条响应都固定
|
||||
包含两节或证明官方 CONTROL 报文。本实现总是报告两节,因此列出 `[1,2]`。
|
||||
Official host evidence: the original signed Mac `UURemoteServer` 4.43.0 (626), arm64 UUID
|
||||
`7E10CB24-F516-3728-8375-BA5EC124A2C5`. `SystemMetricsHandler.handleSystemMetrics` (`0x10000a96c`)
|
||||
fills the requested sections, appending GENERAL=1 at `0x10000abe8` and SETTING=2 at `0x10000a64c`
|
||||
in helper `0x10000a230`. `GvPb_SystemMetrics.traverse` (`0x100423840`) encodes that list as packed
|
||||
field 1. The send chain `0x10000b11c → 0x10018e948 → ControlledSendTextData:data:` uses TEXT.
|
||||
This is static host-code evidence: requesting both sections produces `[1,2]`; it is not a packet
|
||||
capture or proof that every response includes both sections or that the official host sends it on
|
||||
CONTROL. Our payload always reports both sections, so it lists `[1,2]`.
|
||||
|
||||
Android 4.43.0 已确认打开 TEXT;主机日志和手机端人工验收确认,关屏、隐私屏保、取消三种操作的
|
||||
实际模式与菜单选中状态均正确。Windows/iOS 未在本轮验收。
|
||||
Android 4.43.0 opens TEXT; host logs and manual phone-side acceptance confirmed that screen-off,
|
||||
picture and off operations update both the effective mode and the selected menu item.
|
||||
Windows/iOS were not tested in this round.
|
||||
|
||||
## 本机诊断 / Local diagnostic
|
||||
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
Mac 控制端防窥菜单正确显示当前模式。/ The Mac viewer privacy menu now shows the active mode.
|
||||
|
||||
### 修复 / Fixed
|
||||
- **Mac 控制端防窥状态回显(#147、#148,感谢 @ferstar)**:防窥切换应答与 SystemMetrics 改经 TEXT 通道发送(TEXT 打开前排队,metrics 只保留最新一份),SystemMetrics 带上报告的分节列表并报告当前防窥模式,修复 v0.2.43 中菜单切换后仍显示“不启用”的问题。
|
||||
Privacy replies and SystemMetrics are now also delivered over the TEXT channel (queued until it opens, keeping only the latest metrics); SystemMetrics lists its reported sections and the current privacy mode, so the Mac viewer menu no longer shows "off" after switching.
|
||||
|
||||
### 验证范围 / Validation
|
||||
单元测试与 CI。贡献者在 KDE Wayland + Mac 控制端实机验证;维护者尚未用 Windows/iOS/Android 控制端复测。
|
||||
|
||||
### 下载 / Download
|
||||
`uu-remote-linux_0.2.44_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.44-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.44`(x86_64)。
|
||||
|
||||
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||
@@ -0,0 +1,13 @@
|
||||
控制端远程窗口不再被本地输入法截获按键。/ The viewer's remote window no longer lets the local IME swallow keys.
|
||||
|
||||
### 修复 / Fixed
|
||||
- **控制端本地输入法截获按键(#149、#150,感谢 @xfjm136)**:SDL 远程桌面窗口创建后关闭本地文本输入,按键只按物理键转发,由被控端输入法处理;修复本地与远端都用 Shift 切换中英文时,Shift 等按键被本地输入法吞掉的问题。不修改系统输入法设置,GTK 启动器不受影响。
|
||||
The SDL remote desktop window now disables local text input after creation, so keys are forwarded as physical keys and the remote IME handles composition; Shift and similar keys are no longer swallowed by the local IME. System IME settings and the GTK launcher are unchanged.
|
||||
|
||||
### 验证范围 / Validation
|
||||
单元测试(含 SDL dummy 子进程测试)与 CI。贡献者在 KDE Wayland + Fcitx5 连接 Windows 实机验证;其他桌面/输入法后端未复测。
|
||||
|
||||
### 下载 / Download
|
||||
`uu-remote-linux_0.2.45_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.45-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.45`(x86_64)。
|
||||
|
||||
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||
@@ -0,0 +1,13 @@
|
||||
Linux 复制的文本可直接粘贴到 Windows 控制端。/ Text copied on Linux now pastes in the Windows viewer.
|
||||
|
||||
### 修复 / Fixed
|
||||
- **Linux → Windows 文本剪贴板无法粘贴(#151,感谢 @afwer1231 的定位)**:主机提供 Unicode 文本格式时,格式名改用官方 Windows 端的 `predefined_13`(id 仍为 13)。此前的 `CF_UNICODETEXT` 名字会让 Windows 控制端注册一个同名的自定义格式,文本虽已到达但普通粘贴读不到。Mac 控制端按 id 13 识别,不受影响。
|
||||
The host now names its Unicode text offer `predefined_13` (id 13), as official Windows peers do. The previous `CF_UNICODETEXT` name made the Windows viewer register a custom format of that name, so the text arrived but normal paste could not read it. The Mac viewer matches by id 13 and is unaffected.
|
||||
|
||||
### 验证范围 / Validation
|
||||
单元测试与 CI;格式名依据官方 Windows/Mac 程序中的字符串对照(推断)。尚未在 Windows 控制端实机验证。
|
||||
|
||||
### 下载 / Download
|
||||
`uu-remote-linux_0.2.46_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.46-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.46`(x86_64)。
|
||||
|
||||
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||
@@ -0,0 +1,17 @@
|
||||
官方客户端的设备卡片在未连接时也能显示 Linux 主机的壁纸。/ Device cards in official clients now show the Linux host's wallpaper while disconnected.
|
||||
|
||||
### 新增 / Added
|
||||
- **上报系统壁纸(#152/#153,感谢 @ferstar)**:已登录的图形主机按官方 Windows 被控端的流程获取文件令牌、上传当前壁纸并回报地址,每 60 秒检查一次,内容不变不重复上传。支持 GNOME/Cinnamon、KDE(Plasma 5/6,含壁纸包和主题默认壁纸)、Xfce;其他桌面可用 `UU_WALLPAPER=/绝对路径/图片` 指定(PNG/JPEG/WebP)。访客与无桌面模式不上报。
|
||||
Signed-in graphical hosts fetch a file token, upload the current wallpaper and report its URL, following the official Windows host. Checks run every 60 seconds; unchanged content is not re-uploaded. Supports GNOME/Cinnamon, KDE (Plasma 5/6, including wallpaper packages and theme defaults) and Xfce; other desktops can set `UU_WALLPAPER=/absolute/path/image`. Guest and headless hosts skip it.
|
||||
|
||||
### 隐私 / Privacy
|
||||
默认会把当前壁纸图片上传到 UU 的文件服务;设置 `UU_WALLPAPER_UPLOAD=0` 可关闭。日志只记录结果和失败阶段。
|
||||
By default the current wallpaper image is uploaded to UU's file service; set `UU_WALLPAPER_UPLOAD=0` to disable. Logs record only the outcome and failing stage.
|
||||
|
||||
### 验证范围 / Validation
|
||||
单元测试与 CI;贡献者在 KDE 上实机确认官方客户端显示壁纸。GNOME/Cinnamon、Xfce 尚无实机验收;多屏、动态/XML 壁纸不在本次范围。
|
||||
|
||||
### 下载 / Download
|
||||
`uu-remote-linux_0.2.47_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.47-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.47`(x86_64)。
|
||||
|
||||
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||
@@ -0,0 +1,43 @@
|
||||
# Device-card wallpaper reporting
|
||||
|
||||
The official Windows host publishes the system wallpaper for device cards. This is separate from
|
||||
the Linux viewer's local last-frame cache and does not require capturing desktop windows on disconnect.
|
||||
|
||||
## Static protocol evidence
|
||||
|
||||
Read-only analysis of the locally installed `GameViewerServer.exe` (SHA-256
|
||||
`af3a15c3887e06bfa9506971e01cd8ec58f41efe8ac9eb5831e31dae1fc1cef8`) found:
|
||||
|
||||
- `ApplicationManager::updateWallpaper`, `getWallpaperPath`, `uploadWallpaper`, and log strings
|
||||
`wallpaper check`, `wallpaper is not changed, the same md5`, `wallpaper file upload succeeded`.
|
||||
The source path recorded in the executable is `server_core/business/apps/application_manager.cpp`.
|
||||
- `0x140ade430`: GET `/api/v1/tool/fp/token?filetype=1`. Response parser `0x140ae3410`
|
||||
reads `token`, `req_url`, `ttl`, optional `max_size` from API data.
|
||||
- `0x140aeb8c0`: POST raw file bytes to `req_url`, with `Authorization` set directly to the
|
||||
file token (no Bearer prefix, multipart wrapper, or account credentials).
|
||||
- Upload callback `0x140ad1010` requires HTTP 200; parser `0x140ae1550` reads top-level
|
||||
`fsize`, `url`, `md5`, `mime`. The wallpaper callback `0x1404206c0` uses `url`.
|
||||
- `0x140b48d80`: POST `/api/v1/device/wallpaper`, JSON `{"wallpaper_url":"<uploaded URL>"}`.
|
||||
Device response parsers and the official viewer also contain `wallpaper_url`.
|
||||
|
||||
Addresses are preferred virtual addresses for that executable only. No official binary, assets,
|
||||
account data, upload tokens, desktop pictures, or account URLs are included here.
|
||||
This establishes the wallpaper flow statically; it does not prove that every official client's
|
||||
last-frame display uses this flow or establish the official timer interval.
|
||||
|
||||
## Linux behavior
|
||||
|
||||
Signed-in graphical hosts check the configured wallpaper on startup and every 60 seconds, upload
|
||||
only changed supported image bytes, and retry failures on a later check. Guest and headless hosts skip
|
||||
reporting. Account renewal replaces the reporting task; stopping the host cancels it. Network work
|
||||
does not block signaling or alter peer connections. Images are bounded to 10 MiB and the file service's
|
||||
advertised limit. HTTPS is required and upload redirects are disabled.
|
||||
|
||||
GNOME/Unity/Cinnamon use GSettings (GNOME dark preference included); KDE reads the first image
|
||||
wallpaper containment, including image packages, or the installed look-and-feel's default wallpaper
|
||||
when no explicit wallpaper is configured; Xfce reads the first `last-image`. Multi-monitor selection, slideshow/XML
|
||||
wallpapers, compositor-specific wallpaper daemons, and unsupported formats are not inferred.
|
||||
`UU_WALLPAPER=/absolute/path/image.png` selects a file explicitly; `UU_WALLPAPER_UPLOAD=0` disables
|
||||
reporting. PNG, JPEG, and WebP are supported. No desktop screenshot fallback is used.
|
||||
|
||||
Only success/failure is logged. Paths, hashes, URLs, response bodies and credentials stay out of logs.
|
||||
+10
-2
@@ -17,6 +17,9 @@ impl TextFormat {
|
||||
}
|
||||
fn id(self)->u64{match self{Self::Windows=>UNICODE_TEXT,Self::Mac=>0}}
|
||||
fn name(self)->&'static str{match self{Self::Windows=>"CF_UNICODETEXT",Self::Mac=>MAC_TEXT}}
|
||||
/// Name in a format-list offer. Official Windows peers name predefined formats `predefined_<id>`; a plain
|
||||
/// `CF_UNICODETEXT` makes the Windows viewer register a custom format instead of id 13 (issue #151).
|
||||
fn offer_name(self)->&'static str{match self{Self::Windows=>WINDOWS_OFFER_NAME,Self::Mac=>MAC_TEXT}}
|
||||
fn encode(self,text:&str)->Vec<u8>{match self{Self::Windows=>encode_windows(text),Self::Mac=>text.as_bytes().to_vec()}}
|
||||
fn decode(self,data:&[u8])->Result<String,&'static str>{
|
||||
match self{
|
||||
@@ -31,6 +34,7 @@ impl TextFormat {
|
||||
}
|
||||
}
|
||||
}
|
||||
const WINDOWS_OFFER_NAME:&str="predefined_13";
|
||||
const BLOCK_BYTES:usize=0x20000;
|
||||
const MAX_BYTES:usize=MAX_TEXT*2+2;
|
||||
pub struct ResultMessages {pub messages:Vec<(u32,Vec<u8>)>,pub text:Option<String>}
|
||||
@@ -96,7 +100,7 @@ impl State{
|
||||
if text.contains('\0')||encode_windows(&text).len()>MAX_BYTES{return Err("clipboard encoded text exceeds limit");}
|
||||
self.local=Some(text);
|
||||
let mut list=Vec::new();
|
||||
for kind in formats {let mut format=Vec::new();int(1,kind.id(),&mut format);string(2,kind.name(),&mut format);nested(1,&format,&mut list);}
|
||||
for kind in formats {let mut format=Vec::new();int(1,kind.id(),&mut format);string(2,kind.offer_name(),&mut format);nested(1,&format,&mut list);}
|
||||
Ok(request(id,1,&list))
|
||||
}
|
||||
pub fn request(&mut self,rpc:&[u8],next:&mut impl FnMut()->u64)->Result<ResultMessages,&'static str>{
|
||||
@@ -210,7 +214,11 @@ mod tests{
|
||||
let data=bytes(bytes(bytes(&out.messages[1].1,9).unwrap().unwrap(),3).unwrap().unwrap(),3).unwrap().unwrap();
|
||||
assert_eq!(data,b"hi");
|
||||
// Host-side offers are unchanged: CF_UNICODETEXT only.
|
||||
assert_eq!(format_ids(&State::default().offer(1,"hi".into()).unwrap()),vec![13]);
|
||||
let host_offer=State::default().offer(1,"hi".into()).unwrap();
|
||||
assert_eq!(format_ids(&host_offer),vec![13]);
|
||||
let list=bytes(bytes(&host_offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
||||
let format=bytes(list,1).unwrap().unwrap();
|
||||
assert_eq!(text_field(format,2),Ok(WINDOWS_OFFER_NAME));
|
||||
}
|
||||
#[test]
|
||||
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
||||
|
||||
@@ -79,6 +79,60 @@ fn mapping(kind: u8, payload: &[u8]) -> Vec<u8> {
|
||||
crate::initialization::envelope(1, 0, 27, &frame)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn privacy_replies_wait_for_each_peers_text_channel() {
|
||||
tokio::time::timeout(Duration::from_secs(25), async {
|
||||
let mut peers = Vec::new();
|
||||
for request_id in [41, 51] {
|
||||
let (host, mut viewer) = connect(Arc::new(InputInjector::without_desktop()), false, None,
|
||||
&["CONTROL_DATA_CHANNEL"]).await;
|
||||
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||
for (id, case, payload) in [(request_id, 25, &[][..]), (request_id + 1, 7, &[8, 1, 16, 3][..])] {
|
||||
let mut rpc = bytes(1, &[8, id]);
|
||||
rpc.extend(bytes(case, payload));
|
||||
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(1, 0, 21, &rpc)).await;
|
||||
}
|
||||
// A synthetic host rejects privacy without touching a physical desktop.
|
||||
// Echo is a dispatch barrier: both replies are queued before TEXT exists.
|
||||
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(2, 0, 3, &[8, 0])).await;
|
||||
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
|
||||
peers.push((request_id, host, viewer));
|
||||
}
|
||||
for (request_id, host, mut viewer) in peers {
|
||||
let text = viewer.pc.create_data_channel("TEXT_DATA_CHANNEL", None).await.unwrap();
|
||||
let (tx, messages) = mpsc::unbounded_channel();
|
||||
text.on_message(Box::new(move |message| {
|
||||
let _ = tx.send(("TEXT_DATA_CHANNEL".into(), message.data.to_vec()));
|
||||
Box::pin(async {})
|
||||
}));
|
||||
viewer.messages = messages;
|
||||
let mut replies = Vec::new();
|
||||
let mut metrics_seen = false;
|
||||
while replies.len() < 2 || !metrics_seen {
|
||||
let (channel, message) = tokio::time::timeout(Duration::from_secs(5), viewer.messages.recv()).await
|
||||
.expect("late TEXT delivery timed out").expect("peer stopped responding");
|
||||
assert_eq!(channel, "TEXT_DATA_CHANNEL");
|
||||
if let Some(metrics) = body(&message, 13) {
|
||||
assert_eq!(body(metrics, 1), Some([1, 2].as_slice()));
|
||||
metrics_seen = true;
|
||||
}
|
||||
if body(&message, 22).is_some() { replies.push(message); }
|
||||
}
|
||||
for ((id, case), message) in [(request_id, 21), (request_id + 1, 3)].into_iter().zip(replies) {
|
||||
let rpc = body(&message, 22).unwrap();
|
||||
assert_eq!(body(rpc, 1), Some([8, id].as_slice()));
|
||||
let response = body(rpc, case).expect("wrong RPC response case");
|
||||
if case == 3 {
|
||||
assert!(decode_wire(response).unwrap().iter().any(|f| f.number == 1 && f.value == WireValue::Varint(1)));
|
||||
}
|
||||
}
|
||||
host.pc.close().await.unwrap();
|
||||
viewer.pc.close().await.unwrap();
|
||||
viewer.router.lock().await.stop().await.unwrap();
|
||||
}
|
||||
}).await.expect("privacy TEXT routing regression exceeded deadline");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn ready_portal_control_input_is_forwarded_while_locked() {
|
||||
tokio::time::timeout(Duration::from_secs(20), async {
|
||||
|
||||
@@ -5,6 +5,7 @@ mod ws_transport;
|
||||
mod engine_plugin;
|
||||
mod doctor;
|
||||
mod wol;
|
||||
mod wallpaper;
|
||||
mod desktop_backend;
|
||||
mod desktop_mode;
|
||||
mod desktop_session;
|
||||
@@ -775,6 +776,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
||||
client
|
||||
};
|
||||
|
||||
let mut wallpaper_task = AbortOnDrop(wallpaper::start(auth.clone()));
|
||||
// One peer per viewer connection (desktop, file transfer, terminal...), keyed by ice_id.
|
||||
let mut next_capture_type: Option<(u64,crate::session_ice::SessionIce)> = None;
|
||||
let mut capture_types: HashMap<String, (u64,crate::session_ice::SessionIce)> = HashMap::new();
|
||||
@@ -812,6 +814,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
||||
log::error!("UU login is invalid or expired; a new QR login is required");
|
||||
let stale = config::read_fresh().ok().flatten().and_then(|f| f.get("token").and_then(|t| t.as_str()).map(str::to_owned));
|
||||
auth = Arc::new(UUAuthClient::new(login::wait_for_credentials(stale).await));
|
||||
wallpaper_task.0.abort();
|
||||
wallpaper_task = AbortOnDrop(wallpaper::start(auth.clone()));
|
||||
continue;
|
||||
}
|
||||
Err(e) => {
|
||||
|
||||
@@ -28,10 +28,6 @@ pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
||||
pub fn current_type() -> u8 {
|
||||
if !active() { mode::TYPE_OFF } else if PICTURE.load(Ordering::Relaxed) { Mode::Picture.wire_type() } else { Mode::ScreenOff.wire_type() }
|
||||
}
|
||||
/// The mode last enabled (kept in host_settings.json), 1 (PS_NOT_SET) before any.
|
||||
pub fn preferred_type() -> u8 {
|
||||
crate::system_actions::load_settings().privacy_type.filter(|t| matches!(t, 2 | 3)).unwrap_or(mode::TYPE_OFF)
|
||||
}
|
||||
/// Message 15 SystemStateChange { 5 PrivateScreenState } for the state now in effect.
|
||||
pub fn state_message(seq: u64, timestamp: u64) -> Vec<u8> {
|
||||
crate::initialization::envelope(seq, timestamp, 15, &protocol::state_change(current_type()))
|
||||
@@ -118,7 +114,8 @@ pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option
|
||||
let expected = if request.enable { request.mode.map_or(mode::TYPE_OFF, Mode::wire_type) } else { mode::TYPE_OFF };
|
||||
Some((protocol::response(&header, &request, false, expected), Some(Accepted { enable: request.enable, mode: request.mode })))
|
||||
}
|
||||
/// ReportError.error_code the Mac viewer treats as a privacy-screen failure (handleForReportError).
|
||||
/// Mac 4.43.0 handleForReportError: -7 resets privacy to off; -9 reports an RDP session change,
|
||||
/// not privacy success. Success is carried by RpcResponse 3 and SystemMetrics.setting 7.
|
||||
pub const REPORT_ERROR: i32 = -7;
|
||||
impl Accepted {
|
||||
pub fn apply(self) -> Result<(), String> {
|
||||
|
||||
@@ -36,7 +36,7 @@ pub(crate) struct Settings {
|
||||
/// video field cannot drop auto_lock / mute when the document is loaded.
|
||||
#[serde(default, deserialize_with = "lenient_string")] pub(crate) video_encoder: Option<String>,
|
||||
#[serde(default, deserialize_with = "lenient_string")] pub(crate) video_codec: Option<String>,
|
||||
/// Last privacy_type the viewer enabled (2 picture, 3 screen off), reported as SettingMetric 7.
|
||||
/// Last privacy_type the viewer enabled (2 picture, 3 screen off), not the current live state.
|
||||
#[serde(default)] pub(crate) privacy_type: Option<u8>,
|
||||
}
|
||||
|
||||
@@ -291,7 +291,7 @@ impl PeerActions {
|
||||
let current = state().lock().unwrap().settings.clone();
|
||||
payload_with_settings(desktop, desktop, desktop, &home, &crate::system_metrics::Settings {
|
||||
sound, keep_mute: current.keep_mute, mute_permanent: current.mute_permanent, auto_lock: current.auto_lock,
|
||||
private_screen: crate::privacy_screen::supported().then(|| (crate::privacy_screen::active(), crate::privacy_screen::preferred_type())),
|
||||
private_screen: crate::privacy_screen::supported().then(crate::privacy_screen::current_type),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
+35
-16
@@ -27,14 +27,14 @@ pub fn payload_with_location(capture: Permission, operation: Permission, control
|
||||
/// Optional host settings the viewer shows in 声音 / 安全 (SettingMetric 1 keep_mute,
|
||||
/// 2 mute_permanent, 3 auto_lock; GeneralMetric 2 system_sound_support).
|
||||
#[derive(Debug, Default, Clone, Copy)]
|
||||
pub struct Settings { pub sound: bool, pub keep_mute: bool, pub mute_permanent: bool, pub auto_lock: bool, pub private_screen: Option<(bool, u8)> }
|
||||
pub struct Settings { pub sound: bool, pub keep_mute: bool, pub mute_permanent: bool, pub auto_lock: bool, pub private_screen: Option<u8> }
|
||||
|
||||
pub fn payload_with_settings(capture: Permission, operation: Permission, control: Permission, location: &str, settings: &Settings) -> Vec<u8> {
|
||||
let mut setting = Vec::new();
|
||||
// Mac UURemote name map: SettingMetric 4 private_screen (on), 7 private_screen_type
|
||||
// (PrivateScreenType 2 normal/picture, 3 enhanced/screen off): the chosen mode, also while off.
|
||||
if let Some((on, kind)) = settings.private_screen {
|
||||
setting.extend([4 << 3, u8::from(on), 7 << 3, kind]);
|
||||
// Mac 4.43.0 callBackSystemMetrics reads field 7 first, falling back to field 4 only when 7=0.
|
||||
// Report the effective mode (1 off, 2 picture, 3 screen off), not the saved preference.
|
||||
if let Some(kind) = settings.private_screen {
|
||||
setting.extend([4 << 3, u8::from(kind != 1), 7 << 3, kind]);
|
||||
}
|
||||
for (field, on) in [(1u8, settings.keep_mute), (2, settings.mute_permanent), (3, settings.auto_lock)] {
|
||||
if on { setting.push(field << 3); setting.push(1); }
|
||||
@@ -52,7 +52,13 @@ pub fn payload_with_settings(capture: Permission, operation: Permission, control
|
||||
}
|
||||
// SystemMetrics.general: system_sound_support = SS_SUPPORT (2) when desktop audio is streamed
|
||||
// (GvPb_SystemSoundSupport: 0 unknown, 1 nonsupport, 2 support).
|
||||
let mut out = if settings.sound { vec![26, 2, 16, 2] } else { vec![26, 0] };
|
||||
// Official Mac host 4.43.0 (626), arm64: SystemMetricsHandler (0x10000a96c)
|
||||
// appends GENERAL=1 (0x10000abe8) and SETTING=2 (helper 0x10000a230, write
|
||||
// 0x10000a64c) as it fills those sections; traverse (0x100423840) packs field 1.
|
||||
// We always report both sections. The Mac viewer ignores an empty list
|
||||
// (callBackSystemMetrics, 0x1003b4584). Host evidence: docs/privacy-screen.md.
|
||||
let mut out = vec![10, 2, 1, 2];
|
||||
out.extend(if settings.sound { &[26, 2, 16, 2][..] } else { &[26, 0][..] });
|
||||
// No support_touch, sound capability, win_os_ver, private-screen, virtual
|
||||
// mouse, auto-lock, file path or optional feature claims are fabricated.
|
||||
out.push(34); // SystemMetrics.setting field 4
|
||||
@@ -86,27 +92,29 @@ mod tests {
|
||||
fn measured_allow_capabilities_use_official_enum_values() {
|
||||
let p = payload(Permission::Allow, Permission::Allow, Permission::Allow);
|
||||
let fields = decode_wire(&p).unwrap();
|
||||
assert_eq!(fields.len(), 2);
|
||||
assert_eq!(fields[0].number, 3);
|
||||
assert_eq!(fields[0].value, WireValue::Bytes(&[]));
|
||||
let WireValue::Bytes(setting) = fields[1].value else { panic!("setting not a message") };
|
||||
assert_eq!(fields[1].number, 4);
|
||||
assert_eq!(fields.len(), 3);
|
||||
assert_eq!(fields[0].number, 1);
|
||||
assert_eq!(fields[0].value, WireValue::Bytes(&[1, 2]));
|
||||
assert_eq!(fields[1].number, 3);
|
||||
assert_eq!(fields[1].value, WireValue::Bytes(&[]));
|
||||
let WireValue::Bytes(setting) = fields[2].value else { panic!("setting not a message") };
|
||||
assert_eq!(fields[2].number, 4);
|
||||
let s = decode_wire(setting).unwrap();
|
||||
assert_eq!(s.iter().map(|f| f.number).collect::<Vec<_>>(), vec![8, 9, 10]);
|
||||
assert!(s.iter().all(|f| f.value == WireValue::Varint(2)));
|
||||
}
|
||||
#[test]
|
||||
fn rejected_and_unknown_observations_are_not_promoted_to_allow() {
|
||||
assert_eq!(payload(Permission::Unknown, Permission::Unknown, Permission::Unknown), vec![26, 0, 34, 0]);
|
||||
assert_eq!(payload(Permission::Allow, Permission::Reject, Permission::Reject), vec![26, 0, 34, 6, 64, 2, 72, 1, 80, 1]);
|
||||
assert_eq!(payload(Permission::Unknown, Permission::Unknown, Permission::Unknown), vec![10, 2, 1, 2, 26, 0, 34, 0]);
|
||||
assert_eq!(payload(Permission::Allow, Permission::Reject, Permission::Reject), vec![10, 2, 1, 2, 26, 0, 34, 6, 64, 2, 72, 1, 80, 1]);
|
||||
}
|
||||
#[test]
|
||||
fn emits_no_audio_touch_windows_or_auto_unlock_capability() {
|
||||
let p = payload(Permission::Allow, Permission::Allow, Permission::Allow);
|
||||
let fields = decode_wire(&p).unwrap();
|
||||
let WireValue::Bytes(general) = fields[0].value else { panic!() };
|
||||
let WireValue::Bytes(general) = fields[1].value else { panic!() };
|
||||
assert!(general.is_empty());
|
||||
let WireValue::Bytes(setting) = fields[1].value else { panic!() };
|
||||
let WireValue::Bytes(setting) = fields[2].value else { panic!() };
|
||||
assert!(decode_wire(setting).unwrap().iter().all(|f| (8..=10).contains(&f.number)));
|
||||
}
|
||||
#[test]
|
||||
@@ -114,10 +122,21 @@ mod tests {
|
||||
let home = "/home/user/".repeat(12);
|
||||
let p = payload_with_location(Permission::Allow, Permission::Allow, Permission::Allow, &home);
|
||||
let fields = decode_wire(&p).unwrap();
|
||||
let WireValue::Bytes(setting) = fields[1].value else { panic!() };
|
||||
let WireValue::Bytes(setting) = fields[2].value else { panic!() };
|
||||
let s = decode_wire(setting).unwrap();
|
||||
assert_eq!(s[0].number, 5);
|
||||
assert_eq!(s[0].value, WireValue::Bytes(home.as_bytes()));
|
||||
assert_eq!(decode_wire(&remote_download_path("/home/x")).unwrap()[0].value, WireValue::Bytes(b"/home/x"));
|
||||
}
|
||||
#[test]
|
||||
fn privacy_modes_report_matching_flag_and_current_type() {
|
||||
for (kind, expected) in [(1, [32, 0, 56, 1]), (2, [32, 1, 56, 2]), (3, [32, 1, 56, 3])] {
|
||||
let settings = Settings { private_screen: Some(kind), ..Settings::default() };
|
||||
let p = payload_with_settings(Permission::Unknown, Permission::Unknown, Permission::Unknown, "", &settings);
|
||||
let fields = decode_wire(&p).unwrap();
|
||||
assert_eq!(fields[0].number, 1);
|
||||
assert_eq!(fields[0].value, WireValue::Bytes(&[1, 2]));
|
||||
assert_eq!(fields.iter().find(|f| f.number == 4).unwrap().value, WireValue::Bytes(&expected));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
//! Per-peer TEXT backlog: one current metrics snapshot and bounded ordered replies.
|
||||
use std::sync::{Arc, atomic::{AtomicBool, Ordering}};
|
||||
use tokio::sync::{mpsc, watch};
|
||||
|
||||
const REPLY_CAPACITY: usize = 64;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub(super) struct Sender {
|
||||
replies: mpsc::Sender<Vec<u8>>,
|
||||
metrics: watch::Sender<Option<Vec<u8>>>,
|
||||
overflow_reported: Arc<AtomicBool>,
|
||||
}
|
||||
pub(super) struct Receiver {
|
||||
replies: mpsc::Receiver<Vec<u8>>,
|
||||
metrics: watch::Receiver<Option<Vec<u8>>>,
|
||||
metrics_open: bool,
|
||||
replies_open: bool,
|
||||
}
|
||||
pub(super) fn channel() -> (Sender, Receiver) {
|
||||
let (replies, rx) = mpsc::channel(REPLY_CAPACITY);
|
||||
let (metrics, latest) = watch::channel(None);
|
||||
(Sender { replies, metrics, overflow_reported: Arc::new(AtomicBool::new(false)) },
|
||||
Receiver { replies: rx, metrics: latest, metrics_open: true, replies_open: true })
|
||||
}
|
||||
impl Sender {
|
||||
pub(super) fn send(&self, message: Vec<u8>) -> Result<(), mpsc::error::SendError<Vec<u8>>> {
|
||||
self.replies.try_send(message).map_err(|error| {
|
||||
// Never wait for TEXT inside CONTROL's request handler: some viewers never open it.
|
||||
if matches!(error, mpsc::error::TrySendError::Full(_))
|
||||
&& !self.overflow_reported.swap(true, Ordering::Relaxed) {
|
||||
log::warn!("TEXT reply queue full; dropping excess replies");
|
||||
}
|
||||
mpsc::error::SendError(error.into_inner())
|
||||
})
|
||||
}
|
||||
pub(super) fn metrics(&self, message: Vec<u8>) {
|
||||
let _ = self.metrics.send(Some(message));
|
||||
}
|
||||
}
|
||||
impl Receiver {
|
||||
pub(super) async fn recv(&mut self) -> Option<Vec<u8>> {
|
||||
loop {
|
||||
if !self.metrics_open && !self.replies_open { return None; }
|
||||
tokio::select! {
|
||||
changed = self.metrics.changed(), if self.metrics_open => {
|
||||
if changed.is_err() { self.metrics_open = false; continue; }
|
||||
if let Some(message) = self.metrics.borrow_and_update().clone() { return Some(message); }
|
||||
}
|
||||
message = self.replies.recv(), if self.replies_open => match message {
|
||||
Some(message) => return Some(message),
|
||||
None => self.replies_open = false,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[tokio::test]
|
||||
async fn unopened_text_keeps_latest_metrics_and_bounded_fifo_replies() {
|
||||
let (tx, mut rx) = channel();
|
||||
for i in 0..10_000u32 { tx.metrics(i.to_le_bytes().to_vec()); }
|
||||
for i in 0..REPLY_CAPACITY { tx.send(vec![i as u8]).unwrap(); }
|
||||
assert_eq!(tx.send(vec![255]).unwrap_err().0, vec![255]);
|
||||
let mut replies = Vec::new();
|
||||
let mut metrics = Vec::new();
|
||||
for _ in 0..REPLY_CAPACITY + 1 {
|
||||
let message = rx.recv().await.unwrap();
|
||||
if message.len() == 4 { metrics.push(message); } else { replies.push(message[0]); }
|
||||
}
|
||||
assert_eq!(metrics, vec![9_999u32.to_le_bytes().to_vec()]);
|
||||
assert_eq!(replies, (0..REPLY_CAPACITY as u8).collect::<Vec<_>>());
|
||||
assert!(tokio::time::timeout(std::time::Duration::from_millis(20), rx.recv()).await.is_err());
|
||||
tx.send(vec![100]).unwrap();
|
||||
assert_eq!(rx.recv().await, Some(vec![100]));
|
||||
drop(tx);
|
||||
assert_eq!(rx.recv().await, None);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn closed_text_rejects_replies() {
|
||||
let (tx, rx) = channel();
|
||||
tx.metrics(vec![13]);
|
||||
tx.send(vec![22]).unwrap();
|
||||
drop(rx);
|
||||
assert!(tx.send(vec![23]).is_err());
|
||||
tx.metrics(vec![14]);
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,9 @@ impl Window {
|
||||
let name=super::device_label(std::env::var("UU_VIEWER_DEVICE_NAME").ok().as_deref()).to_owned();
|
||||
let window=video.window(&format!("{name} · {}",crate::i18n::s("UU 远程 Linux 控制端","UU Remote Linux viewer")),1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
|
||||
let mut canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
|
||||
// This window forwards scancodes, not SDL_TEXTINPUT. SDL enables text input by
|
||||
// default; its X11 IME path can consume keys before KeyDown/KeyUp (#149).
|
||||
video.text_input().stop();
|
||||
// Wayland maps a toplevel only after its first buffer; without this the window stays
|
||||
// invisible until the first decoded frame, which a stalled stream never delivers.
|
||||
canvas.set_draw_color(LOADING_BG);canvas.clear();canvas.present();
|
||||
@@ -708,6 +711,33 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
||||
|
||||
#[cfg(test)] mod tests {
|
||||
use super::*;
|
||||
#[cfg_attr(target_os="macos",ignore)]
|
||||
#[test] fn remote_window_disables_local_text_input_and_forwards_shift(){
|
||||
if std::env::var_os("UU_VIEWER_IME_TEST_CHILD").is_none(){
|
||||
let output=std::process::Command::new(std::env::current_exe().unwrap())
|
||||
.args(["--exact","viewer::sdl::tests::remote_window_disables_local_text_input_and_forwards_shift","--test-threads=1"])
|
||||
.env("SDL_VIDEODRIVER","dummy").env("UU_VIEWER_IME_TEST_CHILD","1").output().unwrap();
|
||||
assert!(output.status.success(),"{}{}",String::from_utf8_lossy(&output.stdout),String::from_utf8_lossy(&output.stderr));return
|
||||
}
|
||||
let mut window=Window::new().unwrap();
|
||||
assert!(!window.canvas.window().subsystem().text_input().is_active());
|
||||
let id=window.canvas.window().id();
|
||||
let key=|down,scan|if down {
|
||||
Event::KeyDown{timestamp:0,window_id:id,keycode:None,scancode:Some(scan),keymod:sdl2::keyboard::Mod::NOMOD,repeat:false}
|
||||
}else{
|
||||
Event::KeyUp{timestamp:0,window_id:id,keycode:None,scancode:Some(scan),keymod:sdl2::keyboard::Mod::NOMOD,repeat:false}
|
||||
};
|
||||
let push=|event|window._sdl.event().unwrap().push_event(event).unwrap();
|
||||
use sdl2::keyboard::Scancode as S;
|
||||
for event in [key(true,S::LShift),key(false,S::LShift),key(true,S::A),key(false,S::A),
|
||||
key(true,S::RShift),Event::Window{timestamp:0,window_id:id,win_event:WindowEvent::FocusLost},
|
||||
Event::Window{timestamp:0,window_id:id,win_event:WindowEvent::FocusGained}] {push(event);}
|
||||
let (_,messages)=window.poll(&mut Input::new(false));
|
||||
let keys:Vec<_>=messages.iter().filter_map(|m|Some((m.get("action")?.as_str()?,m.get("key")?.as_i64()?))).collect();
|
||||
assert_eq!(keys,vec![("kbd_press",0xa0),("kbd_release",0xa0),("kbd_press",0x41),("kbd_release",0x41),
|
||||
("kbd_press",0xa1),("kbd_release",0xa1)]);
|
||||
assert!(!window.canvas.window().subsystem().text_input().is_active());
|
||||
}
|
||||
// macOS: SDL video must start on the main thread, which the test harness does not use; CI runs it on Linux.
|
||||
#[cfg_attr(target_os="macos",ignore)]
|
||||
#[tokio::test] async fn clipboard_requests_use_existing_window(){
|
||||
|
||||
@@ -0,0 +1,427 @@
|
||||
//! Official device-card background reporting. Protocol evidence: docs/wallpaper-protocol.md.
|
||||
use std::{path::PathBuf, sync::Arc, time::Duration};
|
||||
use sha2::{Digest, Sha256};
|
||||
use tokio::io::AsyncReadExt;
|
||||
use crate::auth::UUAuthClient;
|
||||
|
||||
const LIMIT: usize = 10 * 1024 * 1024;
|
||||
const TIMEOUT: Duration = Duration::from_secs(20);
|
||||
|
||||
pub fn start(auth: Arc<UUAuthClient>) -> tokio::task::AbortHandle {
|
||||
tokio::spawn(async move {
|
||||
if auth.creds.user_id.is_empty() || crate::desktop_backend::headless()
|
||||
|| std::env::var("UU_WALLPAPER_UPLOAD").as_deref() == Ok("0") { return; }
|
||||
let mut previous = None;
|
||||
loop {
|
||||
if let Some(path) = source().await {
|
||||
match read_image(&path).await {
|
||||
Ok(image) => {
|
||||
let hash = Sha256::digest(&image).to_vec();
|
||||
if previous.as_ref() != Some(&hash) {
|
||||
match publish(&auth, image).await {
|
||||
Ok(()) => { previous = Some(hash); log::info!("Device wallpaper synchronized"); }
|
||||
Err(stage) => log::warn!("Device wallpaper synchronization failed: stage={stage}; will retry"),
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(()) => log::debug!("Device wallpaper unavailable or unsupported"),
|
||||
}
|
||||
}
|
||||
tokio::time::sleep(Duration::from_secs(60)).await;
|
||||
}
|
||||
}).abort_handle()
|
||||
}
|
||||
|
||||
async fn command(program: &str, args: &[&str]) -> Option<String> {
|
||||
let output = tokio::time::timeout(Duration::from_secs(3), tokio::process::Command::new(program)
|
||||
.args(args).kill_on_drop(true).output()).await.ok()?.ok()?;
|
||||
output.status.success().then(|| String::from_utf8(output.stdout).ok()).flatten()
|
||||
}
|
||||
|
||||
async fn kde_config(programs: &[&str], args: &[&str]) -> Option<String> {
|
||||
for program in programs {
|
||||
if let Some(value) = command(program, args).await { return Some(value); }
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
async fn source() -> Option<PathBuf> {
|
||||
if let Some(path) = std::env::var_os("UU_WALLPAPER") {
|
||||
let path = PathBuf::from(path); return path.is_absolute().then_some(path);
|
||||
}
|
||||
let desktop = std::env::var("XDG_CURRENT_DESKTOP").unwrap_or_default().to_lowercase();
|
||||
if desktop.contains("gnome") || desktop.contains("unity") || desktop.contains("cinnamon") {
|
||||
let schema = if desktop.contains("cinnamon") { "org.cinnamon.desktop.background" } else { "org.gnome.desktop.background" };
|
||||
if schema == "org.gnome.desktop.background" && command("gsettings", &["get", "org.gnome.desktop.interface", "color-scheme"])
|
||||
.await.is_some_and(|v| v.contains("prefer-dark")) {
|
||||
if let Some(path) = command("gsettings", &["get", schema, "picture-uri-dark"]).await.and_then(|v| gsettings_path(&v)) { return Some(path); }
|
||||
}
|
||||
return command("gsettings", &["get", schema, "picture-uri"]).await.and_then(|v| gsettings_path(&v));
|
||||
}
|
||||
if desktop.contains("kde") {
|
||||
let config = std::env::var_os("XDG_CONFIG_HOME").map(PathBuf::from)
|
||||
.filter(|p| p.is_absolute()).or_else(|| std::env::var_os("HOME").map(|h| PathBuf::from(h).join(".config")))?;
|
||||
let text = tokio::fs::read_to_string(config.join("plasma-org.kde.plasma.desktop-appletsrc")).await.unwrap_or_default();
|
||||
if let Some(path) = kde_image(&text) { return package_image(path).await; }
|
||||
// Plasma omits Image for the look-and-feel's default wallpaper.
|
||||
if !kde_default_allowed(&text) { return None; }
|
||||
let readers = ["kreadconfig6", "kreadconfig5"];
|
||||
let theme = kde_config(&readers, &["--file", "kdeglobals", "--group", "KDE", "--key", "LookAndFeelPackage"])
|
||||
.await.unwrap_or_default();
|
||||
let theme = if theme.trim().is_empty() { "org.kde.breeze.desktop" } else { theme.trim() };
|
||||
if theme.contains('/') || theme.contains("..") { return None; }
|
||||
let defaults = format!("/usr/share/plasma/look-and-feel/{theme}/contents/defaults");
|
||||
let image = kde_config(&readers, &["--file", &defaults, "--group", "Wallpaper", "--key", "Image"]).await?;
|
||||
let image = image.trim();
|
||||
if image.is_empty() || image.contains('/') || image.contains("..") { return None; }
|
||||
return package_image(PathBuf::from("/usr/share/wallpapers").join(image)).await;
|
||||
}
|
||||
if desktop.contains("xfce") {
|
||||
let text = command("xfconf-query", &["-c", "xfce4-desktop", "-lv"]).await?;
|
||||
for line in text.lines() {
|
||||
if let Some((key, value)) = line.trim().split_once(char::is_whitespace) {
|
||||
if key.ends_with("/last-image") { if let Some(path) = local_path(value) { return Some(path); } }
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
async fn package_image(path: PathBuf) -> Option<PathBuf> {
|
||||
if tokio::fs::metadata(&path).await.ok()?.is_file() { return Some(path); }
|
||||
let mut entries = tokio::fs::read_dir(path.join("contents/images")).await.ok()?;
|
||||
let mut candidates = Vec::new();
|
||||
while let Some(entry) = entries.next_entry().await.ok()? {
|
||||
if !tokio::fs::metadata(entry.path()).await.is_ok_and(|meta| meta.is_file()) { continue; }
|
||||
let path = entry.path();
|
||||
let Some((w,h)) = path.file_stem().and_then(|s| s.to_str()).and_then(|s| s.split_once('x'))
|
||||
.and_then(|(w,h)| Some((w.parse::<u32>().ok()?,h.parse::<u32>().ok()?))) else { continue; };
|
||||
candidates.push(((w < h, u64::from(w) * u64::from(h)), path));
|
||||
}
|
||||
candidates.sort_by_key(|(score, _)| *score);
|
||||
candidates.into_iter().next().map(|(_, path)| path)
|
||||
}
|
||||
|
||||
fn kde_image(text: &str) -> Option<PathBuf> {
|
||||
let plugins = kde_plugins(text);
|
||||
let mut image_section = false;
|
||||
for line in text.lines().map(str::trim) {
|
||||
if line.starts_with('[') {
|
||||
image_section = line.strip_prefix("[Containments][").and_then(|s| s.split_once(']'))
|
||||
.is_some_and(|(id, section)| section == "[Wallpaper][org.kde.image][General]"
|
||||
&& plugins.get(id).map_or(true, |plugin| *plugin == KdeWallpaper::Image));
|
||||
}
|
||||
if image_section { if let Some(value) = line.strip_prefix("Image=") { if let Some(path) = local_path(value) { return Some(path); } } }
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||
enum KdeWallpaper { Image, Unsupported }
|
||||
|
||||
fn kde_plugins(text: &str) -> std::collections::HashMap<&str, KdeWallpaper> {
|
||||
let mut containment = None;
|
||||
let mut plugins = std::collections::HashMap::new();
|
||||
let mut panels = Vec::new();
|
||||
for line in text.lines().map(str::trim) {
|
||||
if line.starts_with('[') {
|
||||
containment = line.strip_prefix("[Containments][").and_then(|s| s.split_once(']'))
|
||||
.filter(|(_, section)| section.is_empty()).map(|(id, _)| id);
|
||||
}
|
||||
if let Some(id) = containment {
|
||||
plugins.entry(id).or_insert(KdeWallpaper::Image);
|
||||
if line.strip_prefix("plugin=").is_some_and(|plugin| plugin.trim() == "org.kde.panel") { panels.push(id); }
|
||||
if let Some(plugin) = line.strip_prefix("wallpaperplugin=") {
|
||||
plugins.insert(id, if plugin.trim() == "org.kde.image" { KdeWallpaper::Image } else { KdeWallpaper::Unsupported });
|
||||
}
|
||||
}
|
||||
}
|
||||
// Panels can keep an image wallpaper setting, but do not supply a desktop background.
|
||||
for id in panels { plugins.insert(id, KdeWallpaper::Unsupported); }
|
||||
plugins
|
||||
}
|
||||
|
||||
fn kde_default_allowed(text: &str) -> bool {
|
||||
let plugins = kde_plugins(text);
|
||||
if !plugins.is_empty() { return plugins.values().any(|plugin| *plugin == KdeWallpaper::Image); }
|
||||
!text.contains("[Wallpaper][") || text.contains("[Wallpaper][org.kde.image]")
|
||||
}
|
||||
|
||||
fn gsettings_path(value: &str) -> Option<PathBuf> {
|
||||
// gsettings prints a GVariant string, with either quote style and C/Unicode escapes.
|
||||
// https://docs.gtk.org/glib/gvariant-text-format.html#strings
|
||||
let mut chars = value.trim().chars();
|
||||
let quote = chars.next()?;
|
||||
if quote != '\'' && quote != '"' { return None; }
|
||||
let mut decoded = String::new();
|
||||
while let Some(ch) = chars.next() {
|
||||
if ch == quote { return chars.as_str().is_empty().then(|| local_path(&decoded)).flatten(); }
|
||||
if ch != '\\' { decoded.push(ch); continue; }
|
||||
let escaped = chars.next()?;
|
||||
decoded.push(match escaped {
|
||||
'a' => '\x07', 'b' => '\x08', 'f' => '\x0c', 'n' => '\n',
|
||||
'r' => '\r', 't' => '\t', 'v' => '\x0b', '\\' => '\\', '\'' => '\'', '"' => '"',
|
||||
'u' | 'U' => {
|
||||
let mut code = 0u32;
|
||||
for _ in 0..if escaped == 'u' { 4 } else { 8 } { code = u32::checked_add(code.checked_mul(16)?, chars.next()?.to_digit(16)?)?; }
|
||||
char::from_u32(code).filter(|c| *c != '\0')?
|
||||
}
|
||||
'\n' => continue,
|
||||
_ => escaped,
|
||||
});
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn local_path(value: &str) -> Option<PathBuf> {
|
||||
let value = value.trim();
|
||||
let path = if value.starts_with("file:") {
|
||||
let url = reqwest::Url::parse(value).ok()?;
|
||||
if url.query().is_some() || url.fragment().is_some() { return None; }
|
||||
url.to_file_path().ok()?
|
||||
} else { PathBuf::from(value) };
|
||||
path.is_absolute().then_some(path)
|
||||
}
|
||||
|
||||
async fn read_image(path: &std::path::Path) -> Result<Vec<u8>, ()> {
|
||||
if !tokio::fs::metadata(path).await.map_err(|_| ())?.is_file() { return Err(()); }
|
||||
let file = tokio::fs::File::open(path).await.map_err(|_| ())?;
|
||||
if !file.metadata().await.map_err(|_| ())?.is_file() { return Err(()); }
|
||||
let mut image = Vec::new();
|
||||
file.take((LIMIT + 1) as u64).read_to_end(&mut image).await.map_err(|_| ())?;
|
||||
if image.len() > LIMIT || image_type(&image).is_none() { return Err(()); }
|
||||
Ok(image)
|
||||
}
|
||||
|
||||
fn image_type(image: &[u8]) -> Option<&'static str> {
|
||||
if image.starts_with(b"\x89PNG\r\n\x1a\n") { Some("image/png") }
|
||||
else if image.starts_with(b"\xff\xd8\xff") { Some("image/jpeg") }
|
||||
else if image.starts_with(b"RIFF") && image.get(8..12) == Some(b"WEBP") { Some("image/webp") }
|
||||
else { None }
|
||||
}
|
||||
|
||||
fn api_data(status: u16, body: &serde_json::Value) -> Result<&serde_json::Value, ()> {
|
||||
if status != 200 || body.get("code").and_then(|v| v.as_i64()) != Some(0) { return Err(()); }
|
||||
body.get("data").ok_or(())
|
||||
}
|
||||
|
||||
async fn publish(auth: &UUAuthClient, image: Vec<u8>) -> Result<(), &'static str> {
|
||||
let http = crate::auth::http_client_builder().redirect(reqwest::redirect::Policy::none()).build().map_err(|_| "http-client")?;
|
||||
publish_to(auth, image, crate::auth::BASE_URL, &http).await
|
||||
}
|
||||
|
||||
async fn json(request: reqwest::RequestBuilder) -> Result<(u16, serde_json::Value), ()> {
|
||||
let mut response = request.timeout(TIMEOUT).send().await.map_err(|_| ())?;
|
||||
let status = response.status().as_u16();
|
||||
let mut bytes = Vec::new();
|
||||
while let Some(chunk) = response.chunk().await.map_err(|_| ())? {
|
||||
if bytes.len() + chunk.len() > 65536 { return Err(()); }
|
||||
bytes.extend_from_slice(&chunk);
|
||||
}
|
||||
Ok((status, serde_json::from_slice(&bytes).map_err(|_| ())?))
|
||||
}
|
||||
|
||||
async fn publish_to(auth: &UUAuthClient, image: Vec<u8>, base: &str, http: &reqwest::Client) -> Result<(), &'static str> {
|
||||
let path = "/api/v1/tool/fp/token?filetype=1";
|
||||
let result = json(http.get(format!("{base}{path}")).headers(auth.build_headers("GET", path, ""))).await.map_err(|_| "token-request")?;
|
||||
let data = api_data(result.0, &result.1).map_err(|_| "token-response")?;
|
||||
let token = data.get("token").and_then(|v| v.as_str()).filter(|v| !v.is_empty()).ok_or("file-token")?;
|
||||
let url = data.get("req_url").and_then(|v| v.as_str()).ok_or("upload-url")?;
|
||||
let url = https_url(url).map_err(|_| "upload-url")?;
|
||||
let max = data.get("max_size").and_then(|v| v.as_u64()).filter(|n| *n > 0).unwrap_or(LIMIT as u64);
|
||||
if image.len() as u64 > max { return Err("file-size"); }
|
||||
// Filepicker takes raw bytes and its own Authorization value, never account headers.
|
||||
let response = json(http.post(url).header("Authorization", token)
|
||||
.header("Content-Type", image_type(&image).ok_or("file-type")?).body(image)
|
||||
).await.map_err(|_| "file-upload")?;
|
||||
if response.0 != 200 { return Err("file-upload-status"); }
|
||||
let url = response.1.get("url").and_then(|v| v.as_str()).ok_or("file-response")?;
|
||||
https_url(url).map_err(|_| "file-response-url")?;
|
||||
let path = "/api/v1/device/wallpaper";
|
||||
let body = serde_json::json!({"wallpaper_url": url}).to_string();
|
||||
let result = json(http.post(format!("{base}{path}")).headers(auth.build_headers("POST", path, &body)).body(body)).await.map_err(|_| "report-request")?;
|
||||
if result.0 != 200 || result.1.get("code").and_then(|v| v.as_i64()) != Some(0) { return Err("report-response"); }
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn https_url(value: &str) -> Result<reqwest::Url, ()> {
|
||||
let url = reqwest::Url::parse(value).map_err(|_| ())?;
|
||||
if url.scheme() != "https" || url.host_str().is_none() || !url.username().is_empty() || url.password().is_some() { return Err(()); }
|
||||
Ok(url)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use tokio::io::AsyncWriteExt;
|
||||
#[tokio::test]
|
||||
async fn kde_config_uses_plasma5_when_plasma6_reader_is_unavailable() {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let root = std::env::temp_dir().join(format!("uu-kreadconfig-test-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||
std::fs::create_dir(&root).unwrap();
|
||||
let five = root.join("kreadconfig5"); let six = root.join("kreadconfig6");
|
||||
std::fs::write(&five, "#!/bin/sh\ncase \"$*\" in *LookAndFeelPackage*) echo org.kde.breeze.desktop;; *Image*) echo Next;; esac\n").unwrap();
|
||||
std::fs::set_permissions(&five, std::fs::Permissions::from_mode(0o700)).unwrap();
|
||||
let readers = [six.to_str().unwrap(), five.to_str().unwrap()];
|
||||
assert_eq!(kde_config(&readers, &["--key", "LookAndFeelPackage"]).await.as_deref(), Some("org.kde.breeze.desktop\n"));
|
||||
assert_eq!(kde_config(&readers, &["--key", "Image"]).await.as_deref(), Some("Next\n"));
|
||||
std::fs::write(&six, "#!/bin/sh\necho Plasma6\n").unwrap();
|
||||
std::fs::set_permissions(&six, std::fs::Permissions::from_mode(0o700)).unwrap();
|
||||
assert_eq!(kde_config(&readers, &["--key", "Image"]).await.as_deref(), Some("Plasma6\n"));
|
||||
std::fs::remove_dir_all(root).unwrap();
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn kde_packages_select_landscape_and_image_reads_are_bounded() {
|
||||
let root = std::env::temp_dir().join(format!("uu-wallpaper-test-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||
let images = root.join("contents/images");
|
||||
std::fs::create_dir_all(&images).unwrap();
|
||||
for name in ["1440x2960.png", "5120x2880.png", "7680x2160.png"] {
|
||||
std::fs::write(images.join(name), b"\x89PNG\r\n\x1a\n").unwrap();
|
||||
}
|
||||
let image = package_image(root.clone()).await.unwrap();
|
||||
assert_eq!(image.file_name().unwrap(), "5120x2880.png");
|
||||
assert_eq!(package_image(image.clone()).await, Some(image.clone()));
|
||||
assert!(read_image(&image).await.is_ok());
|
||||
std::fs::write(&image, b"private text is not an image").unwrap();
|
||||
assert!(read_image(&image).await.is_err());
|
||||
std::fs::OpenOptions::new().write(true).open(&image).unwrap().set_len((LIMIT + 1) as u64).unwrap();
|
||||
assert!(read_image(&image).await.is_err());
|
||||
assert!(read_image(&root).await.is_err());
|
||||
std::fs::remove_dir_all(root).unwrap();
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn kde_packages_follow_image_symlinks_and_skip_invalid_targets() {
|
||||
use std::os::unix::fs::symlink;
|
||||
let root = std::env::temp_dir().join(format!("uu-wallpaper-links-test-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||
let images = root.join("contents/images");
|
||||
std::fs::create_dir_all(&images).unwrap();
|
||||
let target = root.join("shared.png");
|
||||
std::fs::write(&target, b"\x89PNG\r\n\x1a\n").unwrap();
|
||||
let image = images.join("1920x1080.png");
|
||||
symlink("../../shared.png", &image).unwrap();
|
||||
symlink("../../missing.png", images.join("640x480.png")).unwrap();
|
||||
symlink(&root, images.join("800x600.png")).unwrap();
|
||||
assert_eq!(package_image(root.clone()).await, Some(image.clone()));
|
||||
assert!(read_image(&image).await.is_ok());
|
||||
std::fs::remove_dir_all(root).unwrap();
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn reporting_protocol_keeps_file_token_separate_and_stops_on_failures() {
|
||||
use tokio_rustls::{rustls, TlsAcceptor};
|
||||
use rustls::pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
|
||||
let cert = rcgen::generate_simple_self_signed(vec!["localhost".into()]).unwrap();
|
||||
let der = cert.serialize_der().unwrap();
|
||||
let http = reqwest::Client::builder().no_proxy().redirect(reqwest::redirect::Policy::none())
|
||||
.add_root_certificate(reqwest::Certificate::from_der(&der).unwrap()).build().unwrap();
|
||||
let config = rustls::ServerConfig::builder_with_provider(Arc::new(rustls::crypto::ring::default_provider()))
|
||||
.with_safe_default_protocol_versions().unwrap().with_no_client_auth()
|
||||
.with_single_cert(vec![CertificateDer::from(der)], PrivateKeyDer::Pkcs8(
|
||||
PrivatePkcs8KeyDer::from(cert.serialize_private_key_der()))).unwrap();
|
||||
let acceptor = TlsAcceptor::from(Arc::new(config));
|
||||
let auth = UUAuthClient::new(crate::auth::Credentials {
|
||||
token: "fixture-account-token".into(), csrf: "fixture-csrf".into(),
|
||||
sign_key: "fixture-key".into(), ..Default::default()
|
||||
});
|
||||
for scenario in ["success", "token-failed", "too-large", "upload-failed", "report-failed"] {
|
||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||
let base = format!("https://localhost:{}", listener.local_addr().unwrap().port());
|
||||
let server_base = base.clone(); let acceptor = acceptor.clone();
|
||||
let steps = match scenario { "token-failed" | "too-large" => 1, "upload-failed" => 2, _ => 3 };
|
||||
let server = tokio::spawn(async move {
|
||||
for step in 0..steps {
|
||||
let (socket, _) = listener.accept().await.unwrap();
|
||||
let mut tls = acceptor.accept(socket).await.unwrap();
|
||||
let mut bytes = Vec::new(); let mut byte = [0u8; 1];
|
||||
while !bytes.ends_with(b"\r\n\r\n") {
|
||||
tls.read_exact(&mut byte).await.unwrap(); bytes.push(byte[0]); assert!(bytes.len() < 16384);
|
||||
}
|
||||
let headers = String::from_utf8(bytes).unwrap().to_lowercase();
|
||||
let length: usize = headers.lines().find_map(|l| l.strip_prefix("content-length:")
|
||||
.and_then(|s| s.trim().parse().ok())).unwrap_or(0);
|
||||
let mut body = vec![0; length]; tls.read_exact(&mut body).await.unwrap();
|
||||
let (status, reply) = match step {
|
||||
0 => {
|
||||
assert!(headers.starts_with("get /api/v1/tool/fp/token?filetype=1 "));
|
||||
assert!(headers.contains("authorization: bearer fixture-account-token\r\n"));
|
||||
assert!(headers.contains("x-param-sign:")); assert!(body.is_empty());
|
||||
(200, serde_json::json!({"code":if scenario=="token-failed" {1120}else{0},
|
||||
"data":{"token":"fixture-file-token","req_url":format!("{server_base}/upload"),"ttl":60,
|
||||
"max_size":if scenario=="too-large" {1}else{1024}}}))
|
||||
}
|
||||
1 => {
|
||||
assert!(headers.starts_with("post /upload "));
|
||||
assert!(headers.contains("authorization: fixture-file-token\r\n"));
|
||||
for secret in ["fixture-account-token", "fixture-csrf", "cookie:", "x-param-"] { assert!(!headers.contains(secret)); }
|
||||
assert_eq!(body, b"\x89PNG\r\n\x1a\n");
|
||||
(if scenario=="upload-failed" {500}else{200}, serde_json::json!({"url":"https://example.invalid/wallpaper.png","fsize":8,"md5":"fixture","mime":"image/png"}))
|
||||
}
|
||||
_ => {
|
||||
assert!(headers.starts_with("post /api/v1/device/wallpaper "));
|
||||
assert!(headers.contains("authorization: bearer fixture-account-token\r\n"));
|
||||
assert!(!headers.contains("fixture-file-token"));
|
||||
assert_eq!(serde_json::from_slice::<serde_json::Value>(&body).unwrap(), serde_json::json!({"wallpaper_url":"https://example.invalid/wallpaper.png"}));
|
||||
(200, serde_json::json!({"code":if scenario=="report-failed" {1120}else{0}}))
|
||||
}
|
||||
};
|
||||
let reply = reply.to_string();
|
||||
tls.write_all(format!("HTTP/1.1 {status} Fixture\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{reply}", reply.len()).as_bytes()).await.unwrap();
|
||||
tls.shutdown().await.unwrap();
|
||||
}
|
||||
});
|
||||
let result = tokio::time::timeout(Duration::from_secs(5), publish_to(&auth, b"\x89PNG\r\n\x1a\n".to_vec(), &base, &http)).await.unwrap();
|
||||
assert_eq!(result.is_ok(), scenario == "success", "{scenario}");
|
||||
tokio::time::timeout(Duration::from_secs(5), server).await.unwrap().unwrap();
|
||||
}
|
||||
}
|
||||
#[test] fn wallpaper_sources_are_local_and_scoped() {
|
||||
assert_eq!(gsettings_path("'file:///usr/share/a%20b.png'"), Some(PathBuf::from("/usr/share/a b.png")));
|
||||
for value in ["", "relative.png", "https://example.com/a.png", "file://remote/a.png", "file:///tmp/a.png?token=secret"] { assert!(local_path(value).is_none()); }
|
||||
assert_eq!(kde_image("[Other]\nImage=/wrong.png\n[Containments][2][Wallpaper][org.kde.image][General]\nImage=file:///right.png"), Some(PathBuf::from("/right.png")));
|
||||
}
|
||||
#[test] fn gsettings_decodes_quotes_backslashes_and_unicode() {
|
||||
assert_eq!(gsettings_path("\"file:///tmp/it's.png\""), Some(PathBuf::from("/tmp/it's.png")));
|
||||
assert_eq!(gsettings_path(r#"'file:///tmp/it\'s.png'"#), Some(PathBuf::from("/tmp/it's.png")));
|
||||
assert_eq!(gsettings_path(r#"'/tmp/a\\b\t\u00e9\U0001f600.png'"#), Some(PathBuf::from("/tmp/a\\b\té😀.png")));
|
||||
for value in ["'unterminated", "'/tmp/a' trailing", r#"'/tmp/\uD800'"#, r#"'/tmp/\Uffffffff'"#] { assert!(gsettings_path(value).is_none()); }
|
||||
assert_eq!(gsettings_path(r#"'/tmp/\x41'"#), Some(PathBuf::from("/tmp/x41")));
|
||||
assert_eq!(local_path("/tmp/it's.png"), Some(PathBuf::from("/tmp/it's.png")));
|
||||
}
|
||||
#[test] fn kde_default_survives_saved_image_settings_but_not_other_plugins() {
|
||||
let image = "[Containments][1]\nwallpaperplugin=org.kde.image\n[Containments][1][Wallpaper][org.kde.image][General]\nFillMode=1\n";
|
||||
assert!(kde_image(image).is_none()); assert!(kde_default_allowed(image));
|
||||
assert!(kde_default_allowed("[Containments][1][Wallpaper][org.kde.image][General]\nFillMode=1"));
|
||||
assert!(kde_default_allowed(""));
|
||||
assert!(!kde_default_allowed(&image.replace("wallpaperplugin=org.kde.image", "wallpaperplugin=org.kde.slideshow")));
|
||||
assert!(!kde_default_allowed("[Containments][1][Wallpaper][org.kde.slideshow][General]\nSlidePaths=/tmp"));
|
||||
}
|
||||
#[test] fn kde_stored_images_belong_to_the_same_active_image_containment() {
|
||||
let stale = "[Containments][1]\nwallpaperplugin=org.kde.slideshow\n[Containments][1][Wallpaper][org.kde.image][General]\nImage=/tmp/previous.png\n";
|
||||
assert!(kde_image(stale).is_none());
|
||||
assert!(!kde_default_allowed(stale));
|
||||
let mixed = format!("{stale}[Containments][2]\nwallpaperplugin=org.kde.image\n[Containments][2][Wallpaper][org.kde.image][General]\nImage=/tmp/current.png\n");
|
||||
assert_eq!(kde_image(&mixed), Some(PathBuf::from("/tmp/current.png")));
|
||||
assert_eq!(kde_image(&stale.replace("org.kde.slideshow", "org.kde.image")), Some(PathBuf::from("/tmp/previous.png")));
|
||||
}
|
||||
#[test] fn kde_panels_do_not_enable_default_wallpaper_or_supply_saved_images() {
|
||||
let panel = "[Containments][2]\nwallpaperplugin=org.kde.image\nplugin=org.kde.panel\n[Containments][2][Wallpaper][org.kde.image][General]\nImage=/tmp/panel.png\n";
|
||||
let slideshow = "[Containments][1]\nplugin=org.kde.plasma.folder\nwallpaperplugin=org.kde.slideshow\n";
|
||||
assert!(!kde_default_allowed(slideshow));
|
||||
assert!(!kde_default_allowed(&format!("{slideshow}{panel}")));
|
||||
assert!(kde_image(&format!("{slideshow}{panel}")).is_none());
|
||||
assert!(!kde_default_allowed(panel));
|
||||
let desktop = "[Containments][1]\nplugin=org.kde.plasma.folder\n";
|
||||
assert!(kde_default_allowed(&format!("{desktop}{panel}")));
|
||||
}
|
||||
#[test] fn only_supported_image_files_are_uploaded() {
|
||||
assert_eq!(image_type(b"\x89PNG\r\n\x1a\n"), Some("image/png"));
|
||||
assert_eq!(image_type(b"\xff\xd8\xff"), Some("image/jpeg"));
|
||||
assert_eq!(image_type(b"RIFF1234WEBP"), Some("image/webp"));
|
||||
assert_eq!(image_type(b"<wallpaper>private text</wallpaper>"), None);
|
||||
}
|
||||
#[test] fn failed_api_responses_and_unsafe_upload_urls_are_rejected() {
|
||||
assert!(api_data(200, &serde_json::json!({"code":0,"data":{}})).is_ok());
|
||||
assert!(api_data(422, &serde_json::json!({"code":1120})).is_err());
|
||||
assert!(api_data(200, &serde_json::json!({"data":{}})).is_err());
|
||||
for url in ["http://example.com", "file:///tmp/a", "https://[email protected]"] { assert!(https_url(url).is_err()); }
|
||||
}
|
||||
}
|
||||
+65
-14
@@ -4,6 +4,9 @@ use crate::capture::ScreenCapture;
|
||||
use crate::input::InputInjector;
|
||||
use crate::signaling::SoacMessage;
|
||||
|
||||
#[path = "text_outbox.rs"]
|
||||
mod text_outbox;
|
||||
|
||||
use base64::Engine;
|
||||
use flate2::read::GzDecoder;
|
||||
use std::io::Read;
|
||||
@@ -489,6 +492,11 @@ impl WebRtcSession {
|
||||
let file_channel: Arc<std::sync::Mutex<Option<Arc<RTCDataChannel>>>> = Arc::new(std::sync::Mutex::new(None));
|
||||
let (file_tx, mut file_rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>();
|
||||
let peer_files = crate::file_trans::FileSession::new(file_tx, control_sequence.clone());
|
||||
// Mac 4.43: streamerDidReceiveTextData (0x1001f56b4, arm64) reaches
|
||||
// the metrics/RPC dispatcher at 0x1003a8560; CONTROL does not.
|
||||
// Keep CONTROL metrics for other viewers; privacy replies use TEXT.
|
||||
let (text_tx, text_rx) = text_outbox::channel();
|
||||
let text_rx = Arc::new(tokio::sync::Mutex::new(Some(OutboundReceiver::Text(text_rx))));
|
||||
// 端口映射 frames (Message 27) also travel on FILE_DATA_CHANNEL; one session per peer.
|
||||
let port_mapping = crate::port_mapping::Session::new(file_channel.clone(), control_sequence.clone());
|
||||
{
|
||||
@@ -537,6 +545,8 @@ impl WebRtcSession {
|
||||
let echo_seen = echo_seen.clone();
|
||||
let channel_lock_state = channel_lock_state.clone();
|
||||
let peer_files = peer_files.clone();
|
||||
let text_out = text_tx.clone();
|
||||
let text_rx = text_rx.clone();
|
||||
let peer_port_mapping = port_mapping.clone();
|
||||
let peer_video_settings = video_settings.clone();
|
||||
let peer_video_track = control_video_track.clone();
|
||||
@@ -565,12 +575,16 @@ impl WebRtcSession {
|
||||
}
|
||||
// Ordered outbound queue for protocol replies produced outside this callback.
|
||||
// webrtc-rs announces the channel before handle_open (ready_state Connecting);
|
||||
// send() returns ErrClosedPipe until Open. Draining CONTROL here would drop
|
||||
// Message 25 and every later reply. Start CONTROL from the on_open below
|
||||
// send() returns ErrClosedPipe until Open. Draining CONTROL/TEXT here would
|
||||
// drop initial state and replies. Start them from the on_open below
|
||||
// (one handler; a second on_open replaces it). Receiver taken once.
|
||||
let mut control_drain: Option<Box<dyn (FnOnce() -> std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>) + Send + Sync>> = None;
|
||||
let (outbound, outbound_rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>();
|
||||
let outbound_rx = Arc::new(tokio::sync::Mutex::new(Some(outbound_rx)));
|
||||
let mut open_drain: Option<Box<dyn (FnOnce() -> std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>) + Send + Sync>> = None;
|
||||
let (outbound, outbound_rx) = if label == "TEXT_DATA_CHANNEL" {
|
||||
(Outbound::Text(text_out.clone()), text_rx)
|
||||
} else {
|
||||
let (tx, rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>();
|
||||
(Outbound::Other(tx), Arc::new(tokio::sync::Mutex::new(Some(OutboundReceiver::Other(rx)))))
|
||||
};
|
||||
if label == "CONTROL_DATA_CHANNEL" {
|
||||
if let Some(mut chroma_sync_rx) = chroma_sync_rx.lock().unwrap().take() {
|
||||
let sync_out = outbound.clone();
|
||||
@@ -603,8 +617,8 @@ impl WebRtcSession {
|
||||
});
|
||||
}) as std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>
|
||||
};
|
||||
if label != "CONTROL_DATA_CHANNEL" { tokio::spawn(start_drain()); }
|
||||
else { control_drain = Some(Box::new(start_drain)); }
|
||||
if !matches!(label.as_str(), "CONTROL_DATA_CHANNEL" | "TEXT_DATA_CHANNEL") { tokio::spawn(start_drain()); }
|
||||
else { open_drain = Some(Box::new(start_drain)); }
|
||||
}
|
||||
let (capture_tx, mut capture_rx) = tokio::sync::mpsc::channel::<Vec<u8>>(16);
|
||||
if matches!(label.as_str(),"CONTROL_DATA_CHANNEL"|"TEXT_DATA_CHANNEL") {
|
||||
@@ -776,9 +790,10 @@ impl WebRtcSession {
|
||||
Some(peer_files.clone())
|
||||
} else { None };
|
||||
// CT_TERMINAL: TERM frames and terminal RPCs (check_env/rename) on BINARY.
|
||||
let terminal_conn = if label == "BINARY_DATA_CHANNEL" {
|
||||
Some(Arc::new(crate::terminal::TerminalConn::new(outbound.clone())))
|
||||
} else { None };
|
||||
let terminal_conn = match (&outbound, label.as_str()) {
|
||||
(Outbound::Other(tx), "BINARY_DATA_CHANNEL") => Some(Arc::new(crate::terminal::TerminalConn::new(tx.clone()))),
|
||||
_ => None,
|
||||
};
|
||||
if label == "CONTROL_DATA_CHANNEL" || label == "TEXT_DATA_CHANNEL" {
|
||||
let channel = d.clone();
|
||||
let initial_sequence = out_sequence.clone();
|
||||
@@ -795,8 +810,9 @@ impl WebRtcSession {
|
||||
let open_role = channel_role.clone();
|
||||
let open_screen = screen.clone();
|
||||
let open_selection = peer_selection;
|
||||
let open_text_out = text_out.clone();
|
||||
d.on_open(Box::new(move || {
|
||||
if let Some(start_drain) = control_drain { tokio::spawn(start_drain()); }
|
||||
if let Some(start_drain) = open_drain { tokio::spawn(start_drain()); }
|
||||
let init_actions = open_actions.clone();
|
||||
let init_video = open_video.clone();
|
||||
let init_track = open_track.clone();
|
||||
@@ -810,6 +826,7 @@ impl WebRtcSession {
|
||||
let owner = open_owner.clone();
|
||||
let role = open_role.clone();
|
||||
let pc = desktop_pc.upgrade();
|
||||
let text_out = open_text_out.clone();
|
||||
Box::pin(async move {
|
||||
// Permission dialogs and first-frame waits must not occupy the
|
||||
// channel-open callback or delay CONTROL message dispatch.
|
||||
@@ -962,6 +979,7 @@ impl WebRtcSession {
|
||||
let message = crate::initialization::envelope(
|
||||
sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13,
|
||||
&init_actions.metrics_payload(desktop_sound, snapshot.permission(true)));
|
||||
text_out.metrics(message.clone());
|
||||
if channel.send(&bytes::Bytes::from(message)).await.is_err() { return; }
|
||||
let mut updates = portal.subscribe();
|
||||
match crate::desktop_session::wait_ready(&mut updates, &channel).await {
|
||||
@@ -972,6 +990,7 @@ impl WebRtcSession {
|
||||
let message = crate::initialization::envelope(
|
||||
sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13,
|
||||
&init_actions.metrics_payload(desktop_sound, crate::system_metrics::Permission::Reject));
|
||||
text_out.metrics(message.clone());
|
||||
let _ = channel.send(&bytes::Bytes::from(message)).await;
|
||||
}
|
||||
return;
|
||||
@@ -1019,6 +1038,7 @@ impl WebRtcSession {
|
||||
Ok(message) => message,
|
||||
Err(e) => { log::error!("CONTROL initialization encode failed: {}", e); return; }
|
||||
};
|
||||
if field == 13 { text_out.metrics(message.clone()); }
|
||||
if let Err(e) = channel.send(&bytes::Bytes::from(message)).await {
|
||||
log::error!("CONTROL initialization field {} failed: {}", field, e);
|
||||
return;
|
||||
@@ -1038,6 +1058,7 @@ impl WebRtcSession {
|
||||
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
||||
let (channel, sequence, actions) = (channel.clone(), sequence.clone(), init_actions.clone());
|
||||
let portal = portal_desktop.clone();
|
||||
let text_out = text_out.clone();
|
||||
tokio::spawn(async move {
|
||||
let mut previous = crate::privacy_screen::current_type();
|
||||
let mut tick = tokio::time::interval(std::time::Duration::from_secs(1));
|
||||
@@ -1051,6 +1072,7 @@ impl WebRtcSession {
|
||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||
let payload = actions.metrics_payload(desktop_sound, permission);
|
||||
let message = crate::initialization::envelope(sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13, &payload);
|
||||
text_out.metrics(message.clone());
|
||||
if channel.send(&bytes::Bytes::from(message)).await.is_err() { return; }
|
||||
let state = crate::privacy_screen::state_message(sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts);
|
||||
if channel.send(&bytes::Bytes::from(state)).await.is_err() { return; }
|
||||
@@ -1107,6 +1129,7 @@ impl WebRtcSession {
|
||||
let message_role=channel_role.clone();
|
||||
let terminal_worker = terminal_conn.clone();
|
||||
let rpc_out = outbound.clone();
|
||||
let text_out = text_out.clone();
|
||||
let reply_chan = d_reply.clone();
|
||||
let out_sequence = reply_sequence.clone();
|
||||
let clipboard_sink = clipboard_input.clone();
|
||||
@@ -1145,7 +1168,7 @@ impl WebRtcSession {
|
||||
if let Some(request) = rpc.filter(|_| rpc_fields.as_ref().is_some_and(|r| r.iter().any(|f| f.number == 7))) {
|
||||
let Some((response, accepted)) = rpc_fields.as_deref().and_then(crate::privacy_screen::rpc_accept) else { return };
|
||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||
let _ = text_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||
let Some(accepted) = accepted else { return };
|
||||
let failed = tokio::task::spawn_blocking(move || accepted.apply().is_err()).await.unwrap_or(true);
|
||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||
@@ -1156,13 +1179,19 @@ impl WebRtcSession {
|
||||
}
|
||||
let permission = portal_for_message.as_ref().map_or(crate::system_metrics::Permission::Allow, |p| p.snapshot().permission(desktop));
|
||||
let metrics = actions.metrics_payload(desktop_sound, permission);
|
||||
text_out.metrics(crate::initialization::envelope(next(), ts, 13, &metrics));
|
||||
let _ = reply_chan.send(&bytes::Bytes::from(crate::initialization::envelope(next(), ts, 13, &metrics))).await;
|
||||
let state = crate::privacy_screen::state_message(next(), ts);
|
||||
let _ = reply_chan.send(&bytes::Bytes::from(state)).await;
|
||||
log::info!("Privacy switch done: failed={failed} type={}", crate::privacy_screen::current_type());
|
||||
return;
|
||||
}
|
||||
if let Some(response) = rpc_fields.as_deref().and_then(|r| crate::privacy_screen::screensaver_response(r).or_else(|| crate::system_actions::plugin_response(r)).or_else(|| crate::system_actions::session_rpc_response(r))) {
|
||||
if let Some(response) = rpc_fields.as_deref().and_then(crate::privacy_screen::screensaver_response) {
|
||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||
let _ = text_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||
return;
|
||||
}
|
||||
if let Some(response) = rpc_fields.as_deref().and_then(|r| crate::system_actions::plugin_response(r).or_else(|| crate::system_actions::session_rpc_response(r))) {
|
||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||
return;
|
||||
@@ -1343,6 +1372,7 @@ impl WebRtcSession {
|
||||
crate::control_protocol::simple_action_name(action).unwrap_or("?"), value, sa::args_shape(&args));
|
||||
let (actions, input, chan, seq_out) = (actions.clone(), input_worker.clone(), reply_chan.clone(), out_sequence.clone());
|
||||
let settings_portal = portal_for_message.clone();
|
||||
let text_out = text_out.clone();
|
||||
tokio::spawn(async move {
|
||||
let worker = actions.clone();
|
||||
let report = tokio::task::spawn_blocking(move || worker.handle(action, value, &args, || {
|
||||
@@ -1356,6 +1386,7 @@ impl WebRtcSession {
|
||||
crate::system_metrics::Permission::Allow,
|
||||
|manager| manager.snapshot().permission(desktop));
|
||||
let message = crate::initialization::envelope(seq_out.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13, &actions.metrics_payload(desktop_sound, permission));
|
||||
text_out.metrics(message.clone());
|
||||
if let Err(e) = chan.send(&bytes::Bytes::from(message)).await { log::warn!("Settings report failed: {}", e); }
|
||||
}
|
||||
});
|
||||
@@ -1710,8 +1741,28 @@ fn negotiated_bundle_media(sdp: &str) -> Option<(String, u16)> {
|
||||
None
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
enum Outbound {
|
||||
Text(text_outbox::Sender),
|
||||
Other(tokio::sync::mpsc::UnboundedSender<Vec<u8>>),
|
||||
}
|
||||
impl Outbound {
|
||||
fn send(&self, message: Vec<u8>) -> Result<(), tokio::sync::mpsc::error::SendError<Vec<u8>>> {
|
||||
match self { Self::Text(tx) => tx.send(message), Self::Other(tx) => tx.send(message) }
|
||||
}
|
||||
}
|
||||
enum OutboundReceiver {
|
||||
Text(text_outbox::Receiver),
|
||||
Other(tokio::sync::mpsc::UnboundedReceiver<Vec<u8>>),
|
||||
}
|
||||
impl OutboundReceiver {
|
||||
async fn recv(&mut self) -> Option<Vec<u8>> {
|
||||
match self { Self::Text(rx) => rx.recv().await, Self::Other(rx) => rx.recv().await }
|
||||
}
|
||||
}
|
||||
|
||||
/// First drain owns the outbound receiver; a later open must not start another.
|
||||
async fn take_outbound_once<T>(slot: &tokio::sync::Mutex<Option<tokio::sync::mpsc::UnboundedReceiver<T>>>) -> Option<tokio::sync::mpsc::UnboundedReceiver<T>> {
|
||||
async fn take_outbound_once<T>(slot: &tokio::sync::Mutex<Option<T>>) -> Option<T> {
|
||||
slot.lock().await.take()
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user