Add Authentification in FileDownloader

src/Composer/Command/InstallCommand.php

@@ -111,7 +111,7 @@ EOT
                 $request->install($package->getName(), $constraint);
             }
         } else {
-            $output->writeln('<info>Installing dependencies.</info>');
+            $output->writeln('<info>Installing dependencies</info>');
 
             $links = $this->collectLinks($input, $composer->getPackage());
 

src/Composer/Console/Application.php

@@ -99,11 +99,11 @@ class Application extends BaseApplication
         $file = new JsonFile($composerFile);
         if (!$file->exists()) {
             if ($composerFile === 'composer.json') {
-                echo 'Composer could not find a composer.json file in '.getcwd().PHP_EOL;
+                $this->io->writeln('Composer could not find a composer.json file in '.getcwd());
             } else {
-                echo 'Composer could not find the config file: '.$composerFile.PHP_EOL;
+                $this->io->writeln('Composer could not find the config file: '.$composerFile);
             }
-            echo 'To initialize a project, please create a composer.json file as described on the http://packagist.org/ "Getting Started" section'.PHP_EOL;
+            $this->io->writeln('To initialize a project, please create a composer.json file as described on the http://packagist.org/ "Getting Started" section');
             exit(1);
         }
 

src/Composer/Downloader/FileDownloader.php

@@ -77,29 +77,19 @@ abstract class FileDownloader implements DownloaderInterface
             }
         }
 
-        // Handle system proxy
-        $ctx = stream_context_create();
+        $auth = $this->io->getAuthentification($package->getSourceUrl());
 
