mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c461db10a4 | ||
|
|
4c86c7f782 | ||
|
|
81e9ccfa05 | ||
|
|
c0abdeae72 | ||
|
|
1dad755823 | ||
|
|
fcfd2b6717 | ||
|
|
73c503a244 | ||
|
|
3bce605eaa |
No files matched your search
Generated
+1
-1
@@ -2772,7 +2772,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.46"
|
version = "0.2.48"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ab_glyph",
|
"ab_glyph",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.46"
|
version = "0.2.48"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
|
|||||||
+12
-1
@@ -25,6 +25,14 @@
|
|||||||
|
|
||||||
## Appearance / 外观
|
## Appearance / 外观
|
||||||
|
|
||||||
|
Launcher icons use the system icon theme instead of emoji glyphs, so they do not depend on emoji font coverage.
|
||||||
|
|
||||||
|
Signed-in graphical hosts report the system wallpaper for disconnected device cards in official clients
|
||||||
|
(no desktop-window screenshot). GNOME/Cinnamon, KDE, Xfce and Omarchy on Hyprland are supported (following the current wallpaper); 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.
|
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`).
|
The choice is saved to `$XDG_CONFIG_HOME/uuremote/theme` (default `~/.config/uuremote/theme`).
|
||||||
|
|
||||||
@@ -151,7 +159,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 |
|
| 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 |
|
| HDR | Not implemented |
|
||||||
| Super screen / virtual display | Not implemented |
|
| Super screen / virtual display | Not implemented |
|
||||||
| 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) |
|
| Privacy screen on the host | Experimental, KDE Plasma Wayland (portal) only; off, picture and screen-off status labels verified with Mac 4.43.0; `UU_PRIVACY_AUTO=picture` / `screen-off` enables it automatically on desktop connect; see [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||||
| Microphone (viewer audio played on the host) | Not implemented (needs a virtual sound card) |
|
| 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 |
|
| 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 |
|
| 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 +466,7 @@ flowchart LR
|
|||||||
|
|
||||||
## Security and privacy
|
## 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.
|
- 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
|
- 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.
|
once with PAM; it is never written to disk or logs.
|
||||||
@@ -604,6 +613,8 @@ separate from the host `uuremote-server`; the default host build and behaviour a
|
|||||||
terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsdl2-dev`, then
|
terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsdl2-dev`, then
|
||||||
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
||||||
|
|
||||||
|
Key combinations use the left/right modifier state attached to each SDL key event. Focus loss releases remote keys; after focus returns, the next non-modifier key restores any still-held Shift/Ctrl/Alt/Win (Command on Mac). This is built in, with no adapter or setting required.
|
||||||
|
|
||||||
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
||||||
On niri, data-control-capable `wl-clipboard` is used instead, so synchronization does not require window focus.
|
On niri, data-control-capable `wl-clipboard` is used instead, so synchronization does not require window focus.
|
||||||
Other SDL backends synchronize only while that window is focused. The 30 KiB text limit applies. Selections without a supported
|
Other SDL backends synchronize only while that window is focused. The 30 KiB text limit applies. Selections without a supported
|
||||||
|
|||||||
@@ -21,6 +21,10 @@
|
|||||||
|
|
||||||
## 外观 / Appearance
|
## 外观 / Appearance
|
||||||
|
|
||||||
|
启动器图标使用系统主题的符号图标,避免缺少 emoji 字体时显示方框。
|
||||||
|
|
||||||
|
已登录的图形主机会上报系统壁纸,供官方客户端的设备卡片在未连接时显示背景图(不是桌面窗口截图)。支持 GNOME/Cinnamon、KDE、Xfce 和 Hyprland 下的 Omarchy(自动跟随当前壁纸);每 60 秒检查一次,内容不变则不重复上传。其他桌面可用 `UU_WALLPAPER=/绝对路径/图片.png` 指定 PNG/JPEG/WebP;`UU_WALLPAPER_UPLOAD=0` 关闭。访客和无桌面模式跳过上报。协议依据与限制见 [设备壁纸上报](docs/wallpaper-protocol.md)。
|
||||||
|
|
||||||
在控制端的 **设置 → 常规 → 外观**,或主机 / 工具窗口的齿轮设置按钮中选择 **跟随系统 / 浅色 / 深色**(默认跟随系统)。
|
在控制端的 **设置 → 常规 → 外观**,或主机 / 工具窗口的齿轮设置按钮中选择 **跟随系统 / 浅色 / 深色**(默认跟随系统)。
|
||||||
选择保存在 `$XDG_CONFIG_HOME/uuremote/theme`(默认 `~/.config/uuremote/theme`)。
|
选择保存在 `$XDG_CONFIG_HOME/uuremote/theme`(默认 `~/.config/uuremote/theme`)。
|
||||||
|
|
||||||
@@ -136,7 +140,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,并如实回报给客户端 |
|
| 真彩(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 | 未实现 |
|
| HDR | 未实现 |
|
||||||
| 超级屏 / 虚拟显示器 | 未实现 |
|
| 超级屏 / 虚拟显示器 | 未实现 |
|
||||||
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal);Mac 4.43.0 已验证不启用、隐私屏保、关闭显示屏三种状态回显,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal);Mac 4.43.0 已验证不启用、隐私屏保、关闭显示屏三种状态回显;`UU_PRIVACY_AUTO=picture` / `screen-off` 可在桌面连接时自动开启,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||||
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
||||||
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
||||||
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
||||||
@@ -402,6 +406,7 @@ flowchart LR
|
|||||||
|
|
||||||
## 安全与隐私
|
## 安全与隐私
|
||||||
|
|
||||||
|
- 已登录的图形主机默认会将当前壁纸图片上传到 UU 的文件服务,供设备卡片显示背景;可用 `UU_WALLPAPER_UPLOAD=0` 关闭上传。
|
||||||
- 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。
|
- 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。
|
||||||
- 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。
|
- 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。
|
||||||
- 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。
|
- 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。
|
||||||
@@ -530,6 +535,8 @@ xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
|||||||
`ffmpeg` 命令;SDL 桌面窗口直接同步文本剪贴板(Wayland/X11),无需额外剪贴板工具;终端功能需要本机终端程序(可用 `TERMINAL` 指定)。
|
`ffmpeg` 命令;SDL 桌面窗口直接同步文本剪贴板(Wayland/X11),无需额外剪贴板工具;终端功能需要本机终端程序(可用 `TERMINAL` 指定)。
|
||||||
从源码构建:`sudo apt install libsdl2-dev`,然后 `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`。
|
从源码构建:`sudo apt install libsdl2-dev`,然后 `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`。
|
||||||
|
|
||||||
|
组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。
|
||||||
|
|
||||||
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
||||||
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
||||||
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
||||||
|
|||||||
+32
-16
@@ -73,6 +73,14 @@ static GtkWidget *label(const char *text, const char *cls) {
|
|||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
static GtkWidget *button(const char *text, const char *cls) { GtkWidget *b = gtk_button_new_with_label(text); if (cls) add_class(b, cls); return b; }
|
static GtkWidget *button(const char *text, const char *cls) { GtkWidget *b = gtk_button_new_with_label(text); if (cls) add_class(b, cls); return b; }
|
||||||
|
static GtkWidget *icon(const char *name, int size) {
|
||||||
|
GtkWidget *image = gtk_image_new_from_icon_name(name, GTK_ICON_SIZE_BUTTON);
|
||||||
|
gtk_image_set_pixel_size(GTK_IMAGE(image), size); return image;
|
||||||
|
}
|
||||||
|
static GtkWidget *icon_button(const char *text, const char *name, const char *cls) {
|
||||||
|
GtkWidget *b = button(text, cls); gtk_button_set_image(GTK_BUTTON(b), icon(name, 17));
|
||||||
|
gtk_button_set_always_show_image(GTK_BUTTON(b), TRUE); return b;
|
||||||
|
}
|
||||||
static GtkWidget *hbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing); }
|
static GtkWidget *hbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing); }
|
||||||
static GtkWidget *vbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); }
|
static GtkWidget *vbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); }
|
||||||
static GtkWidget *platform_icon(int platform, int online) {
|
static GtkWidget *platform_icon(int platform, int online) {
|
||||||
@@ -124,10 +132,12 @@ static void open_more(void) {
|
|||||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(10);
|
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(10);
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(box), 22);
|
gtk_container_set_border_width(GTK_CONTAINER(box), 22);
|
||||||
gtk_box_pack_start(GTK_BOX(box), label(L("更多工具", "More tools"), "h2"), FALSE, FALSE, 6);
|
gtk_box_pack_start(GTK_BOX(box), label(L("更多工具", "More tools"), "h2"), FALSE, FALSE, 6);
|
||||||
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), L("⏻ 远程开机", "⏻ Wake on LAN"), L("↻ 重启", "↻ Restart"), L("⏻ 关机", "⏻ Shut down"), L("🗑 删除设备", "🗑 Remove device")};
|
const char *names[] = {L("文件传输", "File transfer"), L("观看模式", "Watch mode"), L("终端", "Terminal"), L("端口映射", "Port mapping"), L("远程开机", "Wake on LAN"), L("重启", "Restart"), L("关机", "Shut down"), L("删除设备", "Remove device")};
|
||||||
|
const char *icons[] = {"folder-symbolic", "media-playback-start-symbolic", "utilities-terminal-symbolic", "network-wired-symbolic", "computer-symbolic", "view-refresh-symbolic", "system-shutdown-symbolic", "user-trash-symbolic"};
|
||||||
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
|
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
|
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
|
||||||
|
gtk_box_pack_start(GTK_BOX(line), icon(icons[i], 20), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(names[i], "devname"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(line), label(names[i], "devname"), TRUE, TRUE, 0);
|
||||||
gtk_box_pack_end(GTK_BOX(line), label("›", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(line), label("›", "hint"), FALSE, FALSE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(b), line);
|
gtk_container_add(GTK_CONTAINER(b), line);
|
||||||
@@ -224,7 +234,8 @@ static void on_card(GtkButton *b, gpointer index) { (void)b; show_device(GPOINTE
|
|||||||
|
|
||||||
static GtkWidget *nav_row(const char *icon, const char *text, const char *kind) {
|
static GtkWidget *nav_row(const char *icon, const char *text, const char *kind) {
|
||||||
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(10);
|
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(10);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(icon, "devname"), FALSE, FALSE, 0);
|
GtkWidget *image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON);
|
||||||
|
gtk_box_pack_start(GTK_BOX(line), image, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(text, "devname"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(line), label(text, "devname"), TRUE, TRUE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(row), line);
|
gtk_container_add(GTK_CONTAINER(row), line);
|
||||||
g_object_set_data_full(G_OBJECT(row), "kind", g_strdup(kind), g_free);
|
g_object_set_data_full(G_OBJECT(row), "kind", g_strdup(kind), g_free);
|
||||||
@@ -298,7 +309,7 @@ static gboolean apply_devices(gpointer d) {
|
|||||||
gtk_box_pack_start(GTK_BOX(all_box), card, FALSE, FALSE, 4);
|
gtk_box_pack_start(GTK_BOX(all_box), card, FALSE, FALSE, 4);
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&d_lock);
|
pthread_mutex_unlock(&d_lock);
|
||||||
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("◼", L("全部设备", "All devices"), "all"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("view-grid-symbolic", L("全部设备", "All devices"), "all"), -1);
|
||||||
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
|
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
|
||||||
return G_SOURCE_REMOVE;
|
return G_SOURCE_REMOVE;
|
||||||
}
|
}
|
||||||
@@ -367,9 +378,10 @@ static GtkWidget *build_device(void) {
|
|||||||
gtk_overlay_add_overlay(GTK_OVERLAY(preview), enter);
|
gtk_overlay_add_overlay(GTK_OVERLAY(preview), enter);
|
||||||
gtk_box_pack_start(GTK_BOX(page), preview, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), preview, FALSE, FALSE, 0);
|
||||||
GtkWidget *tools = hbox(0); add_class(tools, "toolbar");
|
GtkWidget *tools = hbox(0); add_class(tools, "toolbar");
|
||||||
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
const char *names[] = {L("文件传输", "File transfer"), L("观看模式", "Watch mode"), L("终端", "Terminal"), L("端口映射", "Port mapping"), L("更多", "More")}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
||||||
|
const char *tool_icons[] = {"folder-symbolic", "media-playback-start-symbolic", "utilities-terminal-symbolic", "network-wired-symbolic", "view-more-symbolic"};
|
||||||
for (int i = 0; i < 5; i++) {
|
for (int i = 0; i < 5; i++) {
|
||||||
GtkWidget *b = button(names[i], "tool");
|
GtkWidget *b = icon_button(names[i], tool_icons[i], "tool");
|
||||||
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
|
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
|
||||||
gtk_box_pack_start(GTK_BOX(tools), b, i < 4, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(tools), b, i < 4, TRUE, 0);
|
||||||
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
|
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
|
||||||
@@ -581,7 +593,7 @@ static void open_settings(void) {
|
|||||||
GtkWidget *gscroll = gtk_scrolled_window_new(NULL, NULL);
|
GtkWidget *gscroll = gtk_scrolled_window_new(NULL, NULL);
|
||||||
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gscroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gscroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||||
gtk_container_add(GTK_CONTAINER(gscroll), general);
|
gtk_container_add(GTK_CONTAINER(gscroll), general);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), gscroll, "general", L("⚙ 常规", "⚙ General"));
|
gtk_stack_add_titled(GTK_STACK(tabs), gscroll, "general", L("常规", "General"));
|
||||||
// 安全
|
// 安全
|
||||||
GtkWidget *security = settings_page();
|
GtkWidget *security = settings_page();
|
||||||
const char *verify[] = {L("仅使用临时验证码", "Temporary code only"), L("仅使用自定义验证码", "Custom code only"), L("临时与自定义验证码", "Temporary and custom codes")};
|
const char *verify[] = {L("仅使用临时验证码", "Temporary code only"), L("仅使用自定义验证码", "Custom code only"), L("临时与自定义验证码", "Temporary and custom codes")};
|
||||||
@@ -593,7 +605,7 @@ static void open_settings(void) {
|
|||||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s1, 2), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(security), settings_card(s1, 2), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s2, 1), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(security), settings_card(s2, 1), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s3, 1), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(security), settings_card(s3, 1), FALSE, FALSE, 0);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("🔒 安全", "🔒 Security"));
|
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("安全", "Security"));
|
||||||
// 键盘
|
// 键盘
|
||||||
GtkWidget *keys = settings_page();
|
GtkWidget *keys = settings_page();
|
||||||
gtk_box_pack_start(GTK_BOX(keys), label(L("仅控制端响应的快捷键", "Viewer-only shortcuts"), "h2"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(keys), label(L("仅控制端响应的快捷键", "Viewer-only shortcuts"), "h2"), FALSE, FALSE, 0);
|
||||||
@@ -608,13 +620,13 @@ static void open_settings(void) {
|
|||||||
for (int i = 0; i < 8; i++) k2[i] = setting_row(fns[i], NULL, edit_button(fns[i]));
|
for (int i = 0; i < 8; i++) k2[i] = setting_row(fns[i], NULL, edit_button(fns[i]));
|
||||||
gtk_box_pack_start(GTK_BOX(keys), settings_card(k2, 8), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(keys), settings_card(k2, 8), FALSE, FALSE, 0);
|
||||||
GtkWidget *kscroll = gtk_scrolled_window_new(NULL, NULL); gtk_container_add(GTK_CONTAINER(kscroll), keys);
|
GtkWidget *kscroll = gtk_scrolled_window_new(NULL, NULL); gtk_container_add(GTK_CONTAINER(kscroll), keys);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), kscroll, "keys", L("⌨ 键盘", "⌨ Keyboard"));
|
gtk_stack_add_titled(GTK_STACK(tabs), kscroll, "keys", L("键盘", "Keyboard"));
|
||||||
// 网络
|
// 网络
|
||||||
GtkWidget *network = settings_page();
|
GtkWidget *network = settings_page();
|
||||||
const char *proxy[] = {L("使用系统环境代理", "Use system proxy"), L("不使用代理", "No proxy")};
|
const char *proxy[] = {L("使用系统环境代理", "Use system proxy"), L("不使用代理", "No proxy")};
|
||||||
GtkWidget *n1[] = { setting_row(L("代理设置", "Proxy"), NULL, combo(proxy, 2)) };
|
GtkWidget *n1[] = { setting_row(L("代理设置", "Proxy"), NULL, combo(proxy, 2)) };
|
||||||
gtk_box_pack_start(GTK_BOX(network), settings_card(n1, 1), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(network), settings_card(n1, 1), FALSE, FALSE, 0);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), network, "network", L("🌐 网络", "🌐 Network"));
|
gtk_stack_add_titled(GTK_STACK(tabs), network, "network", L("网络", "Network"));
|
||||||
gtk_box_pack_start(GTK_BOX(root), tabs, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(root), tabs, TRUE, TRUE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(settings_window), root);
|
gtk_container_add(GTK_CONTAINER(settings_window), root);
|
||||||
gtk_widget_show_all(settings_window);
|
gtk_widget_show_all(settings_window);
|
||||||
@@ -669,18 +681,21 @@ static void *run(void *arg) {
|
|||||||
GtkWidget *side = vbox(0); add_class(side, "sidebar"); gtk_widget_set_size_request(side, 270, -1);
|
GtkWidget *side = vbox(0); add_class(side, "sidebar"); gtk_widget_set_size_request(side, 270, -1);
|
||||||
my_section = vbox(0);
|
my_section = vbox(0);
|
||||||
GtkWidget *mh = hbox(8); gtk_widget_set_margin_start(mh, 18); gtk_widget_set_margin_top(mh, 22); gtk_widget_set_margin_bottom(mh, 6);
|
GtkWidget *mh = hbox(8); gtk_widget_set_margin_start(mh, 18); gtk_widget_set_margin_top(mh, 22); gtk_widget_set_margin_bottom(mh, 6);
|
||||||
gtk_box_pack_start(GTK_BOX(mh), label(L("⧉ 我的设备", "⧉ My devices"), "section"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(mh), icon("computer-symbolic", 17), FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(mh), label(L("我的设备", "My devices"), "section"), TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
|
||||||
device_list = gtk_list_box_new(); g_signal_connect(device_list, "row-activated", G_CALLBACK(on_row), NULL);
|
device_list = gtk_list_box_new(); g_signal_connect(device_list, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(my_section), device_list, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(my_section), device_list, FALSE, FALSE, 0);
|
||||||
GtkWidget *scroll = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
GtkWidget *scroll = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||||
GtkWidget *side_inner = vbox(0); gtk_box_pack_start(GTK_BOX(side_inner), my_section, FALSE, FALSE, 0);
|
GtkWidget *side_inner = vbox(0); gtk_box_pack_start(GTK_BOX(side_inner), my_section, FALSE, FALSE, 0);
|
||||||
GtkWidget *welcome_nav = gtk_list_box_new(); g_signal_connect(welcome_nav, "row-activated", G_CALLBACK(on_row), NULL);
|
GtkWidget *welcome_nav = gtk_list_box_new(); g_signal_connect(welcome_nav, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
GtkWidget *ah = label(L("⧉ 远程协助", "⧉ Remote assistance"), "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
GtkWidget *ah = hbox(8); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
||||||
|
gtk_box_pack_start(GTK_BOX(ah), icon("network-workgroup-symbolic", 17), FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(ah), label(L("远程协助", "Remote assistance"), "section"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
|
||||||
GtkWidget *assist = assist_list = gtk_list_box_new(); g_signal_connect(assist, "row-activated", G_CALLBACK(on_row), NULL);
|
GtkWidget *assist = assist_list = gtk_list_box_new(); g_signal_connect(assist, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("◧", L("开始协助", "Start assistance"), "assist"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("network-workgroup-symbolic", L("开始协助", "Start assistance"), "assist"), -1);
|
||||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("★", L("收藏设备", "Favorites"), "favorite"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("starred-symbolic", L("收藏设备", "Favorites"), "favorite"), -1);
|
||||||
gtk_box_pack_start(GTK_BOX(side_inner), assist, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(side_inner), assist, FALSE, FALSE, 0);
|
||||||
gtk_list_box_unselect_all(GTK_LIST_BOX(assist));
|
gtk_list_box_unselect_all(GTK_LIST_BOX(assist));
|
||||||
(void)welcome_nav;
|
(void)welcome_nav;
|
||||||
@@ -691,12 +706,13 @@ static void *run(void *arg) {
|
|||||||
GtkWidget *main = vbox(0), *header = hbox(10); add_class(header, "header");
|
GtkWidget *main = vbox(0), *header = hbox(10); add_class(header, "header");
|
||||||
badge = gtk_label_new(""); add_class(badge, "badge");
|
badge = gtk_label_new(""); add_class(badge, "badge");
|
||||||
title_label = label(L("全部设备", "All devices"), "title");
|
title_label = label(L("全部设备", "All devices"), "title");
|
||||||
more_button = button("⋮", "hbtn"); g_signal_connect(more_button, "clicked", G_CALLBACK(on_more), NULL);
|
more_button = icon_button("", "view-more-symbolic", "hbtn"); gtk_widget_set_tooltip_text(more_button, L("设备信息", "Device information")); g_signal_connect(more_button, "clicked", G_CALLBACK(on_more), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(header), more_button, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), more_button, FALSE, FALSE, 0);
|
||||||
const char *icons[] = {"☰", "◉", "🔔"}, *kinds[] = {"menu", "account", "notice"};
|
const char *icons[] = {"open-menu-symbolic", "avatar-default-symbolic", "preferences-system-notifications-symbolic"}, *kinds[] = {"menu", "account", "notice"};
|
||||||
for (int i = 0; i < 3; i++) { GtkWidget *b = button(icons[i], "hbtn"); g_signal_connect(b, "clicked", G_CALLBACK(popup), (gpointer)kinds[i]); gtk_box_pack_end(GTK_BOX(header), b, FALSE, FALSE, 0); }
|
const char *tips[] = {L("菜单", "Menu"), L("账号", "Account"), L("通知", "Notifications")};
|
||||||
|
for (int i = 0; i < 3; i++) { GtkWidget *b = icon_button("", icons[i], "hbtn"); gtk_widget_set_tooltip_text(b, tips[i]); g_signal_connect(b, "clicked", G_CALLBACK(popup), (gpointer)kinds[i]); gtk_box_pack_end(GTK_BOX(header), b, FALSE, FALSE, 0); }
|
||||||
gtk_box_pack_start(GTK_BOX(main), header, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(main), header, FALSE, FALSE, 0);
|
||||||
GtkWidget *overlay = gtk_overlay_new();
|
GtkWidget *overlay = gtk_overlay_new();
|
||||||
stack = gtk_stack_new();
|
stack = gtk_stack_new();
|
||||||
|
|||||||
@@ -44,6 +44,20 @@ is aimed at the virtual output's region. Needs GTK3.
|
|||||||
`UU_PRIVACY_BLOCK_INPUT=0` to keep local input. KWin saves the device flag, so a `privacy-guard`
|
`UU_PRIVACY_BLOCK_INPUT=0` to keep local input. KWin saves the device flag, so a `privacy-guard`
|
||||||
child restores devices and outputs from the record whenever the host ends, including SIGKILL; the
|
child restores devices and outputs from the record whenever the host ends, including SIGKILL; the
|
||||||
next start retries too. Devices plugged in during privacy are not blocked.
|
next start retries too. Devices plugged in during privacy are not blocked.
|
||||||
|
- 自动开启:`UU_PRIVACY_AUTO=picture`(或 `2`)在第一个桌面控制端连上后自动启用隐私屏保,
|
||||||
|
`UU_PRIVACY_AUTO=screen-off`(或 `3`)自动关屏;默认关闭。远程协助(访客)的桌面会话同样适用。
|
||||||
|
控制端自己的请求优先:一次会话里只要客户端发过隐私请求(包括连接刚建立、会话计数还没开始的
|
||||||
|
那一刻),待执行的自动开启就不再触发;断开后照常恢复。主机不支持或依赖缺失时只记日志,不影响连接。
|
||||||
|
自动开启后主机会向控制端推送一次 SystemMetrics 和 SystemStateChange,控制端菜单随之更新。支持的主机上,
|
||||||
|
每次桌面连接也会先推送一次当前状态(关闭时为关闭),这是新增的主动上报。
|
||||||
|
Auto: `UU_PRIVACY_AUTO=picture` (or `2`) enables picture mode when the first desktop controller
|
||||||
|
connects; `screen-off` (or `3`) turns the physical screens off. Off by default. Remote-assistance
|
||||||
|
(guest) desktop sessions are covered too. The viewer's own request wins for that session, including
|
||||||
|
one that arrives right after the connection opens and before the session counter starts: a pending
|
||||||
|
auto-enable then does not run, and a disconnect restores as usual. Unsupported hosts or missing
|
||||||
|
tools only log; the connection is unaffected. After an auto-enable the host pushes SystemMetrics
|
||||||
|
and SystemStateChange once, so the viewer's menu follows; on supported hosts every desktop
|
||||||
|
connection also pushes the current state first (off when it is off), which is new outbound traffic.
|
||||||
- 这是尽力而为的遮挡,不是保密边界。/ This is best-effort obscuring, not a confidentiality boundary.
|
- 这是尽力而为的遮挡,不是保密边界。/ This is best-effort obscuring, not a confidentiality boundary.
|
||||||
- 恢复记录保存在配置文件旁的 `privacy-power.json`(0600);崩溃后下次启动重新启用记录的物理屏。
|
- 恢复记录保存在配置文件旁的 `privacy-power.json`(0600);崩溃后下次启动重新启用记录的物理屏。
|
||||||
若主机无法启动,可在本机终端执行 `kscreen-doctor output.<name>.enable`。
|
若主机无法启动,可在本机终端执行 `kscreen-doctor output.<name>.enable`。
|
||||||
|
|||||||
@@ -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,19 @@
|
|||||||
|
防窥模式可在连接时自动开启,查看端组合键和启动器图标修复,信令失败日志更易诊断。/ Optional auto-enabled privacy screen, viewer modifier and launcher icon fixes, and clearer signaling failure logs.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **连接时自动开启防窥(#161,感谢 @RiverOnVenus)**:设置 `UU_PRIVACY_AUTO=picture`(隐私屏保)或 `screen-off`(关闭显示屏),第一个桌面控制端连上后自动开启;默认关闭。控制端自己的防窥请求优先,不覆盖已保存的偏好;远程协助会话同样适用。仅 KDE Plasma Wayland(portal)。
|
||||||
|
Set `UU_PRIVACY_AUTO=picture` or `screen-off` to enable the privacy screen when the first desktop controller connects (off by default). The viewer's own request wins and the saved preference is not overwritten; remote-assistance sessions are covered too. KDE Plasma Wayland (portal) only.
|
||||||
|
- **Omarchy 壁纸自动发现(#157,感谢 @ferstar)**:Hyprland 下的 Omarchy 自动跟随当前壁纸上报。/ Omarchy on Hyprland reports its current background automatically.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **查看端组合键(#163/#165,感谢 @Zhenqiang-Weng)**:窗口失焦再聚焦后,仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)在下一次按键前恢复,不再丢失修饰键。/ The native viewer restores still-held modifiers after a focus change.
|
||||||
|
- **启动器图标(#158,感谢 @Zhenqiang-Weng)**:改用系统主题符号图标,缺少 emoji 字体时不再显示方框。/ Launcher icons use the system icon theme instead of emoji glyphs.
|
||||||
|
- **信令连接失败日志(#166)**:记录脱敏后的失败原因(类别或 HTTP 状态码,不含 token 和地址),区分服务端拒绝与网络问题。/ Signaling connection failures now log a sanitized reason (category or HTTP status).
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;防窥自动开启由贡献者在 KDE Plasma 6 Wayland + iOS 客户端实机验证。查看端修复为合成事件测试,未做 Mac 主机实机验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.48_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.48-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.48`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
# 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 and unsupported formats are not inferred.
|
||||||
|
On Hyprland, Omarchy's `omarchy/current/background` link is read from `XDG_STATE_HOME`
|
||||||
|
(default `~/.local/state`), falling back to the older `XDG_CONFIG_HOME` location
|
||||||
|
(default `~/.config`). Wallpaper/theme changes are followed on the next check.
|
||||||
|
Other compositor-specific wallpaper daemons 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.
|
||||||
+6
-2
@@ -5,6 +5,7 @@ mod ws_transport;
|
|||||||
mod engine_plugin;
|
mod engine_plugin;
|
||||||
mod doctor;
|
mod doctor;
|
||||||
mod wol;
|
mod wol;
|
||||||
|
mod wallpaper;
|
||||||
mod desktop_backend;
|
mod desktop_backend;
|
||||||
mod desktop_mode;
|
mod desktop_mode;
|
||||||
mod desktop_session;
|
mod desktop_session;
|
||||||
@@ -775,6 +776,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
client
|
client
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let mut wallpaper_task = AbortOnDrop(wallpaper::start(auth.clone()));
|
||||||
// One peer per viewer connection (desktop, file transfer, terminal...), keyed by ice_id.
|
// 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 next_capture_type: Option<(u64,crate::session_ice::SessionIce)> = None;
|
||||||
let mut capture_types: HashMap<String, (u64,crate::session_ice::SessionIce)> = HashMap::new();
|
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");
|
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));
|
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));
|
auth = Arc::new(UUAuthClient::new(login::wait_for_credentials(stale).await));
|
||||||
|
wallpaper_task.0.abort();
|
||||||
|
wallpaper_task = AbortOnDrop(wallpaper::start(auth.clone()));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -851,8 +855,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
Arc::new(cli)
|
Arc::new(cli)
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let _ = e;
|
// ws_transport errors carry only a category or HTTP status, never the token or URL.
|
||||||
log::error!("Failed to connect signaling; retrying in 5s (details omitted)");
|
log::error!("Failed to connect signaling; retrying in 5s: {e}");
|
||||||
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -883,6 +883,10 @@ pub fn monitor_key(connector: &str) -> String { permissions::monitor_key(connect
|
|||||||
pub fn register(session: &Arc<PortalSession>) {
|
pub fn register(session: &Arc<PortalSession>) {
|
||||||
*ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Arc::downgrade(session));
|
*ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Arc::downgrade(session));
|
||||||
}
|
}
|
||||||
|
/// Whether a desktop capture session is registered for monitor/virtual switching.
|
||||||
|
pub fn available() -> bool {
|
||||||
|
ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade).is_some()
|
||||||
|
}
|
||||||
/// Privacy screen: see `Session::set_virtual`. Restoring without a live session is a no-op;
|
/// Privacy screen: see `Session::set_virtual`. Restoring without a live session is a no-op;
|
||||||
/// failures switching a live session must reach the controller so its recovery record survives.
|
/// failures switching a live session must reach the controller so its recovery record survives.
|
||||||
pub fn set_virtual_active(on: bool) -> Result<(), String> {
|
pub fn set_virtual_active(on: bool) -> Result<(), String> {
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ static STATE: Mutex<State> = Mutex::new(State { sessions: 0, active: None });
|
|||||||
static ACTIVE: AtomicBool = AtomicBool::new(false);
|
static ACTIVE: AtomicBool = AtomicBool::new(false);
|
||||||
static PICTURE: AtomicBool = AtomicBool::new(false);
|
static PICTURE: AtomicBool = AtomicBool::new(false);
|
||||||
static POINTER: Mutex<Option<[f64; 4]>> = Mutex::new(None);
|
static POINTER: Mutex<Option<[f64; 4]>> = Mutex::new(None);
|
||||||
|
/// Set by any viewer RPC 7 during the current desktop sessions and cleared when the last one
|
||||||
|
/// ends. An auto-enable never overrides it, including an RPC that arrives after the connection
|
||||||
|
/// opens but before `session_started` bumps the counter.
|
||||||
|
static VIEWER_OVERRIDE: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
pub fn supported() -> bool { backend::detect().is_some() }
|
pub fn supported() -> bool { backend::detect().is_some() }
|
||||||
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
||||||
@@ -80,7 +84,9 @@ fn save_preference(mode: Mode) {
|
|||||||
if let Err(e) = crate::system_actions::merge_save(|s| s.privacy_type = Some(mode.wire_type())) { log::warn!("Privacy mode not saved: {e}"); }
|
if let Err(e) = crate::system_actions::merge_save(|s| s.privacy_type = Some(mode.wire_type())) { log::warn!("Privacy mode not saved: {e}"); }
|
||||||
}
|
}
|
||||||
/// RPC 7: `mode` is None for an unknown privacy_type.
|
/// RPC 7: `mode` is None for an unknown privacy_type.
|
||||||
fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> {
|
fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> { set_inner(enable, mode, true) }
|
||||||
|
/// `save` records the viewer's preference; the auto-enable path must not overwrite it.
|
||||||
|
fn set_inner(enable: bool, mode: Option<Mode>, save: bool) -> Result<(), String> {
|
||||||
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
|
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
|
||||||
if !enable { return leave(&mut state); }
|
if !enable { return leave(&mut state); }
|
||||||
let mode = mode.ok_or("unsupported privacy type")?;
|
let mode = mode.ok_or("unsupported privacy type")?;
|
||||||
@@ -89,7 +95,7 @@ fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> {
|
|||||||
// A failed rollback keeps the record and the guard: the next request, exit or start retries.
|
// A failed rollback keeps the record and the guard: the next request, exit or start retries.
|
||||||
if result.is_err() { if let Err(e) = leave(&mut state) { log::warn!("Privacy rollback failed: {e}"); } }
|
if result.is_err() { if let Err(e) = leave(&mut state) { log::warn!("Privacy rollback failed: {e}"); } }
|
||||||
drop(state);
|
drop(state);
|
||||||
if result.is_ok() { save_preference(mode); }
|
if result.is_ok() && save { save_preference(mode); }
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
/// Why RPC 7 cannot be served at all; checked before answering.
|
/// Why RPC 7 cannot be served at all; checked before answering.
|
||||||
@@ -119,21 +125,83 @@ pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option
|
|||||||
pub const REPORT_ERROR: i32 = -7;
|
pub const REPORT_ERROR: i32 = -7;
|
||||||
impl Accepted {
|
impl Accepted {
|
||||||
pub fn apply(self) -> Result<(), String> {
|
pub fn apply(self) -> Result<(), String> {
|
||||||
|
VIEWER_OVERRIDE.store(true, Ordering::Relaxed);
|
||||||
let result = set(self.enable, self.mode);
|
let result = set(self.enable, self.mode);
|
||||||
if let Err(e) = &result { log::warn!("Privacy request failed: enable={} mode={:?}: {e}", self.enable, self.mode); }
|
if let Err(e) = &result { log::warn!("Privacy request failed: enable={} mode={:?}: {e}", self.enable, self.mode); }
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn session_started() { if let Ok(mut s) = STATE.lock() { s.sessions += 1; } }
|
/// `UU_PRIVACY_AUTO` accepts `picture`/`2` and `screen-off`/`3`; anything else leaves the viewer
|
||||||
|
/// in charge (and so does the viewer's own RPC 7, which cancels a pending auto-enable).
|
||||||
|
fn parse_auto(value: &str) -> Option<Mode> {
|
||||||
|
match value.trim().to_ascii_lowercase().as_str() {
|
||||||
|
"2" | "picture" => Some(Mode::Picture),
|
||||||
|
"3" | "screen-off" | "screen_off" => Some(Mode::ScreenOff),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn auto_mode() -> Option<Mode> { std::env::var("UU_PRIVACY_AUTO").ok().as_deref().and_then(parse_auto) }
|
||||||
|
/// Enter the auto mode with the viewer-override check inside the STATE lock, so a request that
|
||||||
|
/// lands between the caller's check and this lock still wins. Ok(false): the viewer overrode it.
|
||||||
|
fn auto_set(mode: Mode) -> Result<bool, String> {
|
||||||
|
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
|
||||||
|
if VIEWER_OVERRIDE.load(Ordering::Relaxed) { return Ok(false); }
|
||||||
|
if state.sessions == 0 { return Err("no active desktop session".into()); }
|
||||||
|
let result = enter(&mut state, mode);
|
||||||
|
if result.is_err() { if let Err(e) = leave(&mut state) { log::warn!("Privacy rollback failed: {e}"); } }
|
||||||
|
result.map(|_| true)
|
||||||
|
}
|
||||||
|
/// The capture session and the viewer's CONTROL state need a moment after the peer connects;
|
||||||
|
/// retry while the portal session is still missing, and let the viewer's RPC 7 win if it arrives.
|
||||||
|
fn auto_enable(mode: Mode) {
|
||||||
|
for attempt in 1..=5 {
|
||||||
|
if VIEWER_OVERRIDE.load(Ordering::Relaxed) {
|
||||||
|
log::info!("Privacy auto: skipped, the viewer already chose a mode");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Not a failure yet: the desktop capture opens its portal session a moment after the peer
|
||||||
|
// connects, and entering without it would roll back and log a restore for nothing.
|
||||||
|
if !crate::portal::available() {
|
||||||
|
log::info!("Privacy auto: waiting for the desktop capture (attempt {attempt})");
|
||||||
|
std::thread::sleep(std::time::Duration::from_secs(1));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
match auto_set(mode) {
|
||||||
|
Ok(true) => { log::info!("Privacy auto: enabled mode={mode:?} on attempt {attempt}"); return; }
|
||||||
|
Ok(false) => { log::info!("Privacy auto: skipped, the viewer already chose a mode"); return; }
|
||||||
|
Err(e) if e.contains("no active desktop session") => return,
|
||||||
|
Err(e) if e.contains("Portal desktop unavailable") => {
|
||||||
|
log::info!("Privacy auto: desktop capture not ready (attempt {attempt})");
|
||||||
|
std::thread::sleep(std::time::Duration::from_secs(1));
|
||||||
|
}
|
||||||
|
Err(e) => { log::warn!("Privacy auto failed: {e}"); return; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
log::warn!("Privacy auto: giving up; the viewer can still enable the privacy screen");
|
||||||
|
}
|
||||||
|
pub fn session_started() {
|
||||||
|
let auto = auto_mode();
|
||||||
|
let first = STATE.lock().ok().is_some_and(|mut s| { s.sessions += 1; s.sessions == 1 });
|
||||||
|
let Some(mode) = auto else { return };
|
||||||
|
if !first { return; }
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(1500));
|
||||||
|
auto_enable(mode);
|
||||||
|
});
|
||||||
|
}
|
||||||
pub fn session_ended() {
|
pub fn session_ended() {
|
||||||
if let Ok(mut s) = STATE.lock() {
|
if let Ok(mut s) = STATE.lock() {
|
||||||
s.sessions = s.sessions.saturating_sub(1);
|
s.sessions = s.sessions.saturating_sub(1);
|
||||||
if s.sessions == 0 { if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); } }
|
if s.sessions == 0 {
|
||||||
|
VIEWER_OVERRIDE.store(false, Ordering::Relaxed);
|
||||||
|
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn shutdown() {
|
pub fn shutdown() {
|
||||||
if let Ok(mut s) = STATE.lock() {
|
if let Ok(mut s) = STATE.lock() {
|
||||||
s.sessions = 0;
|
s.sessions = 0;
|
||||||
|
VIEWER_OVERRIDE.store(false, Ordering::Relaxed);
|
||||||
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
|
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -167,6 +235,17 @@ pub fn cover_main(args: &[String]) -> i32 { cover::main(args) }
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
|
#[test]
|
||||||
|
fn parses_auto_privacy_modes() {
|
||||||
|
use super::{parse_auto, Mode};
|
||||||
|
assert_eq!(parse_auto("picture"), Some(Mode::Picture));
|
||||||
|
assert_eq!(parse_auto("2"), Some(Mode::Picture));
|
||||||
|
assert_eq!(parse_auto(" screen-off "), Some(Mode::ScreenOff));
|
||||||
|
assert_eq!(parse_auto("3"), Some(Mode::ScreenOff));
|
||||||
|
assert_eq!(parse_auto("0"), None);
|
||||||
|
assert_eq!(parse_auto("off"), None);
|
||||||
|
assert_eq!(parse_auto(""), None);
|
||||||
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn enabling_without_a_backend_is_refused_and_reports_off() {
|
fn enabling_without_a_backend_is_refused_and_reports_off() {
|
||||||
let bytes = [10, 2, 8, 42, 58, 4, 8, 1, 16, 3];
|
let bytes = [10, 2, 8, 42, 58, 4, 8, 1, 16, 3];
|
||||||
|
|||||||
+1
-1
@@ -248,7 +248,7 @@ impl SignalingClient {
|
|||||||
let mut req = ws_url
|
let mut req = ws_url
|
||||||
.clone()
|
.clone()
|
||||||
.into_client_request()
|
.into_client_request()
|
||||||
.map_err(|e| format!("Invalid WS request: {}", e))?;
|
.map_err(|_| "Invalid WS request".to_string())?;
|
||||||
|
|
||||||
req.headers_mut().insert(
|
req.headers_mut().insert(
|
||||||
"X-NRD-AUTH",
|
"X-NRD-AUTH",
|
||||||
|
|||||||
+85
-1
@@ -345,7 +345,13 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
|||||||
if !repeat{*files=true;messages.extend(input.release_all());}None
|
if !repeat{*files=true;messages.extend(input.release_all());}None
|
||||||
},
|
},
|
||||||
_ if !*focused || !input.enabled()=>None,
|
_ if !*focused || !input.enabled()=>None,
|
||||||
Event::KeyDown{scancode:Some(s),repeat:false,..}=>input.key(s as i32,true),
|
Event::KeyDown{scancode:Some(s),keymod,repeat:false,..}=>{
|
||||||
|
// FocusLost releases remote keys, while a modifier may remain physically held.
|
||||||
|
// SDL_Keysym.mod is the event-time snapshot: restore it before the next key,
|
||||||
|
// without querying the final state of a whole polled batch or typing text.
|
||||||
|
if !(224..=231).contains(&(s as i32)){messages.extend(sync_modifiers(input,keymod));}
|
||||||
|
input.key(s as i32,true)
|
||||||
|
},
|
||||||
Event::KeyUp{scancode:Some(s),..}=>input.key(s as i32,false),
|
Event::KeyUp{scancode:Some(s),..}=>input.key(s as i32,false),
|
||||||
Event::MouseMotion{x,y,..}=>viewport.motion(x as f64,y as f64),
|
Event::MouseMotion{x,y,..}=>viewport.motion(x as f64,y as f64),
|
||||||
Event::MouseButtonDown{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,true)),
|
Event::MouseButtonDown{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,true)),
|
||||||
@@ -366,6 +372,18 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
|||||||
} (quit,messages)
|
} (quit,messages)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn sync_modifiers(input:&mut Input,keymod:sdl2::keyboard::Mod)->Vec<serde_json::Value>{
|
||||||
|
use sdl2::keyboard::Mod as M;
|
||||||
|
let modifiers=[(224,M::LCTRLMOD),(225,M::LSHIFTMOD),(226,M::LALTMOD),(227,M::LGUIMOD),
|
||||||
|
(228,M::RCTRLMOD),(229,M::RSHIFTMOD),(230,M::RALTMOD),(231,M::RGUIMOD)];
|
||||||
|
let mut out=Vec::new();
|
||||||
|
// Release stale modifiers before pressing new ones. Input deduplicates transitions.
|
||||||
|
// Caps/Num/Scroll Lock and MODE are not physical held modifiers.
|
||||||
|
for down in [false,true]{for (scan,flag) in modifiers{
|
||||||
|
if keymod.contains(flag)==down{out.extend(input.key(scan,down));}
|
||||||
|
}}out
|
||||||
|
}
|
||||||
|
|
||||||
fn needs_redraw(event:&Event)->bool{
|
fn needs_redraw(event:&Event)->bool{
|
||||||
matches!(event,Event::Window{win_event:WindowEvent::SizeChanged(..)|WindowEvent::Resized(..)|WindowEvent::Exposed|WindowEvent::Maximized|WindowEvent::Restored,..})
|
matches!(event,Event::Window{win_event:WindowEvent::SizeChanged(..)|WindowEvent::Resized(..)|WindowEvent::Exposed|WindowEvent::Maximized|WindowEvent::Restored,..})
|
||||||
}
|
}
|
||||||
@@ -709,6 +727,72 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)] mod modifier_tests {
|
||||||
|
use super::*;
|
||||||
|
use sdl2::keyboard::{Scancode as S,Mod as M};
|
||||||
|
fn key(scan:S,down:bool,mods:M)->Event{
|
||||||
|
if down{Event::KeyDown{timestamp:0,window_id:1,keycode:None,scancode:Some(scan),keymod:mods,repeat:false}}
|
||||||
|
else{Event::KeyUp{timestamp:0,window_id:1,keycode:None,scancode:Some(scan),keymod:mods,repeat:false}}
|
||||||
|
}
|
||||||
|
fn focus(event:WindowEvent)->Event{Event::Window{timestamp:0,window_id:1,win_event:event}}
|
||||||
|
fn send(input:&mut Input,focused:&mut bool,events:impl IntoIterator<Item=Event>)->Vec<serde_json::Value>{
|
||||||
|
translate(events,input,Viewport::fit((800,600),(1920,1080)),focused).1
|
||||||
|
}
|
||||||
|
fn codes(messages:&[serde_json::Value])->Vec<(&str,i64)>{
|
||||||
|
messages.iter().map(|m|(m["action"].as_str().unwrap(),m["key"].as_i64().unwrap())).collect()
|
||||||
|
}
|
||||||
|
#[test] fn held_left_and_right_modifiers_recover_after_focus_return(){
|
||||||
|
for mac in [false,true]{for (scan,flag) in [(S::LCtrl,M::LCTRLMOD),(S::LShift,M::LSHIFTMOD),
|
||||||
|
(S::LAlt,M::LALTMOD),(S::LGui,M::LGUIMOD),(S::RCtrl,M::RCTRLMOD),(S::RShift,M::RSHIFTMOD),
|
||||||
|
(S::RAlt,M::RALTMOD),(S::RGui,M::RGUIMOD)]{
|
||||||
|
let code=|scan:S|i64::from(if mac{super::super::input::mac_keycode(scan as i32)}else{super::super::input::windows_vk(scan as i32)}.unwrap());
|
||||||
|
let mut input=Input::default();input.set_mac(mac);let mut focused=true;
|
||||||
|
let out=send(&mut input,&mut focused,[key(scan,true,flag),focus(WindowEvent::FocusLost)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_press",code(scan)),("kbd_release",code(scan))]);
|
||||||
|
assert!(!focused);
|
||||||
|
let out=send(&mut input,&mut focused,[focus(WindowEvent::FocusGained),key(S::Num2,true,flag),
|
||||||
|
key(S::Num2,false,flag),key(scan,false,M::NOMOD)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_press",code(scan)),("kbd_press",code(S::Num2)),
|
||||||
|
("kbd_release",code(S::Num2)),("kbd_release",code(scan))]);
|
||||||
|
assert!(input.release_all().is_empty());
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
#[test] fn combined_snapshot_releases_stale_modifiers_before_new_chord(){
|
||||||
|
let mut input=Input::default();input.set_mac(true);let mut focused=true;
|
||||||
|
send(&mut input,&mut focused,[key(S::LShift,true,M::LSHIFTMOD),key(S::RGui,true,M::LSHIFTMOD|M::RGUIMOD)]);
|
||||||
|
let mods=M::RSHIFTMOD|M::LCTRLMOD|M::LALTMOD;
|
||||||
|
let out=send(&mut input,&mut focused,[key(S::A,true,mods),key(S::A,false,mods),
|
||||||
|
key(S::B,true,M::NOMOD),key(S::B,false,M::NOMOD)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_release",56),("kbd_release",54),
|
||||||
|
("kbd_press",59),("kbd_press",58),("kbd_press",60),("kbd_press",0),("kbd_release",0),
|
||||||
|
("kbd_release",59),("kbd_release",58),("kbd_release",60),("kbd_press",11),("kbd_release",11)]);
|
||||||
|
assert!(input.release_all().is_empty());
|
||||||
|
}
|
||||||
|
#[test] fn complete_chords_and_overlapping_letters_are_not_duplicated(){
|
||||||
|
let mut input=Input::default();input.set_mac(true);let mut focused=true;
|
||||||
|
let mods=M::LSHIFTMOD|M::RSHIFTMOD;
|
||||||
|
let out=send(&mut input,&mut focused,[key(S::LShift,true,M::LSHIFTMOD),key(S::RShift,true,mods),
|
||||||
|
key(S::A,true,mods),key(S::B,true,mods),key(S::A,false,mods),key(S::LShift,false,M::RSHIFTMOD),
|
||||||
|
key(S::B,false,M::RSHIFTMOD),key(S::RShift,false,M::NOMOD)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_press",56),("kbd_press",60),("kbd_press",0),("kbd_press",11),
|
||||||
|
("kbd_release",0),("kbd_release",56),("kbd_release",11),("kbd_release",60)]);
|
||||||
|
assert!(input.release_all().is_empty());
|
||||||
|
}
|
||||||
|
#[test] fn snapshot_is_event_time_and_does_not_create_lock_or_view_only_keys(){
|
||||||
|
let mut input=Input::default();let mut focused=true;
|
||||||
|
let out=send(&mut input,&mut focused,[key(S::Num2,true,M::LSHIFTMOD|M::CAPSMOD|M::NUMMOD|M::MODEMOD),
|
||||||
|
key(S::Num2,false,M::LSHIFTMOD),key(S::A,true,M::NOMOD),key(S::A,false,M::NOMOD)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_press",0xa0),("kbd_press",0x32),("kbd_release",0x32),
|
||||||
|
("kbd_release",0xa0),("kbd_press",0x41),("kbd_release",0x41)]);
|
||||||
|
for watch in [false,true]{
|
||||||
|
let mut input=Input::new(watch);let mut focused=false;
|
||||||
|
assert!(send(&mut input,&mut focused,[key(S::A,true,M::LSHIFTMOD)]).is_empty());
|
||||||
|
if watch{assert!(send(&mut input,&mut focused,[focus(WindowEvent::FocusGained),key(S::A,true,M::LSHIFTMOD)]).is_empty());}
|
||||||
|
assert!(input.release_all().is_empty());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)] mod tests {
|
#[cfg(test)] mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
#[cfg_attr(target_os="macos",ignore)]
|
#[cfg_attr(target_os="macos",ignore)]
|
||||||
|
|||||||
@@ -0,0 +1,473 @@
|
|||||||
|
//! 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.split(':').any(|name| name == "hyprland") {
|
||||||
|
let home = std::env::var_os("HOME").map(PathBuf::from);
|
||||||
|
let xdg = |name, fallback| std::env::var_os(name).map(PathBuf::from)
|
||||||
|
.filter(|p| p.is_absolute()).or_else(|| home.as_ref().map(|p| p.join(fallback)));
|
||||||
|
return omarchy_background(xdg("XDG_STATE_HOME", ".local/state").as_deref(),
|
||||||
|
xdg("XDG_CONFIG_HOME", ".config").as_deref()).await;
|
||||||
|
}
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
// Omarchy maintains this link when changing wallpaper/theme. Prefer its current
|
||||||
|
// XDG state location, while supporting older installations using XDG config.
|
||||||
|
async fn omarchy_background(state: Option<&std::path::Path>, config: Option<&std::path::Path>) -> Option<PathBuf> {
|
||||||
|
for root in [state, config].into_iter().flatten() {
|
||||||
|
let path = root.join("omarchy/current/background");
|
||||||
|
if tokio::fs::metadata(&path).await.is_ok_and(|meta| meta.is_file()) { 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 omarchy_follows_current_wallpaper_links_and_supports_legacy_location() {
|
||||||
|
use std::os::unix::fs::symlink;
|
||||||
|
let root = std::env::temp_dir().join(format!("uu-omarchy-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||||
|
let state = root.join("custom-state");
|
||||||
|
let config = root.join("custom-config");
|
||||||
|
for dir in [&state, &config] { std::fs::create_dir_all(dir.join("omarchy/current")).unwrap(); }
|
||||||
|
let current = state.join("omarchy/current/background");
|
||||||
|
let legacy = config.join("omarchy/current/background");
|
||||||
|
let first = root.join("first.png");
|
||||||
|
let second = root.join("second.jpg");
|
||||||
|
std::fs::write(&first, b"\x89PNG\r\n\x1a\n").unwrap();
|
||||||
|
std::fs::write(&second, b"\xff\xd8\xff").unwrap();
|
||||||
|
symlink(&second, &legacy).unwrap();
|
||||||
|
let detect = || omarchy_background(Some(&state), Some(&config));
|
||||||
|
assert_eq!(detect().await, Some(legacy.clone()));
|
||||||
|
symlink(&first, ¤t).unwrap();
|
||||||
|
assert_eq!(detect().await, Some(current.clone()));
|
||||||
|
assert_eq!(read_image(&detect().await.unwrap()).await.unwrap(), std::fs::read(&first).unwrap());
|
||||||
|
std::fs::remove_file(¤t).unwrap(); symlink(&second, ¤t).unwrap();
|
||||||
|
assert_eq!(read_image(&detect().await.unwrap()).await.unwrap(), std::fs::read(&second).unwrap());
|
||||||
|
std::fs::remove_file(¤t).unwrap(); symlink(root.join("missing"), ¤t).unwrap();
|
||||||
|
assert_eq!(detect().await, Some(legacy.clone()));
|
||||||
|
std::fs::remove_file(¤t).unwrap(); symlink(&root, ¤t).unwrap();
|
||||||
|
assert_eq!(detect().await, Some(legacy.clone()));
|
||||||
|
std::fs::remove_file(&legacy).unwrap();
|
||||||
|
assert_eq!(detect().await, None);
|
||||||
|
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()); }
|
||||||
|
}
|
||||||
|
}
|
||||||
+15
-1
@@ -1002,6 +1002,7 @@ impl WebRtcSession {
|
|||||||
// Default file-transfer folder: the desktop user's home directory.
|
// Default file-transfer folder: the desktop user's home directory.
|
||||||
let home = std::env::var("HOME").unwrap_or_else(|_| "/".into());
|
let home = std::env::var("HOME").unwrap_or_else(|_| "/".into());
|
||||||
let (mut desktop, mut promoted, mut lock_reported) = (desktop, false, desktop);
|
let (mut desktop, mut promoted, mut lock_reported) = (desktop, false, desktop);
|
||||||
|
let mut privacy_reported = false;
|
||||||
let mut screen = screen;
|
let mut screen = screen;
|
||||||
loop {
|
loop {
|
||||||
loop {
|
loop {
|
||||||
@@ -1056,11 +1057,20 @@ impl WebRtcSession {
|
|||||||
if !lock_reported {
|
if !lock_reported {
|
||||||
lock_reported = true;
|
lock_reported = true;
|
||||||
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
||||||
|
}
|
||||||
|
// The viewer's menu only learns about a mode it did not ask for (an
|
||||||
|
// auto-enable) from this push, so desktop peers need it too, not only a
|
||||||
|
// tool peer promoted to desktop.
|
||||||
|
if !privacy_reported && crate::privacy_screen::supported() {
|
||||||
|
privacy_reported = true;
|
||||||
let (channel, sequence, actions) = (channel.clone(), sequence.clone(), init_actions.clone());
|
let (channel, sequence, actions) = (channel.clone(), sequence.clone(), init_actions.clone());
|
||||||
let portal = portal_desktop.clone();
|
let portal = portal_desktop.clone();
|
||||||
let text_out = text_out.clone();
|
let text_out = text_out.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
let mut previous = crate::privacy_screen::current_type();
|
// 0 is not a wire type: the first tick must push the effective state.
|
||||||
|
// An auto-enable can land before this task starts, and the viewer
|
||||||
|
// never sent an RPC to learn the mode from a response.
|
||||||
|
let mut previous = 0u8;
|
||||||
let mut tick = tokio::time::interval(std::time::Duration::from_secs(1));
|
let mut tick = tokio::time::interval(std::time::Duration::from_secs(1));
|
||||||
loop {
|
loop {
|
||||||
tick.tick().await;
|
tick.tick().await;
|
||||||
@@ -1068,6 +1078,7 @@ impl WebRtcSession {
|
|||||||
let current = crate::privacy_screen::current_type();
|
let current = crate::privacy_screen::current_type();
|
||||||
if current == previous { continue; }
|
if current == previous { continue; }
|
||||||
previous = current;
|
previous = current;
|
||||||
|
log::info!("Privacy state change pushed: type={current}");
|
||||||
let permission = portal.as_ref().map_or(crate::system_metrics::Permission::Allow, |p| p.snapshot().permission(true));
|
let permission = portal.as_ref().map_or(crate::system_metrics::Permission::Allow, |p| p.snapshot().permission(true));
|
||||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
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 payload = actions.metrics_payload(desktop_sound, permission);
|
||||||
@@ -1075,6 +1086,9 @@ impl WebRtcSession {
|
|||||||
text_out.metrics(message.clone());
|
text_out.metrics(message.clone());
|
||||||
if channel.send(&bytes::Bytes::from(message)).await.is_err() { return; }
|
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);
|
let state = crate::privacy_screen::state_message(sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts);
|
||||||
|
// Android 4.43.0 handles privacy replies on TEXT; CONTROL stays for
|
||||||
|
// viewers that only read the desktop channel.
|
||||||
|
let _ = text_out.send(state.clone());
|
||||||
if channel.send(&bytes::Bytes::from(state)).await.is_err() { return; }
|
if channel.send(&bytes::Bytes::from(state)).await.is_err() { return; }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user