computer-use-ootb-internal 0.0.161__py3-none-any.whl → 0.0.163__py3-none-any.whl

computer_use_ootb_internal/guard_service.py

@@ -23,6 +23,7 @@ import psutil # For process/user info
 from flask import Flask, request, jsonify # For embedded server
 from waitress import serve # For serving Flask app
 import json # Needed for status reporting
+import shutil # Added for shutil.which
 
 # --- Configuration ---
 _SERVICE_NAME = "OOTBGuardService"
@@ -758,10 +759,9 @@ class GuardService(win32serviceutil.ServiceFramework):
                  self.log_error(f"Internal trigger: Error checking existing processes for {user}: {e}")
                  # Continue and attempt start despite error?
 
-            # --- 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...")
+            # 4. Attempt immediate start using CreateProcessAsUser to run helper script
+            immediate_start_status = "start_attempted_helper_script"
+            self.log_info(f"Internal trigger: User '{user}' is active and not running. Attempting start via helper script...")
 
             if not self.target_executable_path:
                 self.log_error("Internal trigger: Cannot start process - target executable path not found.")
@@ -769,67 +769,86 @@ class GuardService(win32serviceutil.ServiceFramework):
                 return final_status
 
             try:
-                # Prepare paths and arguments, escaping for PowerShell strings
+                # Find helper script path
+                helper_script_path = self._find_helper_script("launch_ootb_elevated.ps1")
+                if not helper_script_path:
+                    self.log_error("Internal trigger: Cannot start process - helper script not found.")
+                    final_status = "failed_helper_script_not_found"
+                    return final_status
+
+                # Get PowerShell executable path
+                powershell_executable = self._find_powershell_executable()
+                if not powershell_executable:
+                    self.log_error("Internal trigger: Cannot start process - powershell.exe not found.")
+                    final_status = "failed_powershell_not_found"
+                    return final_status
+
+                # Prepare arguments for the helper script (paths need quoting if they contain spaces)
                 target_exe_unquoted = self.target_executable_path.strip('"')
-                target_exe_for_ps = target_exe_unquoted.replace("'", "''")
-                target_exe_dir_for_ps = os.path.dirname(target_exe_unquoted).replace("'", "''")
-
-                # 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'
+                target_exe_dir = os.path.dirname(target_exe_unquoted) # Use directory of unquoted path
+
+                # Quote paths/args for command line - IMPORTANT: Use double quotes for PowerShell args
+                helper_script_arg = f'"{helper_script_path}"' if " " in helper_script_path else helper_script_path
+                target_exe_arg = f'"{target_exe_unquoted}"' if " " in target_exe_unquoted else target_exe_unquoted
+                working_dir_arg = f'"{target_exe_dir}"' if " " in target_exe_dir else target_exe_dir
+                # Username might need quoting if it contains special characters, double quote should be safe
+                target_user_arg = f'"{user}"'
+
+                # Construct the command line to execute powershell with the helper script and args
+                lpCommandLine = (
+                    f'"{powershell_executable}" -NoProfile -ExecutionPolicy Bypass -NoExit '
+                    f'-File {helper_script_arg} '
+                    f'-TargetExePath {target_exe_arg} '
+                    f'-Port {calculated_port} '
+                    f'-TargetUser {target_user_arg} '
+                    f'-WorkingDirectory {working_dir_arg}'
                 )
 
-                # 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"
+                # Use CreateProcessAsUser to launch this command in the user's session
+                token = win32ts.WTSQueryUserToken(session_id)
+                env = win32profile.CreateEnvironmentBlock(token, False)
+                startup = win32process.STARTUPINFO()
+                # Ensure the window is visible on the user's desktop
+                startup.lpDesktop = "winsta0\\default"
+                creation_flags = win32con.CREATE_NEW_CONSOLE | win32con.NORMAL_PRIORITY_CLASS
+                lpApplicationName = None # Must be None when using lpCommandLine
+                # Working directory for powershell itself? Let it default or use script dir?
+                # Let's use the script's directory as CWD for powershell.exe
+                cwd = os.path.dirname(helper_script_path) # Use directory of unquoted path
+
+                self.log_info(f"Internal trigger: Launching helper script via CreateProcessAsUser:")
+                self.log_info(f"  lpCommandLine: {lpCommandLine}")
+                self.log_info(f"  lpCurrentDirectory: {cwd}")
+
+                # Execute the command in the user's session
+                hProcess, hThread, dwPid, dwTid = win32process.CreateProcessAsUser(
+                    token, lpApplicationName, lpCommandLine, None, None, False,
+                    creation_flags, env, cwd, startup
+                )
+                self.log_info(f"Internal trigger: CreateProcessAsUser call for helper script succeeded (Launcher PID: {dwPid}). Helper script should now run and trigger elevation.")
+                win32api.CloseHandle(hProcess)
+                win32api.CloseHandle(hThread)
+
+                # Assume success if CreateProcessAsUser succeeded.
+                # The actual success depends on the user interacting with UAC triggered by the helper.
+                immediate_start_status = "start_success_helper_launched"
+                final_status = "success_helper_launched"
+
+            except FileNotFoundError as fnf_err:
+                # This might now be powershell.exe OR the helper script
+                self.log_error(f"Internal trigger: File not found during helper script launch: {fnf_err}")
+                immediate_start_status = "start_failed_file_not_found"
+                final_status = "failed_file_not_found"
+            except Exception as launch_err:
+                self.log_error(f"Internal trigger: Exception during CreateProcessAsUser for helper script (user '{user}'): {launch_err}", exc_info=True)
+                immediate_start_status = "start_failed_launch_exception"
+                final_status = "failed_launch_exception"
+            finally:
+                 if 'token' in locals() and token: # Ensure token is defined before trying to close
+                     try:
+                         win32api.CloseHandle(token)
+                     except: # Ignore errors closing handle
+                         pass
 
             # Combine results (mostly determined by start attempt now)
             # Example: final_status = f"{task_created_status}_{immediate_start_status}"
