hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-05 17:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows: fix infinite loop in native.ff_cmdline()

Browse source 
On native messenger >= 0.3.3, we now just directly ask for the
messenger's parent's command line.
On native messenger < 0.3.3, we loop up the process tree like before,
but we now respect 'browser' and gracefully fail if no matching process
is found.
This commit is contained in:
Rummskartoffel 2021-03-04 22:08:01 +01:00
parent 43429f4651
commit bb0e567d77
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/lib/native.ts
View file

@ -471,21 +471,34 @@ export async function clipboard(
/**
* This returns the commandline that was used to start Firefox.
* You'll get both the binary (not necessarily an absolute path) and flags.
*
* On Windows, the main Firefox process is not the direct parent of the native
* messenger's process, so we need to go up the process tree till we find it.
* That's rather slow, so this function shouldn't be called unless really necessary.
*/
export async function ff_cmdline(): Promise<string[]> {
let output: MessageResp
if ((await browserBg.runtime.getPlatformInfo()).os === "win") {
output = await run(
"powershell -Command " +
'"$ppid = Get-CimInstance -Property ProcessId,ParentProcessId Win32_Process | Where-Object -Property ProcessId -EQ $PID | Select-Object -ExpandProperty ParentProcessId;' +
"$pproc = Get-CimInstance -Property ProcessId,ParentProcessId,Name,CommandLine Win32_Process | Where-Object -Property ProcessId -EQ $ppid;" +
"while ($pproc.Name -notmatch 'firefox') { $ppid = $pproc.ParentProcessId;" +
'$pproc = Get-CimInstance Win32_Process | Where-Object -Property ProcessId -EQ $ppid}; Write-Output $pproc.CommandLine"',
)
if (!(await nativegate("0.3.3", false))) {
const browser = await config.get("browser")
output = await run(
`powershell -NoProfile -Command "\
$processes = Get-CimInstance -Property ProcessId,ParentProcessId,Name,CommandLine -ClassName Win32_Process;\
if (-not ($processes | where { $_.Name -match '^${browser}' })) { exit 1; };\
$ppid = ($processes | where { $_.ProcessId -EQ $PID }).ParentProcessId;\
$pproc = $processes | where { $_.ProcessId -EQ $ppid };\
while ($pproc.Name -notmatch '^${browser}') {\
$ppid = $pproc.ParentProcessId;\
$pproc = $processes | where { $_.ProcessId -EQ $ppid };\
};\
Write-Output $pproc.CommandLine;\
"`,
)
} else {
output = await run(
`powershell -NoProfile -Command "\
Get-CimInstance -Property CommandLine,ProcessId -ClassName Win32_Process \
| where { $_.ProcessId -EQ ${(await sendNativeMsg("ppid", {})).content} } \
| select -ExpandProperty CommandLine | Write-Output\
"`
)
}
} else {
const actualVersion = await getNativeMessengerVersion()