Feature: Add remote lock screen for Android hosts

Implement the Ctrl+Alt+Del path on Android as a system lock screen.
Android has no secure attention sequence, so COMMAND_SCREEN_CTRL_ALT_DEL
is mapped in the client to GLOBAL_ACTION_LOCK_SCREEN and the server
exposes it as the new MCP tool remote_lock_screen.

The Android client resolves ControlService.lockScreen()/canLockScreen()
in nativeInit and dispatches the command from the screen sub-connection
through the usual attach/detach JNI path. The lock action is posted to
the accessibility service handler because performGlobalAction must not
run on the receiver thread.

Login advertises the new CLIENT_CAP_LOCK_SCREEN bit only when the
accessibility service is bound and the API level is 28+, so the server
can reject old APKs and Windows/Linux hosts up front instead of
reporting a lock that never happened. There is no receipt: a successful
call only means the command was delivered, and the tool description
tells the caller to confirm with get_screenshot.

Server side adds the schema and handler next to remote_clipboard, audits
the call, and gates it on client type plus the capability bit. Since it
is the only APK-only tool, check_platform_table.py gains a documented
exemption from the Windows baseline invariant, and make_tools_json.py
learns an APK-only platform set. tools.json is regenerated from the live
server and the plan document now counts 62 tools.

Co-Authored-By: deepseek-flash
This commit is contained in:
yuanyuanxianganddeepseek-flash committed 2026-11-11 20:59:10 +01:00
1 parent 0a0b709e8a
commit fd1b085279
11 files changed
+264 -14

No files matched your search

