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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: computer-use-ootb-internal
-Version: 0.0.160
+Version: 0.0.162
 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.162}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "computer-use-ootb-internal"
-version = "0.0.160"
+version = "0.0.162"
 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.162}/src/computer_use_ootb_internal/guard_service.py

@@ -226,9 +226,7 @@ class GuardService(win32serviceutil.ServiceFramework):
              self.log_info(f"Using target executable: {self.target_executable_path}")
 
         _service_instance = self
-        # Determine path to the signal script
-        self.signal_script_path = self._find_signal_script()
-        self.log_info(f"Service initialized. Target executable: {self.target_executable_path}. Signal script: {self.signal_script_path}")
+        self.log_info(f"Service initialized. Target executable: {self.target_executable_path}.")
 
     def SvcStop(self):
         self.log_info(f"Service stop requested.")
@@ -710,7 +708,7 @@ class GuardService(win32serviceutil.ServiceFramework):
         try:
             # 1. Ensure scheduled task exists (still useful fallback/persistence)
             try:
-                task_created = self.create_or_update_logon_task(user)
+                task_created = self.create_or_update_logon_task(user, calculated_port)
                 task_created_status = "task_success" if task_created else "task_failed"
             except Exception as task_err:
                  self.log_error(f"Internal trigger: Exception creating/updating task for {user}: {task_err}", exc_info=True)
@@ -758,74 +756,59 @@ 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...")
-            
-            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
+            # 4. Create/Update and Trigger Scheduled Task
+            immediate_start_status = "start_attempted_task_trigger"
+            self.log_info(f"Internal trigger: User '{user}' is active and not running. Attempting start via Task Scheduler...")
 
+            # --- Start Task Scheduler logic --- 
             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
-                target_exe_unquoted = self.target_executable_path.strip('"')
-                target_exe_for_ps = target_exe_unquoted.replace("'", "''") # Escape single quotes for PS strings
-                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} }}'"
+                # Step 4a: Ensure the task is created/updated correctly
+                # Pass calculated port to the task creation function
+                task_created = self.create_or_update_logon_task(user, calculated_port)
+                if not task_created:
+                    self.log_error(f"Internal trigger: Failed to create/update scheduled task for user '{user}'. Cannot proceed with start.")
+                    final_status = "failed_task_creation"
+                    return final_status
                 
-                lpApplicationName = None # Must be None if using lpCommandLine
-                cwd = os.path.dirname(target_exe_unquoted) if os.path.dirname(target_exe_unquoted) else None
+                # Step 4b: Trigger the task to run immediately
+                task_name = f"OOTB_UserConnect_{user}" # Must match the name used in create_or_update_logon_task
+                trigger_command = ["schtasks", "/Run", "/TN", task_name]
+                self.log_info(f"Internal trigger: Attempting to run task '{task_name}' immediately using: {trigger_command}")
+
+                result = subprocess.run(
+                    trigger_command,
+                    capture_output=True,
+                    text=True,
+                    check=False, # Check return code manually
+                    encoding='utf-8',
+                    errors='ignore' 
+                )
 
-                # 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'}")
+                if result.stdout:
+                    self.log_info(f"Internal trigger: schtasks /Run STDOUT:\n{result.stdout.strip()}")
+                if result.stderr:
+                    # schtasks often prints success message to stderr, log as info
+                    self.log_info(f"Internal trigger: schtasks /Run STDERR:\n{result.stderr.strip()}") 
                 
-                hProcess, hThread, dwPid, dwTid = win32process.CreateProcessAsUser(
-                    token, lpApplicationName, lpCommandLine, None, None, False,
-                    creation_flags, env, cwd, startup
-                )
-                # 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)
-            
+                if result.returncode == 0 or "SUCCESS: Attempted to run the scheduled task" in result.stdout or "SUCCESS: Attempted to run the scheduled task" in result.stderr:
+                    self.log_info(f"Internal trigger: Successfully triggered task '{task_name}' for user '{user}'.")
+                    immediate_start_status = "start_success_task_triggered"
+                    final_status = "success_task_triggered"
+                else:
+                    self.log_error(f"Internal trigger: Failed to trigger task '{task_name}' (Exit Code: {result.returncode}).")
+                    immediate_start_status = f"start_failed_task_trigger_code_{result.returncode}"
+                    final_status = f"failed_task_trigger_code_{result.returncode}"
+
+            except FileNotFoundError:
+                self.log_error("Internal trigger: 'schtasks.exe' not found.")
+                immediate_start_status = "start_failed_schtasks_not_found"
+                final_status = "failed_schtasks_not_found"
+            except Exception as task_trigger_err:
+                self.log_error(f"Internal trigger: Exception during task trigger for user '{user}': {task_trigger_err}", exc_info=True)
+                immediate_start_status = "start_failed_task_trigger_exception"
+                final_status = "failed_task_trigger_exception"
+            # --- End Task Scheduler logic ---
+
             # Combine results (mostly determined by start attempt now)
             # Example: final_status = f"{task_created_status}_{immediate_start_status}"
             return final_status
