fix(windows): require exact cleanup process identity

Author: TokinoChanshi

windows/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Windows Changelog
 
+## 未发布
+
+### 安全
+
+- injector 与托盘清理现在会解析完整命令行参数，只接受 Dream Skin 自己生成的独立参数；脚本路径、`--watch`、端口或 Browser ID 仅作为其他参数中的文本出现时，不再被当作进程身份依据。
+- Restore 只会终止以真实 PowerShell `-File` 模式运行受管托盘脚本的进程；无法枚举、停止或确认退出时会保留 state 并中止恢复，不再把失败降级成警告后继续修改配置。
+
 ## 1.2.0 — 2026-07-17
 
 ### 新增

windows/references/runtime-notes.md

@@ -10,6 +10,7 @@
 - If Codex is already running without the chosen debugging port, the shortcut asks before restart; CLI callers must close it or explicitly pass `-RestartExisting`.
 - Restore does not require Node to remain installed: it preflights config backups, closes Codex to clear live DOM and CDP, stops only the verified recorded injector, applies requested config changes, then reopens the official app without debug flags.
 - A live recorded injector whose PID no longer matches the saved Node path, injector command line, port, Browser ID, or start time causes start/restore to abort with state preserved; it is never silently archived and replaced.
+- Injector and tray cleanup parse a strict subset of the command-line form emitted by Dream Skin. Paths and identity options must be complete arguments, and the tray path must follow PowerShell's actual `-File` selector; ambiguous, malformed, or command-mode lines fail closed instead of triggering process termination.
 - The managed theme root rejects junctions and symbolic links before initialization, import, save, switch, pause, or state writes. Windows uses the bundled Node image-metadata helper to enforce the same 16 MB, 16384px, and 50MP limits before an import is copied.
 - `config.toml` is read from raw bytes as strict UTF-8, written without BOM through same-directory atomic replacement, and backed up byte-for-byte. Install requires Codex to be closed; writes stage the temporary file first, then abort if the destination bytes changed immediately before replacement. Quoted keys and table-header comments are supported; escaped target keys, multiline strings/arrays, dotted target keys, or duplicate target keys fail before writing. Completed restore backups are retained as `config.restored-*.toml` so reinstall captures a fresh baseline.
 - A per-user named mutex prevents concurrent install, start, restore, and verify operations from racing state, ports, or config writes.

windows/scripts/common-windows.ps1

@@ -244,11 +244,117 @@ function Install-DreamSkinRuntimeEngine {
   }
 }
 
