Преглед изворни кода

Merge pull request #1886 from phansys/local-fs-check

Added local filesystem permission checks for self-update
Jordi Boggiano пре 12 година
родитељ
комит
b0b90cb61c

+ 14 - 3
src/Composer/Command/SelfUpdateCommand.php

@@ -14,6 +14,7 @@ namespace Composer\Command;
 
 use Composer\Composer;
 use Composer\Util\RemoteFilesystem;
+use Composer\Downloader\FilesystemException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -41,6 +42,18 @@ EOT
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $localFilename = realpath($_SERVER['argv'][0]) ?: $_SERVER['argv'][0];
+        $tempFilename = dirname($localFilename) . '/' . basename($localFilename, '.phar').'-temp.phar';
+        
+        // check for permissions in local filesystem before start connection process
+        if (!is_writable($tempDirectory = dirname($tempFilename))) {
+            throw new FilesystemException('Composer update failed: the "'.$tempDirectory.'" directory used to download the temp file could not be written');
+        }
+        
+        if (!is_writable($localFilename)) {
+            throw new FilesystemException('Composer update failed: the "'.$localFilename. '" file could not be written');
+        }
+        
         $protocol = extension_loaded('openssl') ? 'https' : 'http';
         $rfs = new RemoteFilesystem($this->getIO());
         $latest = trim($rfs->getContents('getcomposer.org', $protocol . '://getcomposer.org/version', false));
@@ -48,9 +61,7 @@ EOT
         if (Composer::VERSION !== $latest) {
             $output->writeln(sprintf("Updating to version <info>%s</info>.", $latest));
 
-            $remoteFilename = $protocol . '://getcomposer.org/composer.phar';
-            $localFilename = realpath($_SERVER['argv'][0]) ?: $_SERVER['argv'][0];
-            $tempFilename = dirname($localFilename) . '/' . basename($localFilename, '.phar').'-temp.phar';
+            $remoteFilename = $protocol . '://getcomposer.org/composer.phar';            
 
             $rfs->copy('getcomposer.org', $remoteFilename, $tempFilename);
 

+ 26 - 0
src/Composer/Downloader/FilesystemException.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Downloader;
+
+/**
+ * Exception thrown when issues exist on local filesystem
+ * 
+ * @author Javier Spagnoletti <jspagnoletti@javierspagnoletti.com.ar>
+ */
+class FilesystemException extends \Exception
+{
+    public function __construct($message = null, $code = null, \Exception $previous = null)
+    {
+        parent::__construct("Filesystem exception: \n".$message, $code, $previous);
+    }
+}