@@ -835,48 +818,35 @@ class GuardService(win32serviceutil.ServiceFramework):
              return "failed_trigger_exception"
 
 
-    def create_or_update_logon_task(self, username):
+    def create_or_update_logon_task(self, username, port):
         """Creates/updates task to trigger the internal signal script on session connect."""
-        if not self.signal_script_path:
-            self.log_error(f"Cannot create task for {username}: Signal script path is not set.")
+        if not self.target_executable_path:
+            self.log_error(f"Cannot create task for {username}: Target executable path not found.")
             return False
-        if not sys.executable:
-             self.log_error(f"Cannot create task for {username}: sys.executable is not found.")
-             return False
-        
-        # Use the python executable that the service itself is running under
-        python_exe = sys.executable
-        if ' ' in python_exe and not python_exe.startswith('"'):
-             python_exe = f'"{python_exe}"'
 
         task_name = f"OOTB_UserConnect_{username}"
-        # Action: Run python.exe with the signal script and username argument
-        action_executable = python_exe
-        # Ensure script path is quoted if needed
-        script_arg = self.signal_script_path # Should be quoted already by _find_signal_script
-        # Username might need quoting if it contains spaces, though unlikely
-        user_arg = username # Keep simple for now
-        action_arguments = f'{script_arg} "{user_arg}"' # Pass username as quoted arg
-        safe_action_executable = action_executable.replace("'", "''") # Escape for PS
-        safe_action_arguments = action_arguments.replace("'", "''") # Escape for PS
-        
-        # Working directory for the script (likely its own directory)
+        target_exe_unquoted = self.target_executable_path.strip('"')
+        target_exe_for_ps = target_exe_unquoted.replace("'", "''")
+        action_arguments = f"--port {port} --target_user '{username}'".replace("'", "''") # Arguments for the target exe
+
+        # Working directory for the executable
         try:
-            script_dir = os.path.dirname(self.signal_script_path.strip('"'))
-            if not script_dir: script_dir = "."
-            safe_working_directory = script_dir.replace("'", "''")
+            target_dir = os.path.dirname(target_exe_unquoted)
+            if not target_dir: target_dir = "."
+            safe_working_directory = target_dir.replace("'", "''")
             working_directory_setting = f"$action.WorkingDirectory = '{safe_working_directory}'"
         except Exception as e:
-             self.log_error(f"Error determining working directory for signal script task: {e}. WD will not be set.")
+             self.log_error(f"Error determining working directory for target exe task: {e}. WD will not be set.")
              working_directory_setting = "# Could not set WorkingDirectory"
 
         # PowerShell command construction
         ps_command = f"""
         $taskName = "{task_name}"
-        $principal = New-ScheduledTaskPrincipal -UserId "{username}" -LogonType Interactive
+        # Principal runs as the user, but with highest privileges
+        $principal = New-ScheduledTaskPrincipal -UserId "{username}" -LogonType Interactive -RunLevel Highest
         
-        # Action: Run python signal script
-        $action = New-ScheduledTaskAction -Execute '{safe_action_executable}' -Argument '{safe_action_arguments}'
+        # Action: Run the target executable directly with arguments
+        $action = New-ScheduledTaskAction -Execute '{target_exe_for_ps}' -Argument '{action_arguments}'
         {working_directory_setting}
 
         # Trigger: On session connect (Event ID 21)
@@ -946,24 +916,6 @@ class GuardService(win32serviceutil.ServiceFramework):
         self.log_info(f"Attempted removal of scheduled task '{task_name}' for user '{username}'.")
         return True
 
-    def _find_signal_script(self):
-        """Finds the signal_connection.py script relative to this service file."""
-        try:
-            base_dir = os.path.dirname(os.path.abspath(__file__))
-            script_path = os.path.join(base_dir, "signal_connection.py")
-            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}"'
-                return script_path
-            else:
-                self.log_error(f"Signal script signal_connection.py not found near {base_dir}")
-                return None
-        except Exception as e:
-            self.log_error(f"Error finding signal script: {e}")
-            return None
-
 # --- Main Execution Block ---
 if __name__ == '__main__':
     if len(sys.argv) > 1 and sys.argv[1] == 'debug':