+function ConvertFrom-DreamSkinStrictCommandLine {
+  param([string]$CommandLine)
+  if (-not $CommandLine) { return $null }
+
+  $tokens = [System.Collections.Generic.List[string]]::new()
+  $index = 0
+  while ($index -lt $CommandLine.Length) {
+    while ($index -lt $CommandLine.Length -and [char]::IsWhiteSpace($CommandLine[$index])) {
+      $index++
+    }
+    if ($index -ge $CommandLine.Length) { break }
+
+    $quoted = $CommandLine[$index] -eq '"'
+    if ($quoted) { $index++ }
+    $builder = [System.Text.StringBuilder]::new()
+    $closed = -not $quoted
+    while ($index -lt $CommandLine.Length) {
+      $character = $CommandLine[$index]
+      if ($quoted -and $character -eq '"') {
+        $closed = $true
+        $index++
+        break
+      }
+      if (-not $quoted -and [char]::IsWhiteSpace($character)) { break }
+      if (-not $quoted -and $character -eq '"') { return $null }
+      [void]$builder.Append($character)
+      $index++
+    }
+    if (-not $closed) { return $null }
+    if ($index -lt $CommandLine.Length -and -not [char]::IsWhiteSpace($CommandLine[$index])) {
+      return $null
+    }
+    $tokens.Add($builder.ToString())
+  }
+  return $tokens.ToArray()
+}
+
 function Test-DreamSkinCommandLineToken {
   param([string]$CommandLine, [string]$Token)
   if (-not $CommandLine -or -not $Token) { return $false }
-  $pattern = '(?i)(?:^|[\s"])' + [regex]::Escape($Token) + '(?=$|[\s"])'
-  return [regex]::IsMatch($CommandLine, $pattern)
+  $arguments = @(ConvertFrom-DreamSkinStrictCommandLine -CommandLine $CommandLine)
+  return @($arguments | Where-Object { $_ -ieq $Token }).Count -eq 1
+}
+
+function Test-DreamSkinNamedArgument {
+  param([string[]]$Arguments, [string]$Name, [string]$Value)
+  if (-not $Arguments -or -not $Name -or $null -eq $Value) { return $false }
+  $matches = 0
+  for ($index = 0; $index -lt $Arguments.Count; $index++) {
+    if ($Arguments[$index] -ieq $Name) {
+      if ($index + 1 -ge $Arguments.Count -or $Arguments[$index + 1] -cne $Value) { return $false }
+      $matches++
+      $index++
+      continue
+    }
+    $prefix = "$Name="
+    if ($Arguments[$index].StartsWith($prefix, [System.StringComparison]::OrdinalIgnoreCase)) {
+      if ($Arguments[$index].Substring($prefix.Length) -cne $Value) { return $false }
+      $matches++
+    }
+  }
+  return $matches -eq 1
+}
+
+function Test-DreamSkinInjectorCommandLine {
+  param([string]$CommandLine, [string]$InjectorPath, [int]$Port, [string]$BrowserId)
+  $arguments = @(ConvertFrom-DreamSkinStrictCommandLine -CommandLine $CommandLine)
+  if ($arguments.Count -lt 3 -or
+      -not (Test-DreamSkinPathEqual -Left $arguments[1] -Right $InjectorPath) -or
+      $arguments[2] -cne '--watch') {
+    return $false
+  }
+  return (Test-DreamSkinNamedArgument -Arguments $arguments -Name '--port' -Value "$Port") -and
+    (Test-DreamSkinNamedArgument -Arguments $arguments -Name '--browser-id' -Value $BrowserId)
+}
+
+function Test-DreamSkinPowerShellFileCommandLine {
+  param([string]$CommandLine, [string]$ScriptPath)
+  $arguments = @(ConvertFrom-DreamSkinStrictCommandLine -CommandLine $CommandLine)
+  if ($arguments.Count -lt 3) { return $false }
+  $hostName = [System.IO.Path]::GetFileName($arguments[0])
+  if ($hostName -ine 'powershell.exe' -and $hostName -ine 'pwsh.exe') { return $false }
+
+  for ($index = 1; $index -lt $arguments.Count; $index++) {
+    $argument = $arguments[$index]
+    if ($argument -ieq '-File') {
+      return $index + 1 -lt $arguments.Count -and
+        (Test-DreamSkinPathEqual -Left $arguments[$index + 1] -Right $ScriptPath)
+    }
+    if ($argument -iin @('-NoProfile', '-NoLogo', '-NonInteractive', '-STA', '-MTA')) {
+      continue
+    }
+    if ($argument -ieq '-WindowStyle') {
+      if ($index + 1 -ge $arguments.Count -or
+          $arguments[$index + 1] -inotmatch '^(Normal|Minimized|Maximized|Hidden)$') {
+        return $false
+      }
+      $index++
+      continue
+    }
+    if ($argument -ieq '-ExecutionPolicy') {
+      if ($index + 1 -ge $arguments.Count -or
+          $arguments[$index + 1] -inotmatch '^(AllSigned|Bypass|Default|RemoteSigned|Restricted|Undefined|Unrestricted)$') {
+        return $false
+      }
+      $index++
+      continue
+    }
+    return $false
+  }
+  return $false
 }
 
 function ConvertTo-DreamSkinProcessArgument {
@@ -739,19 +845,9 @@ function Stop-DreamSkinRecordedInjector {
   $isNodeExecutable = [System.IO.Path]::GetFileName("$processPath") -ieq 'node.exe'
   $nodeMatches = -not $State.nodePath -or
     (Test-DreamSkinPathEqual -Left $processPath -Right "$($State.nodePath)")
-  $injectorMatches = [bool]($expectedInjector -and
-    (Test-DreamSkinCommandLineToken -CommandLine $commandLine -Token $expectedInjector) -and
-    (Test-DreamSkinCommandLineToken -CommandLine $commandLine -Token '--watch'))
-  if ($State.port) {
-    $portPattern = '(?i)(?:^|\s)--port(?:=|\s+)' + [regex]::Escape("$($State.port)") + '(?=$|\s)'
-    $injectorMatches = $injectorMatches -and [regex]::IsMatch($commandLine, $portPattern)
-  } else {
-    $injectorMatches = $false
-  }
-  if ($State.browserId) {
-    $browserPattern = '(?:^|\s)(?i:--browser-id)(?:=|\s+)' + [regex]::Escape("$($State.browserId)") + '(?=$|\s)'
-    $injectorMatches = $injectorMatches -and [regex]::IsMatch($commandLine, $browserPattern)
-  }
+  $injectorMatches = [bool]($expectedInjector -and $State.port -and $State.browserId -and
+    (Test-DreamSkinInjectorCommandLine -CommandLine $commandLine `
+      -InjectorPath $expectedInjector -Port ([int]$State.port) -BrowserId "$($State.browserId)"))
   $startedAt = Get-DreamSkinProcessStartedAt -ProcessId $processId
   $startMatches = -not $State.injectorStartedAt -or $startedAt -eq "$($State.injectorStartedAt)"
   $identityMatches = [bool]($isNodeExecutable -and $nodeMatches -and $injectorMatches -and $startMatches)

windows/scripts/restore-dream-skin.ps1

@@ -16,17 +16,18 @@ $PortExplicit = $PSBoundParameters.ContainsKey('Port')
 
 function Stop-DreamSkinTrayProcess {
   $trayScript = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot 'tray-dream-skin.ps1'))
-  try {
-    $processes = Get-CimInstance Win32_Process -Filter "Name = 'powershell.exe' OR Name = 'pwsh.exe'" `
-      -ErrorAction Stop
-    foreach ($process in $processes) {
-      if ($process.ProcessId -eq $PID -or -not $process.CommandLine) { continue }
-      if ($process.CommandLine.IndexOf($trayScript, [System.StringComparison]::OrdinalIgnoreCase) -ge 0) {
-        Stop-Process -Id $process.ProcessId -Force -ErrorAction Stop
-      }
+  $processes = Get-CimInstance Win32_Process -Filter "Name = 'powershell.exe' OR Name = 'pwsh.exe'" `
+    -ErrorAction Stop
+  foreach ($process in $processes) {
+    if ($process.ProcessId -eq $PID -or -not $process.CommandLine) { continue }
+    if (-not (Test-DreamSkinPowerShellFileCommandLine `
+        -CommandLine "$($process.CommandLine)" -ScriptPath $trayScript)) { continue }
+
+    Stop-Process -Id $process.ProcessId -Force -ErrorAction Stop
+    try { Wait-Process -Id $process.ProcessId -Timeout 5 -ErrorAction Stop } catch {}
+    if (Get-Process -Id $process.ProcessId -ErrorAction SilentlyContinue) {
+      throw "Dream Skin tray process $($process.ProcessId) did not stop."
     }
-  } catch {
-    Write-Warning "Could not close the Dream Skin tray automatically: $($_.Exception.Message)"
   }
 }
 

windows/tests/run-tests.ps1

@@ -489,10 +489,40 @@ try {
       throw 'Accepted an inconsistent CDP page target.'
     }
   }