-        if (isset($_SERVER['HTTP_PROXY'])) {
-            // http(s):// is not supported in proxy
-            $proxy = str_replace(array('http://', 'https://'), array('tcp://', 'ssl://'), $_SERVER['HTTP_PROXY']);
-
-            if (0 === strpos($proxy, 'ssl:') && !extension_loaded('openssl')) {
-                throw new \RuntimeException('You must enable the openssl extension to use a proxy over https');
-            }
-
-            $ctx = stream_context_create(array(
-                'http' => array(
-                    'proxy'           => $proxy,
-                    'request_fulluri' => true,
-                ),
-            ));
+        if (isset($_SERVER['HTTP_PROXY'])) {
+            // http(s):// is not supported in proxy
+            $proxy = str_replace(array('http://', 'https://'), array('tcp://', 'ssl://'), $_SERVER['HTTP_PROXY']);
+
+            if (0 === strpos($proxy, 'ssl:') && !extension_loaded('openssl')) {
+                throw new \RuntimeException('You must enable the openssl extension to use a proxy over https');
+            }
         }
 
-        stream_context_set_params($ctx, array("notification" => array($this, 'callbackDownload')));
-
         $this->io->overwrite("    Downloading: <comment>connection...</comment>", 80);
-        copy($url, $fileName, $ctx);
+        $this->copy($url, $fileName, $auth['username'], $auth['password']);
         $this->io->overwriteln("    Downloading", 80);
 
         if (!file_exists($fileName)) {
@@ -156,52 +146,88 @@ abstract class FileDownloader implements DownloaderInterface
     /**
      * Download notification action.
      *
-     * @param integer $notificationCode The notification code
-     * @param integer $severity         The severity level
-     * @param string  $message          The message
-     * @param integer $messageCode      The message code
-     * @param integer $bytesTransferred The loaded size
-     * @param integer $bytesMax         The total size
+     * @param integer $sizeTotal  The total size
+     * @param integer $sizeLoaded The loaded size
      */
-    protected function callbackDownload($notificationCode, $severity, $message, $messageCode, $bytesTransferred, $bytesMax)
+    protected function callbackDownload($sizeTotal, $sizeLoaded)
     {
-        switch ($notificationCode) {
-            case STREAM_NOTIFY_AUTH_REQUIRED:
-                break;
-
-            case STREAM_NOTIFY_FILE_SIZE_IS:
-                if ($this->bytesMax < $bytesMax) {
-                    $this->bytesMax = $bytesMax;
-                }
-
-                break;
-
-            case STREAM_NOTIFY_PROGRESS:
-                if ($this->bytesMax > 0) {
-                    $progression = 0;
+        if ($sizeTotal > 1024) {
+            $progression = 0;
 
-                    if ($this->bytesMax > 0) {
-                        $progression = ($bytesTransferred / $this->bytesMax * 100);
-                    }
+            if ($sizeTotal > 0) {
+                $progression = ($sizeLoaded / $sizeTotal * 100);
+            }
 
-                    $levels = array(0, 5, 10, 15, 20, 25, 30, 35, 40, 35, 50, 55, 60,
-                            65, 70, 75, 80, 85, 90, 95, 100);
+            $levels = array(0, 5, 10, 15, 20, 25, 30, 35, 40, 35, 50, 55, 60,
+                    65, 70, 75, 80, 85, 90, 95, 100);
 
-                    $progression = round($progression, 0);
+            $progression = round($progression, 0);
 
-                    if (in_array($progression, $levels)) {
-                        $this->io->overwrite("    Downloading: <comment>$progression%</comment>", 80);
-                    }
-                }
-
-                break;
+            if (in_array($progression, $levels)) {
+                $this->io->overwrite("    Downloading: <comment>$progression%</comment>", 80);
+            }
+        }
+    }
 
-            case STREAM_NOTIFY_AUTH_RESULT:
-                break;
+    /**
+     * Copy the content in file directory.
+     *
+     * @param string $url      The file URL
+     * @param string $filename The local path
+     * @param string $username The username
+     * @param string $password The password
+     */
+    protected function copy($url, $filename, $username = null, $password = null)
+    {
+        // create directory
+        if (!file_exists(dirname($filename))) {
+            mkdir(dirname($filename), 0777, true);
+        }
+
+        $fh = fopen($filename, 'c+');
+
+        // curl options
+        $defaults = array(
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_BINARYTRANSFER => true,
+            CURLOPT_BUFFERSIZE => 128000,
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_NOPROGRESS => false,
+            CURLOPT_PROGRESSFUNCTION => array($this, 'callbackDownload'),
+            CURLOPT_URL => $url,
+            CURLOPT_HTTPGET => true,
+            CURLOPT_SSL_VERIFYPEER => false,
+            CURLOPT_FILE => $fh,
+        );
+
+        // add authorization to curl options
+        if (null !== $username && null !== $password) {
+            $defaults[CURLOPT_USERPWD] = $username . ':' . $password;
+        }
+
+        // init curl
+        $ch = curl_init();
+
+        // curl options
+        curl_setopt_array($ch, $defaults);
+
+        // run curl
+        $curl_result = curl_exec($ch);
+        $curl_info = curl_getinfo($ch);
+        $curl_errorCode = curl_errno($ch);
+        $curl_error = curl_error($ch);
+        $code = $curl_info['http_code'];
+        $code = null ? 0 : $code;
+
+        //close streams
+        curl_close($ch);
+        fclose($fh);
 
-            default:
-                break;
+        if (200 !== $code) {
+            return false;
         }
+
+        return true;
     }
 
     /**

src/Composer/Repository/Vcs/VcsDriver.php

@@ -23,6 +23,7 @@ abstract class VcsDriver
 {
     protected $url;
     protected $io;
+    private $firstCall;
 
     /**
      * Constructor.
@@ -34,6 +35,7 @@ abstract class VcsDriver
     {
         $this->url = $url;
         $this->io = $io;
+        $this->firstCall = true;
     }
 
     /**
@@ -96,8 +98,13 @@ abstract class VcsDriver
         curl_close($ch);
 
         // for private repository returning 404 error when the authentification is incorrect
-        $ps = 404 === $code && null === $this->io->getLastUsername() && null === $auth['username'];
+        $ps = $this->firstCall && 404 === $code && null === $this->io->getLastUsername() && null === $auth['username'];
 
+        if ($this->firstCall) {
+            $this->firstCall = false;
+        }
+
+        // auth required
         if (401 === $code || $ps) {
             if (!$this->io->isInteractive()) {
                 $mess = "The '$url' URL not found";

src/Composer/Repository/VcsRepository.php

@@ -80,6 +80,7 @@ class VcsRepository extends ArrayRepository
         }
 
         foreach ($driver->getTags() as $tag => $identifier) {
+            $this->io->overwrite('Get composer of <info>' . $this->packageName . '</info> (<comment>' . $tag . '</comment>)');
             $parsedTag = $this->validateTag($versionParser, $tag);
             if ($parsedTag && $driver->hasComposerFile($identifier)) {
                 try {
@@ -87,7 +88,7 @@ class VcsRepository extends ArrayRepository
                 } catch (\Exception $e) {
                     if (strpos($e->getMessage(), 'JSON Parse Error') !== false) {
                         if ($debug) {
-                            echo 'Skipped tag '.$tag.', '.$e->getMessage().PHP_EOL;
+                            $this->io->writeln('Skipped tag '.$tag.', '.$e->getMessage());
                         }
                         continue;
                     } else {
@@ -111,22 +112,25 @@ class VcsRepository extends ArrayRepository
                 // broken package, version doesn't match tag
                 if ($data['version_normalized'] !== $parsedTag) {
                     if ($debug) {
-                        echo 'Skipped tag '.$tag.', tag ('.$parsedTag.') does not match version ('.$data['version_normalized'].') in composer.json'.PHP_EOL;
+                        $this->io->writeln('Skipped tag '.$tag.', tag ('.$parsedTag.') does not match version ('.$data['version_normalized'].') in composer.json');
                     }
                     continue;
                 }
 
                 if ($debug) {
-                    echo 'Importing tag '.$tag.' ('.$data['version_normalized'].')'.PHP_EOL;
+                    $this->io->writeln('Importing tag '.$tag.' ('.$data['version_normalized'].')');
                 }
 
                 $this->addPackage($loader->load($this->preProcess($driver, $data, $identifier)));
             } elseif ($debug) {
-                echo 'Skipped tag '.$tag.', '.($parsedTag ? 'no composer file was found' : 'invalid name').PHP_EOL;
+                $this->io->writeln('Skipped tag '.$tag.', '.($parsedTag ? 'no composer file was found' : 'invalid name'));
             }
         }
 
+        $this->io->overwrite('');
+
         foreach ($driver->getBranches() as $branch => $identifier) {
+            $this->io->overwrite('Get composer of <info>' . $this->packageName . '</info> (<comment>' . $branch . '</comment>)');
             $parsedBranch = $this->validateBranch($versionParser, $branch);
             if ($driver->hasComposerFile($identifier)) {
                 $data = $driver->getComposerInformation($identifier);
@@ -140,7 +144,7 @@ class VcsRepository extends ArrayRepository
                     $data['version_normalized'] = $parsedBranch;
                 } else {
                     if ($debug) {
-                        echo 'Skipped branch '.$branch.', invalid name and no composer file was found'.PHP_EOL;
+                        $this->io->writeln('Skipped branch '.$branch.', invalid name and no composer file was found');
                     }
                     continue;
                 }
@@ -154,7 +158,7 @@ class VcsRepository extends ArrayRepository
                 foreach ($this->getPackages() as $package) {
                     if ($normalizedStableVersion === $package->getVersion()) {
                         if ($debug) {
-                            echo 'Skipped branch '.$branch.', already tagged'.PHP_EOL;
+                            $this->io->writeln('Skipped branch '.$branch.', already tagged');
                         }
 
                         continue 2;
@@ -162,14 +166,16 @@ class VcsRepository extends ArrayRepository
                 }
 
                 if ($debug) {
-                    echo 'Importing branch '.$branch.' ('.$data['version_normalized'].')'.PHP_EOL;
+                    $this->io->writeln('Importing branch '.$branch.' ('.$data['version_normalized'].')');
                 }
 
                 $this->addPackage($loader->load($this->preProcess($driver, $data, $identifier)));
             } elseif ($debug) {
-                echo 'Skipped branch '.$branch.', no composer file was found'.PHP_EOL;
+                $this->io->writeln('Skipped branch '.$branch.', no composer file was found');
             }
         }
+
+        $this->io->overwrite('');
     }
 
     private function preProcess(VcsDriverInterface $driver, array $data, $identifier)