@@ -953,20 +972,45 @@ class GuardService(win32serviceutil.ServiceFramework):
 
     def _find_signal_script(self):
         """Finds the signal_connection.py script relative to this service file."""
+        return self._find_helper_script("signal_connection.py") # Reuse helper finding logic
+
+    def _find_helper_script(self, script_name):
+        """Finds a helper script relative to this service file."""
         try:
+            # Use __file__ which should be reliable when run as a service via pythonservice.exe
             base_dir = os.path.dirname(os.path.abspath(__file__))
-            script_path = os.path.join(base_dir, "signal_connection.py")
+            script_path = os.path.join(base_dir, script_name)
             if os.path.exists(script_path):
-                self.log_info(f"Found signal script at: {script_path}")
-                # Quote if needed?
-                if " " in script_path and not script_path.startswith('"'):
-                    return f'"{script_path}"'
+                self.log_info(f"Found helper script '{script_name}' at: {script_path}")
+                # Return unquoted path for potential quoting later
                 return script_path
             else:
-                self.log_error(f"Signal script signal_connection.py not found near {base_dir}")
+                self.log_error(f"Helper script '{script_name}' not found near {base_dir}")
                 return None
         except Exception as e:
-            self.log_error(f"Error finding signal script: {e}")
+            self.log_error(f"Error finding helper script '{script_name}': {e}")
+            return None
+
+    def _find_powershell_executable(self):
+        """Finds powershell.exe, preferring the system path."""
+        try:
+            # Check System32 first
+            system32_path = os.path.join(os.environ.get('SystemRoot', 'C:\\Windows'), 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe')
+            if os.path.exists(system32_path):
+                self.log_info(f"Found powershell.exe at: {system32_path}")
+                return system32_path
+            else:
+                # Fallback to checking PATH using shutil.which (requires Python 3.3+)
+                # Make sure to import shutil at the top of the file if not already present
+                powershell_path = shutil.which("powershell.exe")
+                if powershell_path:
+                    self.log_info(f"Found powershell.exe via PATH: {powershell_path}")
+                    return powershell_path
+                else:
+                    self.log_error("powershell.exe not found in System32 or PATH.")
+                    return None
+        except Exception as e:
+            self.log_error(f"Error finding powershell.exe: {e}")
             return None
 
 # --- Main Execution Block ---

computer_use_ootb_internal/launch_ootb_elevated.ps1

@@ -0,0 +1,69 @@
+# launch_ootb_elevated.ps1
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$TargetExePath,
+
+    [Parameter(Mandatory=$true)]
+    [string]$Port,
+
+    [Parameter(Mandatory=$true)]
+    [string]$TargetUser,
+
+    [Parameter(Mandatory=$true)]
+    [string]$WorkingDirectory
+)
+
+try {
+    Write-Host "--- OOTB Elevation Helper ---"
+    Write-Host "Timestamp: $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')"
+    Write-Host "Received parameters:"
+    Write-Host "  Target Exe Path : $TargetExePath"
+    Write-Host "  Port            : $Port"
+    Write-Host "  Target User     : $TargetUser"
+    Write-Host "  Working Dir     : $WorkingDirectory"
+    Write-Host ""
+
+    # Validate paths
+    if (-not (Test-Path -Path $TargetExePath -PathType Leaf)) {
+        throw "Target executable not found at '$TargetExePath'"
+    }
+    if (-not (Test-Path -Path $WorkingDirectory -PathType Container)) {
+        throw "Working directory not found at '$WorkingDirectory'"
+    }
+
+    # Construct the second argument for cmd.exe /K, precisely matching the working command
+    # Format: "<quoted_exe_path>" --port <port> --target_user ''<username>''
+    # Note: PowerShell handles escaping within double quotes differently.
+    #       Using backticks ` before inner quotes is safer here.
+    $cmdKSecondArg = "`"`"$TargetExePath`"`" --port $Port --target_user ''$TargetUser''"
+
+    # Construct the argument list array for Start-Process launching cmd.exe
+    $startProcessArgs = @('/K', $cmdKSecondArg)
+
+    Write-Host "Constructed cmd.exe /K arguments: $cmdKSecondArg"
+    Write-Host "Constructed Start-Process arguments array: $($startProcessArgs -join ' ')" # For logging
+    Write-Host "Executing elevated process..."
+    Write-Host "Command: Start-Process -FilePath cmd.exe -ArgumentList @('/K', '$cmdKSecondArg') -WorkingDirectory '$WorkingDirectory' -Verb RunAs"
+    Write-Host "--- Waiting for UAC prompt if necessary ---"
+
+    # Execute the command to launch cmd elevated, which runs the target app
+    Start-Process -FilePath cmd.exe -ArgumentList $startProcessArgs -WorkingDirectory $WorkingDirectory -Verb RunAs
+
+    Write-Host "--- OOTB Elevation Helper: Start-Process command executed. ---"
+    # The calling powershell window (started by CreateProcessAsUser with -NoExit) will remain open.
+
+} catch {
+    Write-Error "--- OOTB Elevation Helper Error ---"
+    Write-Error "Error launching elevated process: $($_.Exception.Message)"
+    Write-Error "Script Parameters:"
+    Write-Error "  Target Exe Path : $TargetExePath"
+    Write-Error "  Port            : $Port"
+    Write-Error "  Target User     : $TargetUser"
+    Write-Error "  Working Dir     : $WorkingDirectory"
+    Write-Host "Press Enter to exit..."
+    Read-Host # Keep window open on error
+    Exit 1
+}
+
+# Exit gracefully if successful
+Exit 0 