-  $watchCommand = '"C:\Program Files\nodejs\node.exe" "C:\Dream Skin\injector.mjs" --watch --port 9335 --browser-id browser-123'
-  if (-not (Test-DreamSkinCommandLineToken -CommandLine $watchCommand -Token 'C:\Dream Skin\injector.mjs') -or
-    (Test-DreamSkinCommandLineToken -CommandLine $watchCommand -Token 'Dream Skin\injector.mjs')) {
-    throw 'Injector command-line token validation is not boundary-safe.'
+  $injectorPath = 'C:\Dream Skin\engine\scripts\injector.mjs'
+  $validInjectorCommand = '"C:\Program Files\nodejs\node.exe" "C:\Dream Skin\engine\scripts\injector.mjs" --watch --port 9335 --browser-id browser-1 --theme-dir "C:\Dream Skin\active-theme" --pause-file "C:\Dream Skin\paused"'
+  $embeddedInjectorCommand = '"C:\Program Files\nodejs\node.exe" "harmless C:\Dream Skin\engine\scripts\injector.mjs --watch --port 9335 --browser-id browser-1 text"'
+  if (-not (Test-DreamSkinInjectorCommandLine -CommandLine $validInjectorCommand `
+        -InjectorPath $injectorPath -Port 9335 -BrowserId 'browser-1')) {
+    throw 'Rejected the exact Dream Skin injector command line.'
+  }
+  if (Test-DreamSkinInjectorCommandLine -CommandLine $embeddedInjectorCommand `
+      -InjectorPath $injectorPath -Port 9335 -BrowserId 'browser-1') {
+    throw 'Accepted injector identity text embedded inside an unrelated argument.'
+  }
+  $duplicateInjectorCommand = $validInjectorCommand + ' --port 9335'
+  if (Test-DreamSkinInjectorCommandLine -CommandLine $duplicateInjectorCommand `
+      -InjectorPath $injectorPath -Port 9335 -BrowserId 'browser-1') {
+    throw 'Accepted duplicate injector identity options.'
+  }
+  $malformedInjectorCommand = '"C:\Program Files\nodejs\node.exe" "C:\Dream Skin\engine\scripts\injector.mjs --watch --port 9335 --browser-id browser-1'
+  if (Test-DreamSkinInjectorCommandLine -CommandLine $malformedInjectorCommand `
+      -InjectorPath $injectorPath -Port 9335 -BrowserId 'browser-1') {
+    throw 'Accepted an unclosed quoted injector command line.'
+  }
+
+  $trayPath = 'C:\Dream Skin\engine\scripts\tray-dream-skin.ps1'
+  $validTrayCommand = 'powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Dream Skin\engine\scripts\tray-dream-skin.ps1" -Port 9335'
+  $embeddedTrayCommand = 'powershell.exe -NoProfile -Command "Write-Output C:\Dream Skin\engine\scripts\tray-dream-skin.ps1"'
+  if (-not (Test-DreamSkinPowerShellFileCommandLine -CommandLine $validTrayCommand -ScriptPath $trayPath)) {
+    throw 'Rejected the exact Dream Skin tray -File command line.'
+  }
+  if (Test-DreamSkinPowerShellFileCommandLine -CommandLine $embeddedTrayCommand -ScriptPath $trayPath) {
+    throw 'Accepted tray script text that was not the PowerShell -File argument.'
+  }
+  $commandModeTraySpoof = 'powershell.exe -NoProfile -Command Write-Output -File "C:\Dream Skin\engine\scripts\tray-dream-skin.ps1"'
+  if (Test-DreamSkinPowerShellFileCommandLine -CommandLine $commandModeTraySpoof -ScriptPath $trayPath) {
+    throw 'Accepted a tray path following PowerShell command mode as a -File selector.'
   }
   if (-not (Test-DreamSkinBrowserId -Value 'browser-123') -or
     (Test-DreamSkinBrowserId -Value 'browser 123')) {
@@ -774,6 +804,11 @@ try {
   if (-not $restoreSource.Contains('Stop-DreamSkinTrayProcess')) {
     throw 'Complete restore does not stop a separately launched tray process.'
   }
+  if (-not $restoreSource.Contains('Test-DreamSkinPowerShellFileCommandLine') -or
+      $restoreSource.Contains('.IndexOf($trayScript') -or
+      $restoreSource.Contains('Could not close the Dream Skin tray automatically')) {
+    throw 'Restore does not require exact, fail-closed tray process identity.'
+  }
   if ($restoreSource.Contains('Start-Process -FilePath $relaunchCodex.Executable') -or
     -not $restoreSource.Contains('Start-DreamSkinCodex -Codex $relaunchCodex')) {
     throw 'Restore still executes the WindowsApps path instead of activating the registered package.'