Fix escaping of URLs in Perforce and Subversion drivers

composer · Aug 25, 2018 · bf125295df9da84c44989e33f9f84b4ed4f8ea56 · staabm · Sep 4, 2018 · Seldaek
1 parent 3d01ef2
commit bf125295df9da84c44989e33f9f84b4ed4f8ea56
diff --git a/src/Composer/Repository/Vcs/FossilDriver.php b/src/Composer/Repository/Vcs/FossilDriver.php
@@ -226,7 +226,7 @@ public static function supports(IOInterface $io, Config $config, $url, $deep = f
                return false;
            }

-            $process = new ProcessExecutor();
+            $process = new ProcessExecutor($io);
            // check whether there is a fossil repo in that path
            if ($process->execute('fossil info', $output, $url) === 0) {
                return true;
diff --git a/src/Composer/Repository/Vcs/HgDriver.php b/src/Composer/Repository/Vcs/HgDriver.php
@@ -211,7 +211,7 @@ public static function supports(IOInterface $io, Config $config, $url, $deep = f
                return false;
            }

-            $process = new ProcessExecutor();
+            $process = new ProcessExecutor($io);
            // check whether there is a hg repo in that path
            if ($process->execute('hg summary', $output, $url) === 0) {
                return true;
@@ -222,7 +222,7 @@ public static function supports(IOInterface $io, Config $config, $url, $deep = f
            return false;
        }

-        $processExecutor = new ProcessExecutor();
+        $processExecutor = new ProcessExecutor($io);
        $exit = $processExecutor->execute(sprintf('hg identify %s', ProcessExecutor::escape($url)), $ignored);

        return $exit === 0;
diff --git a/src/Composer/Repository/Vcs/SvnDriver.php b/src/Composer/Repository/Vcs/SvnDriver.php
@@ -307,10 +307,10 @@ public static function supports(IOInterface $io, Config $config, $url, $deep = f
            return false;
        }

-        $processExecutor = new ProcessExecutor();
+        $processExecutor = new ProcessExecutor($io);

        $exit = $processExecutor->execute(
-            "svn info --non-interactive {$url}",
+            "svn info --non-interactive ".ProcessExecutor::escape('{'.$url.'}'),
            $ignoredOutput
        );

diff --git a/src/Composer/Util/Bitbucket.php b/src/Composer/Util/Bitbucket.php
@@ -44,7 +44,7 @@ public function __construct(IOInterface $io, Config $config, ProcessExecutor $pr
    {
        $this->io = $io;
        $this->config = $config;
-        $this->process = $process ?: new ProcessExecutor;
+        $this->process = $process ?: new ProcessExecutor($io);
        $this->remoteFilesystem = $remoteFilesystem ?: Factory::createRemoteFilesystem($this->io, $config);
        $this->time = $time;
    }
diff --git a/src/Composer/Util/Filesystem.php b/src/Composer/Util/Filesystem.php
@@ -527,7 +527,7 @@ protected function directorySize($directory)

    protected function getProcess()
    {
-        return new ProcessExecutor;
+        return $this->processExecutor;
    }

    /**
diff --git a/src/Composer/Util/GitHub.php b/src/Composer/Util/GitHub.php
@@ -39,7 +39,7 @@ public function __construct(IOInterface $io, Config $config, ProcessExecutor $pr
    {
        $this->io = $io;
        $this->config = $config;
-        $this->process = $process ?: new ProcessExecutor;
+        $this->process = $process ?: new ProcessExecutor($io);
        $this->remoteFilesystem = $remoteFilesystem ?: Factory::createRemoteFilesystem($this->io, $config);
    }

diff --git a/src/Composer/Util/GitLab.php b/src/Composer/Util/GitLab.php
@@ -40,7 +40,7 @@ public function __construct(IOInterface $io, Config $config, ProcessExecutor $pr
    {
        $this->io = $io;
        $this->config = $config;
-        $this->process = $process ?: new ProcessExecutor();
+        $this->process = $process ?: new ProcessExecutor($io);
        $this->remoteFilesystem = $remoteFilesystem ?: Factory::createRemoteFilesystem($this->io, $config);
    }

diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php
@@ -58,7 +58,7 @@ public static function checkServerExists($url, ProcessExecutor $processExecutor)
    {
        $output = null;

-        return  0 === $processExecutor->execute('p4 -p ' . $url . ' info -s', $output);
+        return  0 === $processExecutor->execute('p4 -p ' . ProcessExecutor::escape($url) . ' info -s', $output);
    }

    public function initialize($repoConfig)
@@ -105,7 +105,7 @@ public function generateUniquePerforceClientName()
    public function cleanupClientSpec()
    {
        $client = $this->getClient();
-        $task = 'client -d ' . $client;
+        $task = 'client -d ' . ProcessExecutor::escape($client);
        $useP4Client = false;
        $command = $this->generateP4Command($task, $useP4Client);
        $this->executeCommand($command);
@@ -383,7 +383,7 @@ public function p4Login()
            if ($this->windowsFlag) {
                $this->windowsLogin($password);
            } else {
-                $command = 'echo ' . $password  . ' | ' . $this->generateP4Command(' login -a', false);
+                $command = 'echo ' . ProcessExecutor::escape($password)  . ' | ' . $this->generateP4Command(' login -a', false);
                $exitCode = $this->executeCommand($command);
                $result = trim($this->commandResult);
                if ($exitCode) {
@@ -408,7 +408,7 @@ public function getFileContent($file, $identifier)
    {
        $path = $this->getFilePath($file, $identifier);

-        $command = $this->generateP4Command(' print ' . $path);
+        $command = $this->generateP4Command(' print ' . ProcessExecutor::escape($path));
        $this->executeCommand($command);
        $result = $this->commandResult;

@@ -429,7 +429,7 @@ public function getFilePath($file, $identifier)
        }

        $path = substr($identifier, 0, $index) . '/' . $file . substr($identifier, $index);
-        $command = $this->generateP4Command(' files ' . $path, false);
+        $command = $this->generateP4Command(' files ' . ProcessExecutor::escape($path), false);
        $this->executeCommand($command);
        $result = $this->commandResult;
        $index2 = strpos($result, 'no such file(s).');
@@ -452,7 +452,7 @@ public function getBranches()
        if (!$this->isStream()) {
            $possibleBranches[$this->p4Branch] = $this->getStream();
        } else {
-            $command = $this->generateP4Command('streams //' . $this->p4Depot . '/...');
+            $command = $this->generateP4Command('streams '.ProcessExecutor::escape('//' . $this->p4Depot . '/...'));
            $this->executeCommand($command);
            $result = $this->commandResult;
            $resArray = explode(PHP_EOL, $result);
@@ -464,7 +464,7 @@ public function getBranches()
                }
            }
        }
-        $command = $this->generateP4Command('changes '. $this->getStream() . '/...', false);
+        $command = $this->generateP4Command('changes '. ProcessExecutor::escape($this->getStream() . '/...'), false);
        $this->executeCommand($command);
        $result = $this->commandResult;
        $resArray = explode(PHP_EOL, $result);
@@ -527,7 +527,7 @@ protected function getChangeList($reference)
            return null;
        }
        $label = substr($reference, $index);
-        $command = $this->generateP4Command(' changes -m1 ' . $label);
+        $command = $this->generateP4Command(' changes -m1 ' . ProcessExecutor::escape($label));
        $this->executeCommand($command);
        $changes = $this->commandResult;
        if (strpos($changes, 'Change') !== 0) {
@@ -555,7 +555,7 @@ public function getCommitLogs($fromReference, $toReference)
        }
        $index = strpos($fromReference, '@');
        $main = substr($fromReference, 0, $index) . '/...';
-        $command = $this->generateP4Command('filelog ' . $main . '@' . $fromChangeList. ',' . $toChangeList);
+        $command = $this->generateP4Command('filelog ' . ProcessExecutor::escape($main . '@' . $fromChangeList. ',' . $toChangeList));
        $this->executeCommand($command);

        return $this->commandResult;
diff --git a/src/Composer/Util/Svn.php b/src/Composer/Util/Svn.php
@@ -79,7 +79,7 @@ public function __construct($url, IOInterface $io, Config $config, ProcessExecut
        $this->url = $url;
        $this->io = $io;
        $this->config = $config;
-        $this->process = $process ?: new ProcessExecutor;
+        $this->process = $process ?: new ProcessExecutor($io);
    }

    public static function cleanEnv()
diff --git a/tests/Composer/Test/Util/PerforceTest.php b/tests/Composer/Test/Util/PerforceTest.php
@@ -14,6 +14,7 @@

 use Composer\Util\Perforce;
 use PHPUnit\Framework\TestCase;
+use Composer\Util\ProcessExecutor;

 /**
 * @author Matt Whittom <Matt.Whittom@veteransunited.com>
@@ -344,7 +345,7 @@ public function testGetBranchesWithStream()
    {
        $this->setPerforceToStream();

-        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port streams //depot/...';
+        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port streams '.ProcessExecutor::escape('//depot/...');
        $this->processExecutor->expects($this->at(0))
            ->method('execute')
            ->with($this->equalTo($expectedCommand))
@@ -357,7 +358,7 @@ function ($command, &$output) {
                    }
                )
            );
-        $expectedCommand2 = 'p4 -u user -p port changes //depot/branch/...';
+        $expectedCommand2 = 'p4 -u user -p port changes '.ProcessExecutor::escape('//depot/branch/...');
        $expectedCallback = function ($command, &$output) {
            $output = 'Change 1234 on 2014/03/19 by Clark.Stuth@Clark.Stuth_test_client \'test changelist\'';

@@ -374,7 +375,7 @@ function ($command, &$output) {

    public function testGetBranchesWithoutStream()
    {
-        $expectedCommand = 'p4 -u user -p port changes //depot/...';
+        $expectedCommand = 'p4 -u user -p port changes '.ProcessExecutor::escape('//depot/...');
        $expectedCallback = function ($command, &$output) {
            $output = 'Change 5678 on 2014/03/19 by Clark.Stuth@Clark.Stuth_test_client \'test changelist\'';

@@ -458,7 +459,7 @@ function ($command, &$output) {

    public function testGetComposerInformationWithoutLabelWithoutStream()
    {
-        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port  print //depot/composer.json';
+        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port  print '.ProcessExecutor::escape('//depot/composer.json');
        $this->processExecutor->expects($this->at(0))
            ->method('execute')
            ->with($this->equalTo($expectedCommand))
@@ -484,7 +485,7 @@ function ($command, &$output) {

    public function testGetComposerInformationWithLabelWithoutStream()
    {
-        $expectedCommand = 'p4 -u user -p port  files //depot/composer.json@0.0.1';
+        $expectedCommand = 'p4 -u user -p port  files '.ProcessExecutor::escape('//depot/composer.json@0.0.1');
        $this->processExecutor->expects($this->at(0))
            ->method('execute')
            ->with($this->equalTo($expectedCommand))
@@ -498,7 +499,7 @@ function ($command, &$output) {
                )
            );

-        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port  print //depot/composer.json@10001';
+        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot -p port  print '.ProcessExecutor::escape('//depot/composer.json@10001');
        $this->processExecutor->expects($this->at(1))
            ->method('execute')
            ->with($this->equalTo($expectedCommand))
@@ -527,7 +528,7 @@ public function testGetComposerInformationWithoutLabelWithStream()
    {
        $this->setPerforceToStream();

-        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port  print //depot/branch/composer.json';
+        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port  print '.ProcessExecutor::escape('//depot/branch/composer.json');
        $this->processExecutor->expects($this->at(0))
            ->method('execute')
            ->with($this->equalTo($expectedCommand))
@@ -555,7 +556,7 @@ function ($command, &$output) {
    public function testGetComposerInformationWithLabelWithStream()
    {
        $this->setPerforceToStream();
-        $expectedCommand = 'p4 -u user -p port  files //depot/branch/composer.json@0.0.1';
+        $expectedCommand = 'p4 -u user -p port  files '.ProcessExecutor::escape('//depot/branch/composer.json@0.0.1');
        $this->processExecutor->expects($this->at(0))
            ->method('execute')
            ->with($this->equalTo($expectedCommand))
@@ -569,7 +570,7 @@ function ($command, &$output) {
                )
            );

-        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port  print //depot/branch/composer.json@10001';
+        $expectedCommand = 'p4 -u user -c composer_perforce_TEST_depot_branch -p port  print '.ProcessExecutor::escape('//depot/branch/composer.json@10001');
        $this->processExecutor->expects($this->at(1))
            ->method('execute')
            ->with($this->equalTo($expectedCommand))
@@ -621,7 +622,7 @@ public function testCheckServerExists()
    {
        $processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();

-        $expectedCommand = 'p4 -p perforce.does.exist:port info -s';
+        $expectedCommand = 'p4 -p '.ProcessExecutor::escape('perforce.does.exist:port').' info -s';
        $processExecutor->expects($this->at(0))
            ->method('execute')
            ->with($this->equalTo($expectedCommand), $this->equalTo(null))
@@ -642,7 +643,7 @@ public function testCheckServerClientError()
    {
        $processExecutor = $this->getMockBuilder('Composer\Util\ProcessExecutor')->getMock();

-        $expectedCommand = 'p4 -p perforce.does.exist:port info -s';
+        $expectedCommand = 'p4 -p '.ProcessExecutor::escape('perforce.does.exist:port').' info -s';
        $processExecutor->expects($this->at(0))
            ->method('execute')
            ->with($this->equalTo($expectedCommand), $this->equalTo(null))
@@ -712,7 +713,7 @@ public function testCleanupClientSpecShouldDeleteClient()
        $this->perforce->setFilesystem($fs);

        $testClient = $this->perforce->getClient();
-        $expectedCommand = 'p4 -u ' . self::TEST_P4USER . ' -p ' . self::TEST_PORT . ' client -d ' . $testClient;
+        $expectedCommand = 'p4 -u ' . self::TEST_P4USER . ' -p ' . self::TEST_PORT . ' client -d ' . ProcessExecutor::escape($testClient);
        $this->processExecutor->expects($this->once())->method('execute')->with($this->equalTo($expectedCommand));

        $fs->expects($this->once())->method('remove')->with($this->perforce->getP4ClientSpec());