diff --git a/docs/diagnostics/2026-11-05-desktop-leak-issue5.md b/docs/diagnostics/2026-11-05-desktop-leak-issue5.md new file mode 100644 index 0000000..5336ca2 --- /dev/null +++ b/docs/diagnostics/2026-11-05-desktop-leak-issue5.md @@ -0,0 +1,36 @@ +# Issue 5:私有桌面泄露 + +## 现象 + +原生 worker 创建私有 Windows Desktop 后,如果 Job Object 创建或 worker 进程启动失败,构造函数直接抛出异常,已创建的 Desktop 和 Job 句柄没有释放。重复触发失败会留下孤立的私有桌面对象,表现为桌面资源持续增加、后续同名或同类原生任务启动异常。 + +状态读取路径还有一个相同的边界:`read_library_flag` 在进入资源清理保护前加载 UI 依赖;依赖加载异常时,刚创建的私有桌面无法执行 `CloseDesktop`。 + +## 根因 + +1. `DesktopWorker.__init__` 的资源申请跨越多个可能失败的步骤,但没有事务式回滚。 +2. 进程句柄、Job 句柄和 Desktop 句柄的释放顺序没有覆盖构造阶段异常。 +3. `read_library_flag` 的依赖导入位于 `CreateDesktop` 之后、`try/finally` 之前。 + +## 解决方案 + +- 在 `DesktopWorker` 构造开始时初始化资源字段,并把 Desktop、Job、worker 创建放入同一异常边界。 +- 构造失败时按 worker、Job、Desktop 顺序回滚;已启动的 worker 先终止,避免留下无父级的原生进程。 +- 在状态读取创建 Desktop 前完成 UI 依赖加载,确保依赖异常不会产生未受保护的 Desktop。 +- 增加回归测试,模拟 worker 启动失败并断言 Desktop、Job 均已关闭。 + +## 影响范围 + +- 只影响原生 worker 启动失败和状态读取依赖加载失败时的清理路径。 +- 正常任务的私有桌面、Job Object、进程树和数据库释放策略不变。 +- 不会切换用户输入桌面,也不会改变中心库写入策略。 + +## 验证 + +- `python -m pytest -q tests/test_desktop_worker.py tests/test_dialog_agent.py tests/test_native_inspection_release_regressions.py tests/test_verify_diagnostics.py`:33 passed。 +- `python -m compileall -q src tests`:通过。 +- `git diff --check`:通过。 + +## 分支 + +`codex/desktop-leak-pr` diff --git a/src/cbb_refresh_verify/desktop_worker.py b/src/cbb_refresh_verify/desktop_worker.py index b7081fa..62c1582 100644 --- a/src/cbb_refresh_verify/desktop_worker.py +++ b/src/cbb_refresh_verify/desktop_worker.py @@ -72,27 +72,52 @@ class DesktopWorker: def __init__(self, command, name, *, interactive_input=False): self.name = name self.interactive_input = bool(interactive_input) - self.desktop = None if self.interactive_input else win32service.CreateDesktop( - name, 0, win32con.GENERIC_ALL, None) - # Track the session, but never use kill-on-close: PCB descendants can - # still own a database transaction when the Python supervisor exits. - self.job = win32job.CreateJobObject(None, '') - self.job_bound = False + self.desktop = None + self.job = None + self.handle = None self.companions = [] self.companion_pids = [] - startup = win32process.STARTUPINFO() - # subprocess.STARTUPINFO does NOT pass lpDesktop to CreateProcess. - startup.lpDesktop = startup_desktop_name(name, interactive_input=self.interactive_input) - self.handle, thread, self.pid, _ = win32process.CreateProcess( - command[0], subprocess.list2cmdline(command), None, None, False, - win32con.CREATE_NO_WINDOW, None, None, startup) - thread.Close() + self.job_bound = False + # Track the session, but never use kill-on-close: PCB descendants can + # still own a database transaction when the Python supervisor exits. try: - win32job.AssignProcessToJobObject(self.job, self.handle) - self.job_bound = True + self.desktop = None if self.interactive_input else win32service.CreateDesktop( + name, 0, win32con.GENERIC_ALL, None) + self.job = win32job.CreateJobObject(None, '') + startup = win32process.STARTUPINFO() + # subprocess.STARTUPINFO does NOT pass lpDesktop to CreateProcess. + startup.lpDesktop = startup_desktop_name(name, interactive_input=self.interactive_input) + self.handle, thread, self.pid, _ = win32process.CreateProcess( + command[0], subprocess.list2cmdline(command), None, None, False, + win32con.CREATE_NO_WINDOW, None, None, startup) + thread.Close() + try: + win32job.AssignProcessToJobObject(self.job, self.handle) + self.job_bound = True + except Exception: + # Kill-through-job is a cleanup guarantee, not a launch requirement. + self.job_bound = False except Exception: - # Kill-through-job is a cleanup guarantee, not a launch requirement. - self.job_bound = False + if self.handle is not None: + try: + win32process.TerminateProcess(self.handle, 1) + except Exception: + pass + try: + self.handle.Close() + except Exception: + pass + if self.job is not None: + try: + self.job.Close() + except Exception: + pass + if self.desktop is not None: + try: + self.desktop.CloseDesktop() + except Exception: + pass + raise def start_companion(self, command): startup = win32process.STARTUPINFO() diff --git a/src/cbb_refresh_verify/mentor_adapter.py b/src/cbb_refresh_verify/mentor_adapter.py index d61f524..1d73ddb 100644 --- a/src/cbb_refresh_verify/mentor_adapter.py +++ b/src/cbb_refresh_verify/mentor_adapter.py @@ -1407,11 +1407,12 @@ def read_library_flag(library, name, *, timeout_seconds=90, log_path=None): if not executable.is_file(): return FLAG_UNKNOWN, f'找不到 Library Manager: {executable}' + from pywinauto import Desktop + from pywinauto.controls.common_controls import TreeViewWrapper + deadline = time.monotonic() + timeout_seconds desktop_name = 'CbbFlagRead_' + os.urandom(5).hex() desktop = win32service.CreateDesktop(desktop_name, 0, win32con.GENERIC_ALL, None) - from pywinauto import Desktop - from pywinauto.controls.common_controls import TreeViewWrapper handle = None pid = None diff --git a/tests/test_desktop_worker.py b/tests/test_desktop_worker.py new file mode 100644 index 0000000..c20367e --- /dev/null +++ b/tests/test_desktop_worker.py @@ -0,0 +1,56 @@ +import pytest + + +def test_constructor_releases_private_desktop_when_process_launch_fails(monkeypatch): + import cbb_refresh_verify.desktop_worker as module + + class Handle: + def __init__(self): + self.closed = False + + def Close(self): + self.closed = True + + def CloseDesktop(self): + self.closed = True + + desktop = Handle() + job = Handle() + + monkeypatch.setattr(module.win32service, 'CreateDesktop', lambda *args: desktop) + monkeypatch.setattr(module.win32job, 'CreateJobObject', lambda *args: job) + monkeypatch.setattr(module.win32process, 'STARTUPINFO', lambda: type('Startup', (), {})()) + monkeypatch.setattr(module.win32process, 'CreateProcess', + lambda *args: (_ for _ in ()).throw(RuntimeError('launch failed'))) + + with pytest.raises(RuntimeError, match='launch failed'): + module.DesktopWorker(['worker.exe'], 'PrivateDesk') + + assert desktop.closed is True + assert job.closed is True + + +def test_library_flag_loads_ui_dependencies_before_creating_private_desktop(monkeypatch, tmp_path): + import builtins + import win32service + import cbb_refresh_verify.mentor_adapter as module + + created = [] + original_import = builtins.__import__ + executable = tmp_path / 'LibraryManager.exe' + executable.touch() + + def deny_pywinauto(name, *args, **kwargs): + if name == 'pywinauto' or name.startswith('pywinauto.'): + raise ImportError('pywinauto unavailable') + return original_import(name, *args, **kwargs) + + monkeypatch.setattr(builtins, '__import__', deny_pywinauto) + monkeypatch.setattr(module, 'library_manager_path', lambda: executable) + monkeypatch.setattr(win32service, 'CreateDesktop', + lambda *args: created.append(args)) + + with pytest.raises(ImportError, match='pywinauto unavailable'): + module.read_library_flag('library.lmc', 'Block') + + assert created == []