public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Follow redirects inside RFS only when required by PHP version

pull/4783/head
Chris Smith 2016-01-17 19:42:43 +00:00
parent 73662c725a
commit ce1eda25f3
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Composer/Util/RemoteFilesystem.php
View File

@ -221,6 +221,7 @@ class RemoteFilesystem
} }
$options = $this->getOptionsForUrl($originUrl, $additionalOptions); $options = $this->getOptionsForUrl($originUrl, $additionalOptions);
$userlandFollow = isset($options['http']['follow_location']) && !$options['http']['follow_location'];
if ($this->io->isDebug()) { if ($this->io->isDebug()) {
$this->io->writeError((substr($fileUrl, 0, 4) === 'http' ? 'Downloading ' : 'Reading ') . $fileUrl); $this->io->writeError((substr($fileUrl, 0, 4) === 'http' ? 'Downloading ' : 'Reading ') . $fileUrl);
@ -295,8 +296,7 @@ class RemoteFilesystem
$statusCode = $this->findStatusCode($http_response_header); $statusCode = $this->findStatusCode($http_response_header);
} }
if (!empty($http_response_header[0]) && preg_match('{^HTTP/\S+ (3\d\d)}i', $http_response_header[0], $match)) { if ($userlandFollow && !empty($http_response_header[0]) && preg_match('{^HTTP/\S+ (3\d\d)}i', $http_response_header[0], $match)) {
// TODO: Only follow if PHP is not set to follow.
foreach ($http_response_header as $header) { foreach ($http_response_header as $header) {
if (preg_match('{^location: *(.+) *$}i', $header, $m)) { if (preg_match('{^location: *(.+) *$}i', $header, $m)) {
if (parse_url($m[1], PHP_URL_SCHEME)) { if (parse_url($m[1], PHP_URL_SCHEME)) {
@ -597,9 +597,20 @@ class RemoteFilesystem
$host = parse_url($this->fileUrl, PHP_URL_HOST); $host = parse_url($this->fileUrl, PHP_URL_HOST);
} }
// if ($host === 'github.com' || $host === 'api.github.com') { if (PHP_VERSION_ID >= 50304) {
// $host = '*.github.com'; // Must manually follow when setting CN_match because this causes all
// } // redirects to be validated against the same CN_match value.
$userlandFollow = true;
} else {
// PHP < 5.3.4 does not support follow_location, for those people
// do some really nasty hard coded transformations. These will
// still breakdown if the site redirects to a domain we don't
// expect.
if ($host === 'github.com' || $host === 'api.github.com') {
$host = '*.github.com';
}
}
$tlsOptions['ssl']['CN_match'] = $host; $tlsOptions['ssl']['CN_match'] = $host;
$tlsOptions['ssl']['SNI_server_name'] = $host; $tlsOptions['ssl']['SNI_server_name'] = $host;
@ -619,7 +630,7 @@ class RemoteFilesystem
$headers[] = 'Connection: close'; $headers[] = 'Connection: close';
} }
if (PHP_VERSION_ID >= 50304 && $this->disableTls === false) { if (isset($userlandFollow)) {
$options['http']['follow_location'] = 0; $options['http']['follow_location'] = 0;
} }