computer-use-ootb-internal 0.0.160__tar.gz → 0.0.161__tar.gz

{computer_use_ootb_internal-0.0.160 → computer_use_ootb_internal-0.0.161}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: computer-use-ootb-internal
-Version: 0.0.160
+Version: 0.0.161
 Summary: Computer Use OOTB
 Author-email: Siyuan Hu <siyuan.hu.sg@gmail.com>
 Requires-Python: >=3.11

{computer_use_ootb_internal-0.0.160 → computer_use_ootb_internal-0.0.161}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "computer-use-ootb-internal"
-version = "0.0.160"
+version = "0.0.161"
 description = "Computer Use OOTB"
 authors = [{ name = "Siyuan Hu", email = "siyuan.hu.sg@gmail.com" }]
 requires-python = ">=3.11"

{computer_use_ootb_internal-0.0.160 → computer_use_ootb_internal-0.0.161}/src/computer_use_ootb_internal/guard_service.py

@@ -758,74 +758,79 @@ class GuardService(win32serviceutil.ServiceFramework):
                  self.log_error(f"Internal trigger: Error checking existing processes for {user}: {e}")
                  # Continue and attempt start despite error?
 
-            # 4. Attempt immediate start (User is active and not running)
-            immediate_start_status = "start_attempted"
-            self.log_info(f"Internal trigger: User '{user}' is active and not running. Attempting immediate start via PowerShell elevation...")
-            
+            # --- Removed CreateProcessAsUser logic ---
+            # 4. Attempt immediate start directly via subprocess calling PowerShell
+            immediate_start_status = "start_attempted_direct_subprocess"
+            self.log_info(f"Internal trigger: User '{user}' is active and not running. Attempting immediate start via direct PowerShell subprocess...")
+
             if not self.target_executable_path:
                 self.log_error("Internal trigger: Cannot start process - target executable path not found.")
                 final_status = "failed_exe_not_found"
-                return final_status # Exit early if executable missing
+                return final_status
 
             try:
-                token = win32ts.WTSQueryUserToken(session_id)
-                env = win32profile.CreateEnvironmentBlock(token, False)
-                startup = win32process.STARTUPINFO()
-                # Use CREATE_NEW_CONSOLE to make the PS window visible and potentially the UAC prompt
-                creation_flags = win32con.CREATE_NEW_CONSOLE
-                
-                # Command to run PowerShell, which then elevates the target executable
+                # Prepare paths and arguments, escaping for PowerShell strings
                 target_exe_unquoted = self.target_executable_path.strip('"')
-                target_exe_for_ps = target_exe_unquoted.replace("'", "''") # Escape single quotes for PS strings
+                target_exe_for_ps = target_exe_unquoted.replace("'", "''")
                 target_exe_dir_for_ps = os.path.dirname(target_exe_unquoted).replace("'", "''")