+5
View File
@@ -23,6 +23,7 @@ extern uint64_t g_myClientID;
// 定义在 main.cpp,供子连接的 OnReceive 调用
extern void DispatchControlEvent(uint32_t msgVal, uint64_t wParam, int32_t ptX, int32_t ptY);
extern void DispatchClipboardText(const uint8_t* data, size_t size);
extern void DispatchLockScreen();
// Linux/macOS 共用的 BITMAPINFOHEADER 布局(与 Windows 完全一致)
#pragma pack(push, 1)
@@ -129,6 +130,10 @@ public:
// 同步会带 '\0' 结尾,MCP 路径不带,Kotlin 侧统一去掉尾随 NUL)
if (size > 1) DispatchClipboardText(data + 1, (size_t)size - 1);
break;
case COMMAND_SCREEN_CTRL_ALT_DEL:
// Ctrl+Alt+Del 在 Android 无对应键,客户端映射为锁屏(GLOBAL_ACTION_LOCK_SCREEN)
DispatchLockScreen();
break;
case COMMAND_SCREEN_CONTROL: {
// 服务端通过子连接下发鼠标/键盘控制包(MSG64 固定 48 字节)
// 坐标从 lParam(offset 24)读取,与 Windows/Linux/macOS 客户端一致:
+56 -2
View File
@@ -235,6 +235,8 @@ static jclass g_ctrlClass = nullptr;
static jmethodID g_ctrlMethod = nullptr;
static jmethodID g_getActiveWindowMid = nullptr;
static jmethodID g_activityTitleMid = nullptr; // ControlService.currentActivityTitle()
static jmethodID g_lockScreenMid = nullptr; // ControlService.lockScreen()V — COMMAND_SCREEN_CTRL_ALT_DEL
static jmethodID g_canLockMid = nullptr; // ControlService.canLockScreen()Z — 登录前能力探测
// CaptureService.requestIdr() / forceFirstFrame() — ScreenSpyThread 子连接建立后触发
static jclass g_captureClass = nullptr;
static jmethodID g_requestIdrMid = nullptr;
@@ -329,6 +331,29 @@ void DispatchClipboardText(const uint8_t* data, size_t size)
if (attached) g_jvm->DetachCurrentThread();
}
// 锁屏:服务端下发 COMMAND_SCREEN_CTRL_ALT_DEL(Android 无此组合键,映射为
// GLOBAL_ACTION_LOCK_SCREEN)。与 DispatchClipboardText 同一套 attach/detach 套路。
void DispatchLockScreen()
{
if (!g_jvm || !g_ctrlClass || !g_lockScreenMid) {
LOGE("LOCK_SCREEN: JNI not ready (cls=%p method=%p)", g_ctrlClass, g_lockScreenMid);
return;
}
JNIEnv* jenv = nullptr;
bool attached = false;
jint st = g_jvm->GetEnv((void**)&jenv, JNI_VERSION_1_6);
if (st == JNI_EDETACHED) {
if (g_jvm->AttachCurrentThread(&jenv, nullptr) != JNI_OK || !jenv) return;
attached = true;
} else if (st != JNI_OK || !jenv) {
return;
}
jenv->CallStaticVoidMethod(g_ctrlClass, g_lockScreenMid);
if (jenv->ExceptionCheck()) jenv->ExceptionClear();
LOGI("LOCK_SCREEN: dispatched");
if (attached) g_jvm->DetachCurrentThread();
}
static std::string GetActiveWindowFromJava()
{
if (!g_jvm || !g_ctrlClass || !g_getActiveWindowMid) return "Android";
@@ -757,6 +782,27 @@ static bool ScreenPreviewAvailable()
return can == JNI_TRUE;
}
// 登录前探测:无障碍服务在跑且 API 28+ 才声明 CLIENT_CAP_LOCK_SCREEN,
// 服务端据此放行 remote_lock_screen。与 ScreenPreviewAvailable 一样随每次登录刷新,
// 无障碍被关掉重连后会撤回,避免服务端假报「已锁上」。
static bool LockScreenAvailable()
{
if (!g_jvm || !g_ctrlClass || !g_canLockMid) return false;
JNIEnv* jenv = nullptr;
bool attached = false;
jint st = g_jvm->GetEnv((void**)&jenv, JNI_VERSION_1_6);
if (st == JNI_EDETACHED) {
if (g_jvm->AttachCurrentThread(&jenv, nullptr) != JNI_OK || !jenv) return false;
attached = true;
} else if (st != JNI_OK || !jenv) {
return false;
}
jboolean can = jenv->CallStaticBooleanMethod(g_ctrlClass, g_canLockMid);
if (jenv->ExceptionCheck()) { jenv->ExceptionClear(); can = JNI_FALSE; }
if (attached) g_jvm->DetachCurrentThread();
return can == JNI_TRUE;
}
// 抓屏可能耗几十~几百毫秒(系统回调 + 编码),必须离开接收线程;超额请求直接丢弃
// (服务端会超时按「预览不可用」降级,与 Linux/Windows 的限流一致)。
static void ScreenPreviewThread(ScreenPreviewReq req)
@@ -1224,9 +1270,11 @@ static void ConnectionThread(uint64_t gen)
RefreshLoginTls(logInfo); // 传输方式可能已热切换,登录前刷新 RES_TLS
#endif
// 屏幕预览能力位按运行时状态刷新:无障碍服务在跑才声明(API 30+ 的 takeScreenshot),
// 服务端据此放行 get_screenshot;无障碍被关掉后重连会撤回,避免服务端白等抓屏
// 服务端据此放行 get_screenshot;无障碍被关掉后重连会撤回,避免服务端白等抓屏。
// 锁屏同理:无障碍服务在跑且 API 28+ 才声明。
logInfo.SetCaps(LOGIN_INFOR::DefaultCaps() |
(ScreenPreviewAvailable() ? CLIENT_CAP_SCREEN_PREVIEW : 0));
(ScreenPreviewAvailable() ? CLIENT_CAP_SCREEN_PREVIEW : 0) |
(LockScreenAvailable() ? CLIENT_CAP_LOCK_SCREEN : 0));
client->SendLoginInfo(logInfo.Speed(clock() - c));
g_lastHeartbeatAckMs.store(GetUnixMs(), std::memory_order_relaxed);
LOGI("Connected & login sent");
@@ -1392,6 +1440,12 @@ Java_com_yama_client_YamaBridge_nativeInit(
g_activityTitleMid = env->GetStaticMethodID(g_ctrlClass, "currentActivityTitle", "()Ljava/lang/String;");
if (env->ExceptionCheck()) { env->ExceptionClear(); g_activityTitleMid = nullptr; }
if (!g_activityTitleMid) LOGE("ControlService.currentActivityTitle not found");
g_lockScreenMid = env->GetStaticMethodID(g_ctrlClass, "lockScreen", "()V");
if (env->ExceptionCheck()) { env->ExceptionClear(); g_lockScreenMid = nullptr; }
if (!g_lockScreenMid) LOGE("ControlService.lockScreen not found");
g_canLockMid = env->GetStaticMethodID(g_ctrlClass, "canLockScreen", "()Z");
if (env->ExceptionCheck()) { env->ExceptionClear(); g_canLockMid = nullptr; }
if (!g_canLockMid) LOGE("ControlService.canLockScreen not found");
} else {
LOGE("ControlService class not found");
}
@@ -71,6 +71,36 @@ class ControlService : AccessibilityService() {
return text.filterNot { it in '\uD800'..'\uDFFF' }
}
/**
* 登录前探测(C++ 侧据此决定是否声明 CLIENT_CAP_LOCK_SCREEN):锁屏依赖无障碍
* 服务在跑(performGlobalAction)与 API 28+,两者缺一就如实不声明,免得服务端
* 把「命令已下发」当成「已锁上」。
*/
@JvmStatic
fun canLockScreen(): Boolean =
instance != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
/**
* 服务端 COMMAND_SCREEN_CTRL_ALT_DEL:Android 没有 Ctrl+Alt+Del 这个组合键,
* 客户端映射成「锁屏」(GLOBAL_ACTION_LOCK_SCREEN,API 28+)。调用方是屏幕
* 子连接的 OnReceive 线程,performGlobalAction 必须在主线程,故 post 过去。
*/
@JvmStatic
fun lockScreen() {
val svc = instance ?: run {
Log.w(TAG, "lockScreen: accessibility service inactive, command dropped")
return
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
Log.w(TAG, "lockScreen: GLOBAL_ACTION_LOCK_SCREEN needs API 28+")
return
}
svc.handler.post {
if (!svc.performGlobalAction(GLOBAL_ACTION_LOCK_SCREEN))
Log.w(TAG, "lockScreen: performGlobalAction rejected by the system")
}
}
// ── Screen geometry (set by CaptureService) ──────────────────────
// Server sends coords in encoding space [0, encW) × [0, encH).
// We map them to physical screen space before dispatching.
+3
View File
@@ -145,6 +145,7 @@ inline int isValid_10s()
#define CLIENT_CAP_SCREEN_REGION 0x0200 // 支持 COMMAND_SCREEN_PREVIEW_REQ 扩展(区域/窗口/显示器原生分辨率截图)
#define CLIENT_CAP_APK_UPDATE 0x0400 // 支持接收 COMMAND_UPDATE 下发的 APK 并走系统安装器(仅 Android)
#define CLIENT_CAP_SCREEN_CLIPBOARD 0x0800 // 屏幕子连接处理 COMMAND_SCREEN_SET_CLIPBOARD,并把 VK_V 映射成 ACTION_PASTE(仅新版 Android)
#define CLIENT_CAP_LOCK_SCREEN 0x1000 // 屏幕子连接处理 COMMAND_SCREEN_CTRL_ALT_DEL(Android 映射为锁屏 GLOBAL_ACTION_LOCK_SCREEN)
#define TALK_DLG_MAXLEN 1024 // 最大输入字符长度
@@ -1304,6 +1305,8 @@ typedef struct LOGIN_INFOR {
// 屏幕子连接写剪贴板(COMMAND_SCREEN_SET_CLIPBOARD)+ VK_V → ACTION_PASTE。
// 更老的 APK 两个分支都没有,收到包只会丢弃,服务端据此提前拒绝而不是假报 ok。
caps |= CLIENT_CAP_SCREEN_CLIPBOARD;
// 锁屏(COMMAND_SCREEN_CTRL_ALT_DEL → GLOBAL_ACTION_LOCK_SCREEN)依赖无障碍服务
// 与 API 28+,和其它运行时能力一样由 main.cpp 登录前探测后追加,不在默认位里声明。
#endif
return caps;
}
+9 -9
View File
@@ -49,28 +49,28 @@
## 1. 现状盘点
### 1.1 工具族(60 个)
### 1.1 工具族(62 个)
登记表在 `server/2015Remote/McpInternal.cpp:375` 的 `kToolHints[]`(60 项,与下表的工具逐条对应)。
登记表在 `server/2015Remote/McpInternal.cpp:479` 的 `kToolHints[]`(62 项,与下表的工具逐条对应)。
下表是 P11 之后的口径;写作时是 54 个、8 个族,P10-B 加 3 个(文件系统写)、P10-C 加 1 个
(`remote_block_input`)、P11 加 2 个(`mcp_list_sessions` / `mcp_cancel_session`)。
| 族 | 数 | 工具 | 门控条件 |
|---|---|---|---|
| 服务端本机只读 | 9 | `list_online_hosts` `search_hosts` `list_all_hosts` `get_host_detail` `get_activity_history` `get_audit_log` `get_server_status` `mcp_list_sessions` `mcp_cancel_session` | 全部始终在列表里、只读模式下照常可用;`mcp_list_sessions` / `mcp_cancel_session` 还**不受任何开关或只读限制**(卡住请求的唯一出路,见附录 D.5) |
| 主机只读 | 21 | `list_processes` `list_windows` `list_files` `list_services` `get_client_log` `get_keylog` `get_screenshot` `list_registry` `download_file` `search_file` `list_network_connections` + `host_list_*`(10 个标签页) | 除下列四类外始终在列表里:`get_keylog` 需 `McpKeylog=1`(其 `clear` / `set_offline` 还需 `McpReadonly=0`)、`download_file` 需 `McpFileTransfer=1`、`list_network_connections` 与 `host_list_*` 需 `McpMachine=1` |
| 主机只读 | 22 | `list_processes` `list_windows` `list_files` `list_services` `get_client_log` `get_keylog` `get_screenshot` `list_registry` `download_file` `search_file` `list_network_connections` + `host_list_*`(10 个标签页)+ `host_get_hosts_file` | 除下列四类外始终在列表里:`get_keylog` 需 `McpKeylog=1`(其 `clear` / `set_offline` 还需 `McpReadonly=0`)、`download_file` 需 `McpFileTransfer=1`、`list_network_connections` 与 `host_list_*` 需 `McpMachine=1` |
| 终端 | 4 | `terminal_open` `terminal_exec` `terminal_close` `exec_command` | `terminal_*`:`McpTerminal=1` **且** `McpReadonly=0`;`exec_command` 只要求 `McpReadonly=0` |
| 远程控制 | 6 | `remote_open` `remote_close` `remote_mouse` `remote_keyboard` `remote_clipboard` `remote_block_input` | `McpRemoteControl=1` **且** `McpReadonly=0` |
| 远程控制 | 7 | `remote_open` `remote_close` `remote_mouse` `remote_keyboard` `remote_clipboard` `remote_lock_screen` `remote_block_input` | `McpRemoteControl=1` **且** `McpReadonly=0` |
| 文件传输 | 2 | `upload_file` `copy_files_c2c` | `McpFileTransfer=1` **且** `McpReadonly=0`(`download_file` 只要求此开关) |
| 文件系统写 | 3 | `delete_path` `move_path` `create_folder` | `McpFileWrite=1` **且** `McpReadonly=0` |
| 设备管理 | 4 | `kill_process` `operate_window` `control_service` `power_action` | `McpManage=1` **且** `McpReadonly=0` |
| 主机/连接管理 | 7 | `kill_network_connection` `host_control_process` `host_control_window` `host_control_service` `host_control_task` `host_set_remark` `host_set_watch_level` | 前 5 个:`McpMachine=1` + `McpMachineDangerous=1` + `McpReadonly=0`;`host_set_remark` / `host_set_watch_level` 始终在列表里,调用要求 `McpReadonly=0` |
| 远程交谈 | 4 | `chat_open` `chat_send` `chat_wait` `chat_close` | `McpChat=1`(与 `McpReadonly` 无关) |
合计 9+21+4+6+2+3+4+7+4 = 60。默认配置(`McpReadonly=1`、其余开关 0)下 `tools/list` **19 个**
合计 9+22+4+7+2+3+4+7+4 = 62。默认配置(`McpReadonly=1`、其余开关 0)下 `tools/list` **19 个**
= 服务端本机只读 9 + 主机只读 8(去掉 `get_keylog` / `download_file` / `list_network_connections` /
`host_list_*`)+ 主机/连接管理 2(`host_set_remark` / `host_set_watch_level`);其余各族依赖开关,全部不可见。
开关全开且关闭只读时为 **60 个**。
开关全开且关闭只读时为 **62 个**。
**已有的工程范式**(新工具直接复用,不必重新设计):
@@ -122,7 +122,7 @@
| 屏幕截图 | `COMMAND_SCREEN_PREVIEW_REQ` | ✅ `get_screenshot` | — |
| 鼠标 / 键盘 / 剪贴板写 | `COMMAND_SCREEN_CONTROL` + `MSG64` | ✅ `remote_*` | — |
| **锁定对端键鼠** | `COMMAND_SCREEN_BLOCK_INPUT`(2 字节) | ❌ **缺** | **零客户端改动**(无回包) |
| 黑屏 / Ctrl+Alt+Del | `COMMAND_SCREEN_BLANK` / `COMMAND_SCREEN_CTRL_ALT_DEL` | ❌ | **客户端未实现**,需客户端改动 |
| 黑屏 / Ctrl+Alt+Del | `COMMAND_SCREEN_BLANK` / `COMMAND_SCREEN_CTRL_ALT_DEL` | Ctrl+Alt+Del → ✅ `remote_lock_screen`(仅 Android,映射为锁屏);黑屏 ❌ | 黑屏**客户端未实现**,需客户端改动 |
| 窗口级 / 区域捕获 | `COMMAND_SCREEN_WINDOW` / `COMMAND_SCREEN_ROI` | ❌ | 流式接口,需评估(见 §4.2) |
| 注册表读 | `COMMAND_REGEDIT` + `COMMAND_REG_FIND` | ✅ `list_registry`(子键 + 值) | — |
| **注册表写** | 无命令 | ❌ | **需客户端改动** |
@@ -547,7 +547,7 @@ P10-C(`3d388f8`)加工具时索性去掉数字——避免每加一个工具
| 写 hosts 文件 | `CREATE_ALWAYS` 整文件覆盖 + 无回包,误操作导致目标机 DNS 全断 |
| 卸载软件 | `WinExec` 卸载串,无回包、可能弹 UAC 阻塞,无法确认结果 |
| 清除事件日志 / 隐藏开网页 / 卸载后门 | 当前 Windows 客户端**未实现**这些命令(死命令) |
| `Ctrl+Alt+Del` / 黑屏 | 客户端未实现,需客户端改动 |
| `Ctrl+Alt+Del` / 黑屏 | 黑屏客户端未实现;`Ctrl+Alt+Del` 只在 Android 上映射为锁屏(`remote_lock_screen`),Windows 侧要发 SAR 需要 SYSTEM/UIAccess,本轮不做 |
| 10 个 `host_list_*` 合并为 1 个 | 体积收益 20%,discoverability 损失更大(见 §5.11) |
---
@@ -576,7 +576,7 @@ COMMAND_WEBCAM / COMMAND_AUDIO→ 流式音视频 client/K
> 已排除 `COMMAND_PROCESS_FREEZING` / `COMMAND_PROCESS_THAW`——它们**已被 `host_control_process` 使用**
> (`McpMachine.cpp:2107`),不属于缺口。
**定义了但 Windows 客户端未实现**(不可用):`COMMAND_CLEAN_EVENT`、`COMMAND_OPEN_URL_HIDE`、`COMMAND_OPEN_URL_SHOW`、`COMMAND_REMOVE`、`COMMAND_SCREEN_CTRL_ALT_DEL`、`COMMAND_SCREEN_BLANK`。
**定义了但 Windows 客户端未实现**(不可用):`COMMAND_CLEAN_EVENT`、`COMMAND_OPEN_URL_HIDE`、`COMMAND_OPEN_URL_SHOW`、`COMMAND_REMOVE`、`COMMAND_SCREEN_CTRL_ALT_DEL`(Android 已实现,映射为锁屏)、`COMMAND_SCREEN_BLANK`。
---
+32 -1
View File
@@ -15,7 +15,7 @@
],
"version": 2,
"protocolVersion": "2025-06-18",
"toolCount": 61,
"toolCount": 62,
"tools": [
{
"name": "list_online_hosts",
@@ -2727,6 +2727,37 @@
"type": "object"
}
},
{
"name": "remote_lock_screen",
"description": "把远程 Android 主机锁屏。报文是 COMMAND_SCREEN_CTRL_ALT_DEL(客户端的 Ctrl+Alt+Del 命令,目前只有 Android 实现:没有该组合键,客户端映射为系统的 GLOBAL_ACTION_LOCK_SCREEN)。需先 remote_open 建立会话;锁定后锁屏界面会挡住后续注入,要继续操作得先有人解锁(密码/指纹)。没有回执:ok 只代表命令已下发,实际是否锁上取决于系统策略(例如已设置设备管理器策略、部分定制 ROM 可能忽略),请随后用 get_screenshot 确认。只有声明 CLIENT_CAP_LOCK_SCREEN 的新版 APK 支持,老 APK 与 Windows/Linux 主机返回 -32005。",
"gate": "remote_control",
"write": true,
"platforms": [
"apk"
],
"impl": "mfc",
"inputSchema": {
"properties": {
"id": {
"description": "主机 id,取 list_online_hosts / search_hosts 返回的 id 字段",
"type": "string"
},
"session_id": {
"description": "remote_open 返回的 session_id",
"type": "string"
}
},
"required": [
"id",
"session_id"
],
"type": "object"
},
"outputSchema": {
"properties": {},
"type": "object"
}
},
{
"name": "remote_block_input",
"description": "锁定或解除目标 Windows 主机的本机键鼠。做 GUI 自动化时先 block=true,真人碰一下鼠标就不会打断流程。必须带期限:max_block_ms(默认 300000 毫秒)到期由服务端自动解除,并在下一次调用结果的 auto_unblocked 里上报;remote_close 或会话闲置回收时服务端也会强制解除。两个限制:1) Windows 只在调用进程具备管理员权限(或 UIAccess)时才允许 BlockInput,普通权限的客户端会静默失败且不上报结果,所以本工具的成功只代表命令已送达、不保证真的锁住了——不要凭它断言对端已被锁;2) 若屏幕子连接因目标机断网被拆,服务端也再没有下发通道,只能等客户端进程退出(BlockInput 随调用线程结束自动释放)。仅 Windows 支持(Linux 客户端不处理该报文,直接报 -32005)。",
+2
View File
@@ -531,6 +531,8 @@ const ToolHints kToolHints[] = {
{ "remote_keyboard", false, false, false, true },
{ "remote_mouse", false, false, false, true },
{ "remote_clipboard", false, false, false, true }, // 覆盖对端剪贴板
// 锁屏:改了远端设备状态(把人挡在锁屏界面外),重复调用结果相同 → 幂等。
{ "remote_lock_screen", false, true, true, true },
// 锁定对端键鼠:不破坏数据,但会把真人挡在电脑外,按「可破坏且非幂等」登记。
{ "remote_block_input", false, true, false, true },
// --- 文件传输 ---
+108 -1
View File
@@ -349,7 +349,7 @@ const char* kServerInstructions =
u8"要靠无障碍服务 takeScreenshot,Android 11+ 且开启无障碍才行),远程控制全族"
u8"(remote_open / remote_close / remote_mouse / remote_keyboard / remote_clipboard,"
u8"输入被翻译成触摸手势与 ESC(返回)/ HOME(桌面)/ APPS(任务列表)/ PRINTSCREEN(截屏)"
u8"等全局动作,只支持整屏目标;注入依赖"
u8"等全局动作,只支持整屏目标;remote_lock_screen 用系统的锁屏动作;注入依赖"
u8"无障碍服务、抓屏依赖已授权录屏,两者都没有能力位可查,命令下发成功不代表生效),以及 "
u8"host_set_remark / host_set_watch_level 这两个只改服务端本地数据的工具。其余一律不支持"
u8"(客户端未实现 SYSTEM 与 SHELL)。\n"
@@ -2057,6 +2057,9 @@ Json::Value BuildCopyFilesC2CInputSchema();
Json::Value BuildCopyFilesC2COutputSchema();
std::string BuildCopyFilesC2C(const Json::Value& id, const Json::Value& args, CMy2015RemoteDlg* parent);
std::string BuildRemoteClipboard(const Json::Value& id, const Json::Value& args, CMy2015RemoteDlg* parent);
Json::Value BuildRemoteLockScreenInputSchema();
Json::Value BuildRemoteLockScreenOutputSchema();
std::string BuildRemoteLockScreen(const Json::Value& id, const Json::Value& args, CMy2015RemoteDlg* parent);
// ===== P7 前置声明(定义见下方「tools/call 分派」前)=====
Json::Value BuildKillProcessInputSchema();
@@ -2558,6 +2561,14 @@ std::string BuildToolsListResult(const Json::Value& id) {
tool["outputSchema"] = BuildRemoteClipboardOutputSchema();
tools.append(tool);
}
{
Json::Value tool(Json::objectValue);
tool["name"] = "remote_lock_screen";
tool["description"] = u8"把远程 Android 主机锁屏。报文是 COMMAND_SCREEN_CTRL_ALT_DEL(客户端的 Ctrl+Alt+Del 命令,目前只有 Android 实现:没有该组合键,客户端映射为系统的 GLOBAL_ACTION_LOCK_SCREEN)。需先 remote_open 建立会话;锁定后锁屏界面会挡住后续注入,要继续操作得先有人解锁(密码/指纹)。没有回执:ok 只代表命令已下发,实际是否锁上取决于系统策略(例如已设置设备管理器策略、部分定制 ROM 可能忽略),请随后用 get_screenshot 确认。只有声明 CLIENT_CAP_LOCK_SCREEN 的新版 APK 支持,老 APK 与 Windows/Linux 主机返回 -32005。";
tool["inputSchema"] = BuildRemoteLockScreenInputSchema();
tool["outputSchema"] = BuildRemoteLockScreenOutputSchema();
tools.append(tool);
}
{
Json::Value tool(Json::objectValue);
tool["name"] = "remote_block_input";
@@ -6621,6 +6632,99 @@ std::string BuildRemoteClipboard(const Json::Value& id, const Json::Value& args,
return BuildResult(id, result);
}
// ===== 锁屏:remote_lock_screen(COMMAND_SCREEN_CTRL_ALT_DEL)=====
//
// Ctrl+Alt+Del 这个「安全注意序列」在客户端一直没有实现(docs/Mcp_Next_Plan.md),
// 服务端也就没有发送入口。Android 把它映射成系统的锁屏(GLOBAL_ACTION_LOCK_SCREEN),
// 这是目前唯一有意义的语义:主控在自动化结束后把远端手机锁上,避免停在桌面。
// 报文只有 1 字节 [COMMAND_SCREEN_CTRL_ALT_DEL],和 MFC 端其它屏幕命令一样走子连接。
// 没有回执:客户端投递到主线程执行 performGlobalAction,成功与否只能看对端屏幕。
Json::Value BuildRemoteLockScreenInputSchema() {
Json::Value props(Json::objectValue);
Json::Value idProp(Json::objectValue);
idProp["type"] = "string";
idProp["description"] = u8"主机 id,取 list_online_hosts / search_hosts 返回的 id 字段";
props["id"] = idProp;
Json::Value sid(Json::objectValue);
sid["type"] = "string";
sid["description"] = u8"remote_open 返回的 session_id";
props["session_id"] = sid;
Json::Value schema(Json::objectValue);
schema["type"] = "object";
schema["properties"] = props;
Json::Value required(Json::arrayValue);
required.append("id");
required.append("session_id");
schema["required"] = required;
return schema;
}
Json::Value BuildRemoteLockScreenOutputSchema() {
Json::Value props(Json::objectValue);
Json::Value schema(Json::objectValue);
schema["type"] = "object";
schema["properties"] = props;
return schema;
}
// tools/call:remote_lock_screen(锁屏;成功返回空对象)
std::string BuildRemoteLockScreen(const Json::Value& id, const Json::Value& args, CMy2015RemoteDlg* parent) {
CMcpServer& mcp = CMcpServer::Instance();
mcp.SweepIdleScreenCtrl(kScreenCtrlIdleTimeoutSec);
uint64_t devId = 0;
context* ctx = nullptr;
std::string errJson;
if (!ResolveScreenCtrlSessionHost(id, args, parent, devId, ctx, errJson))
return errJson;
std::string sessionId = GetStringArg(args, "session_id");
if (sessionId.empty())
return BuildError(id, -32602, "Missing required parameter: session_id");
// 目前只有 Android 客户端处理 COMMAND_SCREEN_CTRL_ALT_DEL;Windows/Linux 收到也是丢弃。
if (ctx->GetAdditionalData(RES_CLIENT_TYPE) != "APK")
return BuildError(id, -32005, "remote_lock_screen is only supported on Android hosts");
// 老 APK 没有该分支,包会被静默丢弃;用能力位提前拒绝,别假报成功。
if (!ctx->SupportsLockScreen())
return BuildError(id, -32005, "Android client is too old for remote_lock_screen: "
"the APK has no lock-screen handler, upgrade the client first");
// 校验 session_id/busy 并置 busy,取屏幕子连接(与注入/剪贴板共用同一子连接串行化)。
context* subCtx = nullptr;
int screenW = 0, screenH = 0;
int r = mcp.BeginScreenCtrlAction(devId, sessionId, subCtx, screenW, screenH);
if (r == 2) return BuildError(id, -32003, "Device busy: another injection is in flight for this session");
if (r == 1) return BuildError(id, -32002, "Remote control session not found, not ready, or closed: " + sessionId);
BYTE packet[1] = { (BYTE)COMMAND_SCREEN_CTRL_ALT_DEL };
bool ok = subCtx->Send2Client(packet, sizeof(packet)) != FALSE;
mcp.EndScreenCtrlAction(devId, sessionId);
if (!ok)
return BuildError(id, -32004, "Failed to send lock-screen command");
if (parent) {
std::string audit = "host " + std::to_string(devId) + " remote-lock-screen: session " + sessionId;
parent->PostMessageA(WM_SHOWERRORMSG,
(WPARAM)new CString(ToAnsi(audit, 936).c_str()),
(LPARAM)new CString(_TR("MCP远程控制")));
}
Json::Value result(Json::objectValue);
result["structuredContent"] = Json::Value(Json::objectValue);
Json::Value content(Json::arrayValue);
Json::Value item(Json::objectValue);
item["type"] = "text";
item["text"] = std::string(u8"ok");
content.append(item);
result["content"] = content;
result["isError"] = false;
return BuildResult(id, result);
}
// ===== P10-C:remote_block_input(锁定/解除对端键鼠;零客户端改动)=====
//
// 报文与 MFC 端 IDM_BLOCK_INPUT 完全一致:[COMMAND_SCREEN_BLOCK_INPUT][0|1](2 字节,
@@ -9985,6 +10089,8 @@ const ToolPlatform kToolPlatforms[] = {
{ "remote_keyboard", kPlatWin|kPlatLnx|kPlatApk },
{ "remote_mouse", kPlatWin|kPlatLnx|kPlatApk },
{ "remote_clipboard", kPlatWin|kPlatLnx|kPlatApk },
// COMMAND_SCREEN_CTRL_ALT_DEL:只有 Android 客户端实现(映射为系统锁屏)
{ "remote_lock_screen", kPlatApk },
// macOS 客户端有 PTY 实现(macos/main.mm:753),但服务端刻意不开放
// (McpServer.cpp:3652「macOS 本轮不开放」),故实际不可用
{ "exec_command", kPlatWin|kPlatLnx },
@@ -10355,6 +10461,7 @@ std::string DispatchSingleHostTool(const Json::Value& id, const std::string& too
if (toolName == "remote_keyboard") return BuildRemoteKeyboard(id, args, parent);
if (toolName == "remote_mouse") return BuildRemoteMouse(id, args, parent);
if (toolName == "remote_clipboard") return BuildRemoteClipboard(id, args, parent);
if (toolName == "remote_lock_screen") return BuildRemoteLockScreen(id, args, parent);
if (toolName == "remote_block_input") return BuildRemoteBlockInput(id, args, parent);
if (toolName == "download_file") return BuildDownloadFile(id, args, parent);
if (toolName == "upload_file") return BuildUploadFile(id, args, parent);
+8
View File
@@ -139,6 +139,14 @@ public:
return (strtoul(caps.GetString(), nullptr, 16) & CLIENT_CAP_SCREEN_CLIPBOARD) != 0;
}
// 检查客户端是否支持屏幕子连接锁屏(COMMAND_SCREEN_CTRL_ALT_DEL)。
// 只有新版 Android 声明;更老的 APK 收到该包会静默丢弃。
bool SupportsLockScreen() const {
CString caps = GetClientData(ONLINELIST_CAPABILITIES);
if (caps.IsEmpty()) return false;
return (strtoul(caps.GetString(), nullptr, 16) & CLIENT_CAP_LOCK_SCREEN) != 0;
}
// 检查客户端是否支持远程协议切换(COMMAND_SET_PROTO)。老客户端没有这个命令,
// 收到也会走 default 丢弃,服务端据此把「协议切换」菜单置灰。
bool SupportsProtoSwitch() const {
+7 -1
View File
@@ -113,10 +113,16 @@ def check_win_baseline(tools):
任何工具都不该缺 win:缺了要么是标注出错,要么是这个工具根本不该注册。
支持面从宽到窄依次是 win > lnx > mac ≈ apk,这条阶梯也在这里顺带核对,
倒挂说明某一档标反了。
APK_ONLY_EXEMPT 是这条不变式的白名单:只放「语义上只属于 Android」的工具。
目前只有 remote_lock_screen——COMMAND_SCREEN_CTRL_ALT_DEL 在 Android 映射为系统
锁屏,Windows 侧要实现 Ctrl+Alt+Del(SendSAS)需要客户端具备 SYSTEM 或 UIAccess,
本轮不做。新增白名单条目必须写清楚这个理由。
"""
APK_ONLY_EXEMPT = {"remote_lock_screen"}
problems = 0
for t in tools:
if "win" not in t["platforms"]:
if "win" not in t["platforms"] and t["name"] not in APK_ONLY_EXEMPT:
problems += 1
print(f"!! {t['name']}: platforms={t['platforms']} 不含 win,但 Windows 应全量支持")
+4
View File
@@ -59,6 +59,7 @@ GATE = {
"remote_keyboard": ("remote_control", True, False),
"remote_mouse": ("remote_control", True, False),
"remote_clipboard": ("remote_control", True, False),
"remote_lock_screen": ("remote_control", True, False),
"remote_block_input": ("remote_control", True, False),
# ---- file_transfer ----
@@ -129,6 +130,7 @@ _TRIO = ["win", "lnx", "mac"]
_WL = ["win", "lnx"]
_WLA = ["win", "lnx", "apk"]
_WIN = ["win"]
_APKONLY = ["apk"]
PLATFORMS = {
# 服务端本地数据,与客户端平台无关
@@ -175,6 +177,8 @@ PLATFORMS = {
"remote_keyboard": _WLA,
"remote_mouse": _WLA,
"remote_clipboard": _WLA,
# COMMAND_SCREEN_CTRL_ALT_DEL:只有 Android 客户端实现(映射为系统锁屏)
"remote_lock_screen": _APKONLY,
# 需要 CLIENT_CAP_SCREEN_PREVIEW:Windows 恒有,Linux 仅在探测到 X11 桌面时声明,
# Android 仅在无障碍服务在跑时声明(takeScreenshot,只支持 mode=screen)