bug #22614 [Process] Fixed escaping arguments on Windows when inheritEnvironmentVariables is set to false (maryo)
This PR was merged into the 3.3 branch.
Discussion
----------
[Process] Fixed escaping arguments on Windows when inheritEnvironmentVariables is set to false
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | no
| Fixed tickets |
| License | MIT
| Doc PR |
I've added a FAILING testcase on Windows. It incorrectly substitutes an argument containing a quotation mark probably assuming it's an env var needed to backup when inheritEnvironmentVariables is set to false.
Commits
-------
26032ef
[Process] Fixed incorrectly escaping arguments on Windows when inheritEnvironmentVariables is set to false
This commit is contained in:
commit
82ec56b40c
@ -320,7 +320,7 @@ class Process implements \IteratorAggregate
|
|||||||
}
|
}
|
||||||
if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
|
if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
|
||||||
$this->options['bypass_shell'] = true;
|
$this->options['bypass_shell'] = true;
|
||||||
$commandline = $this->prepareWindowsCommandLine($commandline, $envBackup);
|
$commandline = $this->prepareWindowsCommandLine($commandline, $envBackup, $env);
|
||||||
} elseif (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
|
} elseif (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
|
||||||
// last exit code is output on the fourth pipe and caught to work around --enable-sigchild
|
// last exit code is output on the fourth pipe and caught to work around --enable-sigchild
|
||||||
$descriptors[3] = array('pipe', 'w');
|
$descriptors[3] = array('pipe', 'w');
|
||||||
@ -1627,7 +1627,7 @@ class Process implements \IteratorAggregate
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function prepareWindowsCommandLine($cmd, array &$envBackup)
|
private function prepareWindowsCommandLine($cmd, array &$envBackup, array &$env = null)
|
||||||
{
|
{
|
||||||
$uid = uniqid('', true);
|
$uid = uniqid('', true);
|
||||||
$varCount = 0;
|
$varCount = 0;
|
||||||
@ -1640,7 +1640,7 @@ class Process implements \IteratorAggregate
|
|||||||
[^"%!^]*+
|
[^"%!^]*+
|
||||||
)++
|
)++
|
||||||
)"/x',
|
)"/x',
|
||||||
function ($m) use (&$envBackup, &$varCache, &$varCount, $uid) {
|
function ($m) use (&$envBackup, &$env, &$varCache, &$varCount, $uid) {
|
||||||
if (isset($varCache[$m[0]])) {
|
if (isset($varCache[$m[0]])) {
|
||||||
return $varCache[$m[0]];
|
return $varCache[$m[0]];
|
||||||
}
|
}
|
||||||
@ -1652,10 +1652,15 @@ class Process implements \IteratorAggregate
|
|||||||
}
|
}
|
||||||
|
|
||||||
$value = str_replace(array('!LF!', '"^!"', '"^%"', '"^^"', '""'), array("\n", '!', '%', '^', '"'), $value);
|
$value = str_replace(array('!LF!', '"^!"', '"^%"', '"^^"', '""'), array("\n", '!', '%', '^', '"'), $value);
|
||||||
$value = preg_replace('/(\\\\*)"/', '$1$1\\"', $value);
|
$value = '"'.preg_replace('/(\\\\*)"/', '$1$1\\"', $value).'"';
|
||||||
|
|
||||||
$var = $uid.++$varCount;
|
$var = $uid.++$varCount;
|
||||||
putenv("$var=\"$value\"");
|
|
||||||
|
if (null === $env) {
|
||||||
|
putenv("$var=$value");
|
||||||
|
} else {
|
||||||
|
$env[$var] = $value;
|
||||||
|
}
|
||||||
|
|
||||||
$envBackup[$var] = false;
|
$envBackup[$var] = false;
|
||||||
|
|
||||||
return $varCache[$m[0]] = '!'.$var.'!';
|
return $varCache[$m[0]] = '!'.$var.'!';
|
||||||
|
@ -1465,6 +1465,19 @@ class ProcessTest extends TestCase
|
|||||||
$this->assertSame($arg, $p->getOutput());
|
$this->assertSame($arg, $p->getOutput());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideEscapeArgument
|
||||||
|
* @group legacy
|
||||||
|
*/
|
||||||
|
public function testEscapeArgumentWhenInheritEnvDisabled($arg)
|
||||||
|
{
|
||||||
|
$p = new Process(array(self::$phpBin, '-r', 'echo $argv[1];', $arg), null, array('BAR' => 'BAZ'));
|
||||||
|
$p->inheritEnvironmentVariables(false);
|
||||||
|
$p->run();
|
||||||
|
|
||||||
|
$this->assertSame($arg, $p->getOutput());
|
||||||
|
}
|
||||||
|
|
||||||
public function provideEscapeArgument()
|
public function provideEscapeArgument()
|
||||||
{
|
{
|
||||||
yield array('a"b%c%');
|
yield array('a"b%c%');
|
||||||
|
Reference in New Issue
Block a user