-                
-                # 1. 准备 PowerShell 命令中需要的变量 (进行基本的 PowerShell 字符串转义)
-                ps_target_exe = target_exe_for_ps 
-                ps_working_dir = target_exe_dir_for_ps
-                # 用户名 'altair' 在最终命令里需要 ''altair'' 格式
-                ps_user_arg_format = user.replace("'", "''") # 先转义用户名本身的单引号
-
-                # 2. 构建最终的、完整的 PowerShell 命令字符串，严格按照模板
-                #    模板: Start-Process -FilePath cmd.exe -ArgumentList @('/K', '"<exe_path>" --port <port> --target_user ''<username>''') -WorkingDirectory '<working_dir>' -Verb RunAs
-                ps_command_string = f"Start-Process -FilePath cmd.exe -ArgumentList @('/K', '"""{ps_target_exe}""" --port {calculated_port} --target_user ''''{ps_user_arg_format}''''') -WorkingDirectory '{ps_working_dir}' -Verb RunAs"
-
-                # 3. 为 powershell.exe -Command '...' 参数转义整个命令字符串中的单引号
-                ps_command_string_escaped = ps_command_string.replace("'", "''")
-
-                # 4. 生成最终传递给 CreateProcessAsUser 的命令行
-                #    依然使用 powershell.exe -NoExit -Command '{ ... }' 以便观察，虽然不一定有效
-                lpCommandLine = f"powershell.exe -NoProfile -ExecutionPolicy Bypass -NoExit -Command '{{ {ps_command_string_escaped} }}'"
-                
-                lpApplicationName = None # Must be None if using lpCommandLine
-                cwd = os.path.dirname(target_exe_unquoted) if os.path.dirname(target_exe_unquoted) else None
 
-                # Log details before call
-                self.log_info(f"Internal trigger: Launching PowerShell directly for elevation:")
-                self.log_info(f"  lpCommandLine: {lpCommandLine}")
-                self.log_info(f"  lpCurrentDirectory: {cwd if cwd else 'Default'}")
-                
-                hProcess, hThread, dwPid, dwTid = win32process.CreateProcessAsUser(
-                    token, lpApplicationName, lpCommandLine, None, None, False,
-                    creation_flags, env, cwd, startup
+                # Build the exact Start-Process command string based on the working template as a single line
+                # Need to escape quotes carefully for the final -Command '...' argument
+                # 1. Build the second argument for the @() array element
+                cmd_k_second_arg = f'"\\"{target_exe_for_ps}\\"" --port {calculated_port} --target_user \'\'{user}\'\''
+                # 2. Escape single quotes within it for the PS literal array element
+                cmd_k_second_arg_escaped_for_array = cmd_k_second_arg.replace("'", "''")
+                # 3. Build the full script block content as a single line string
+                ps_script_block_content = f"$cmdArgs = @('/K', '{cmd_k_second_arg_escaped_for_array}'); Start-Process -FilePath cmd.exe -ArgumentList $cmdArgs -WorkingDirectory '{target_exe_dir_for_ps}' -Verb RunAs"
+                # 4. Escape single quotes in the whole script block for the outer -Command '...'
+                ps_script_block_content_escaped = ps_script_block_content.replace("'", "''")
+
+                # Command list for subprocess
+                powershell_executable = "powershell.exe"
+                command_list = [
+                    powershell_executable,
+                    "-NoProfile",
+                    "-ExecutionPolicy", "Bypass",
+                    "-Command",
+                    f"{{ {ps_script_block_content_escaped} }}" # Use script block {}
+                ]
+
+                self.log_info(f"Internal trigger: Executing subprocess: {command_list}")
+
+                # Execute the command directly from the service context
+                result = subprocess.run(
+                    command_list,
+                    capture_output=True,
+                    text=True,
+                    check=False, # Don't raise exception on non-zero exit
+                    encoding='utf-8',
+                    errors='ignore'
                 )
-                # We get the PID of cmd.exe/powershell.exe here, not the final elevated process.
-                # We can't easily track the elevated process PID across the UAC boundary.
-                self.log_info(f"Internal trigger: CreateProcessAsUser call to initiate elevation succeeded for user '{user}' (Launcher PID: {dwPid}). UAC prompt expected if needed.")
-                win32api.CloseHandle(hProcess)
-                win32api.CloseHandle(hThread)
-
-                # Assume success if the call didn't raise an exception.
-                # We cannot easily verify if the *elevated* process actually started.
-                immediate_start_status = "start_elevation_initiated"
-                final_status = "success_elevation_initiated" # Report success based on initiating the elevation
-
-            except Exception as proc_err:
-                 self.log_error(f"Internal trigger: Exception during CreateProcessAsUser for elevation attempt (user '{user}'): {proc_err}", exc_info=True)
-                 immediate_start_status = "start_failed_exception"
-                 final_status = "failed_start_exception"
-            finally:
-                 if token: win32api.CloseHandle(token)
-            
+
+                # Log results
+                if result.stdout:
+                    self.log_info(f"Internal trigger: PowerShell STDOUT:\\n{result.stdout.strip()}")
+                if result.stderr:
+                    self.log_warning(f"Internal trigger: PowerShell STDERR:\\n{result.stderr.strip()}")
+
+                if result.returncode == 0:
+                    self.log_info("Internal trigger: PowerShell subprocess command executed successfully (Exit Code 0). Process likely started elevated in background.")
+                    immediate_start_status = "start_success_direct_subprocess"
+                    final_status = "success_direct_subprocess"
+                else:
+                    self.log_error(f"Internal trigger: PowerShell subprocess command failed (Exit Code {result.returncode}).")
+                    immediate_start_status = f"start_failed_direct_subprocess_code_{result.returncode}"
+                    final_status = f"failed_direct_subprocess_code_{result.returncode}"
+
+            except FileNotFoundError:
+                self.log_error("Internal trigger: 'powershell.exe' not found.")
+                immediate_start_status = "start_failed_ps_not_found"
+                final_status = "failed_ps_not_found"
+            except Exception as subproc_err:
+                self.log_error(f"Internal trigger: Exception during PowerShell subprocess execution for user '{user}': {subproc_err}", exc_info=True)
+                immediate_start_status = "start_failed_subprocess_exception"
+                final_status = "failed_subprocess_exception"
+
             # Combine results (mostly determined by start attempt now)
             # Example: final_status = f"{task_created_status}_{immediate_start_status}"
             return final_status