-
Notifications
You must be signed in to change notification settings - Fork 410
Add nativeSpawn option to RunCLIArgs for host process spawning #3481
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
chubes4
wants to merge
5
commits into
WordPress:trunk
Choose a base branch
from
chubes4:fix/native-spawn-handler
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+125
−17
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
137d134
Add nativeSpawn option to RunCLIArgs for host process spawning
chubes4 6344c67
Add standalone spawn handler test script
chubes4 cdd9652
Remove standalone test script with hardcoded paths
chubes4 0d0c560
Address review feedback: security warning, ESM compat, test name
chubes4 6d37af6
Skip proc_open tests on Windows (no /bin/echo)
chubes4 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import { spawn } from 'child_process'; | ||
| import { | ||
| SupportedPHPVersions, | ||
| setPhpIniEntries, | ||
| PHP, | ||
| type SpawnHandler, | ||
| } from '@php-wasm/universal'; | ||
| import { loadNodeRuntime } from '../lib'; | ||
|
|
||
| const phpVersions = | ||
| 'PHP' in process.env ? [process.env['PHP']!] : SupportedPHPVersions; | ||
|
|
||
| // These tests use /bin/echo and /bin/sh which are not available on Windows. | ||
| const isWindows = process.platform === 'win32'; | ||
| const describeUnix = isWindows ? describe.skip : describe; | ||
|
|
||
| describeUnix.each(phpVersions)('PHP %s – proc_open', (phpVersion) => { | ||
| let php: PHP; | ||
|
|
||
| beforeEach(async () => { | ||
| php = new PHP(await loadNodeRuntime(phpVersion as any)); | ||
| await setPhpIniEntries(php, { allow_url_fopen: 1 }); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| php.exit(); | ||
| }); | ||
|
|
||
| it('proc_open works with native spawn handler', async () => { | ||
| await php.setSpawnHandler(spawn as unknown as SpawnHandler); | ||
|
|
||
| const result = await php.run({ | ||
| code: `<?php | ||
| $desc = [ | ||
| 0 => ['pipe', 'r'], | ||
| 1 => ['pipe', 'w'], | ||
| 2 => ['pipe', 'w'], | ||
| ]; | ||
| $proc = proc_open('/bin/echo hello_from_proc_open', $desc, $pipes); | ||
| if (is_resource($proc)) { | ||
| $stdout = stream_get_contents($pipes[1]); | ||
| fclose($pipes[0]); | ||
| fclose($pipes[1]); | ||
| fclose($pipes[2]); | ||
| $code = proc_close($proc); | ||
| echo trim($stdout); | ||
| } else { | ||
| echo 'PROC_OPEN_FAILED'; | ||
| } | ||
| `, | ||
| }); | ||
|
|
||
| expect(result.text).toBe('hello_from_proc_open'); | ||
| }); | ||
|
|
||
| it('shell_exec works with native spawn handler', async () => { | ||
| await php.setSpawnHandler(spawn as unknown as SpawnHandler); | ||
|
|
||
| const result = await php.run({ | ||
| code: `<?php | ||
| $out = shell_exec('/bin/echo hello_from_shell_exec'); | ||
| echo trim($out ?? 'NULL'); | ||
| `, | ||
| }); | ||
|
|
||
| expect(result.text).toBe('hello_from_shell_exec'); | ||
| }); | ||
|
|
||
| it('proc_open fails without spawn handler', async () => { | ||
| const result = await php.run({ | ||
| code: `<?php | ||
| $desc = [1 => ['pipe', 'w'], 2 => ['pipe', 'w']]; | ||
| $proc = @proc_open('echo test', $desc, $pipes); | ||
| echo is_resource($proc) ? 'OPENED' : 'FAILED'; | ||
| `, | ||
| }); | ||
|
|
||
| // Without a spawn handler, proc_open should fail | ||
| expect(result.text).toBe('FAILED'); | ||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.