{computer_use_ootb_internal-0.0.161.dist-info → computer_use_ootb_internal-0.0.163.dist-info}/METADATA

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

{computer_use_ootb_internal-0.0.161.dist-info → computer_use_ootb_internal-0.0.163.dist-info}/RECORD

@@ -2,7 +2,8 @@ computer_use_ootb_internal/README.md,sha256=FxpW95lyub2iX73ZDfK6ML7SdEKg060H5I6G
 computer_use_ootb_internal/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 computer_use_ootb_internal/app_teachmode.py,sha256=hiUTiX4jl1-5yqs3AwrOjNmToL5LbUb42o5XS4fiKAA,23805
 computer_use_ootb_internal/dependency_check.py,sha256=y8RMEP6RXQzTgU1MS_1piBLtz4J-Hfn9RjUZg59dyvo,1333
-computer_use_ootb_internal/guard_service.py,sha256=K2s3uT2-ca99Dx7OMlrFG5xjUVo6ncXLSn9yujhU4WY,52830
+computer_use_ootb_internal/guard_service.py,sha256=SV8vnxBUiu3Y7_RS4g7R3khzW7Ewh-5ooC7RO2DL4-c,55398
+computer_use_ootb_internal/launch_ootb_elevated.ps1,sha256=h6CnpDd8pRwDqFu42E5GUuLdPrCHJWDuc_zOXaE9mtQ,2793
 computer_use_ootb_internal/requirements-lite.txt,sha256=5DAHomz4A_P2BmTIXNkNqkHbnIF0AyZ4_1XAlb1LaYs,290
 computer_use_ootb_internal/run_teachmode_ootb_args.py,sha256=eUPpfA7bB3bdBBiIBIxKJSS-Jpz2G6R46fpDO440Jyo,7687
 computer_use_ootb_internal/service_manager.py,sha256=SD8jzfn0VVXBOr_nP6zmBWSC2TzrU_sp2e5JJkSlQFU,9734
@@ -34,7 +35,7 @@ computer_use_ootb_internal/computer_use_demo/tools/run.py,sha256=xhXdnBK1di9muaO
 computer_use_ootb_internal/computer_use_demo/tools/screen_capture.py,sha256=L8qfvtUkPPQGt92N-2Zfw5ZTDBzLsDps39uMnX3_uSA,6857
 computer_use_ootb_internal/preparation/__init__.py,sha256=AgtGHcBpiTkxJjF0xwcs3yyQ6SyUvhL3G0vD2XO-zJw,63
 computer_use_ootb_internal/preparation/star_rail_prepare.py,sha256=r0b19M_c1sXkN3_MRFjql8w_ThC9nZUe8zbSLYUvKS8,4635
-computer_use_ootb_internal-0.0.161.dist-info/METADATA,sha256=TUyvKo_1czFJyT-hybPZoWW-bjXoExOkhszsqxzFpwk,1048
-computer_use_ootb_internal-0.0.161.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.161.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
-computer_use_ootb_internal-0.0.161.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.163.dist-info/METADATA,sha256=sOJ6C_wWzwu6jp5zsWX9GseG1pabVxpIaEjkIRH-pRU,1048
+computer_use_ootb_internal-0.0.163.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.163.dist-info/entry_points.txt,sha256=bXfyAU_qq-G1EiEgAQEioXvgEdRCFxaTooqdDD9Y4OA,258
+computer_use_ootb_internal-0.0.163.dist-info/RECORD,,