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

Update to latest ca-bundle

pull/6843/merge
Jordi Boggiano 2017-11-29 10:41:53 +01:00
parent ec63c213f8
commit 5130d02208
2 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
composer.lock generated
View File

@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "809b291b5f9da41a8bdd414a058e3f07", "content-hash": "88357fd4222a8102552a0d3345696e2e",
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
"version": "1.0.8", "version": "1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/ca-bundle.git", "url": "https://github.com/composer/ca-bundle.git",
"reference": "9dd73a03951357922d8aee6cc084500de93e2343" "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/9dd73a03951357922d8aee6cc084500de93e2343", "url": "https://api.github.com/repos/composer/ca-bundle/zipball/943b2c4fcad1ef178d16a713c2468bf7e579c288",
"reference": "9dd73a03951357922d8aee6cc084500de93e2343", "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -26,12 +26,9 @@
"php": "^5.3.2 || ^7.0" "php": "^5.3.2 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.5", "phpunit/phpunit": "^4.8.35",
"psr/log": "^1.0", "psr/log": "^1.0",
"symfony/process": "^2.5 || ^3.0" "symfony/process": "^2.5 || ^3.0 || ^4.0"
},
"suggest": {
"symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -63,7 +60,7 @@
"ssl", "ssl",
"tls" "tls"
], ],
"time": "2017-09-11T07:24:36+00:00" "time": "2017-11-29T09:37:33+00:00"
}, },
{ {
"name": "composer/semver", "name": "composer/semver",

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

@ -904,17 +904,7 @@ class RemoteFilesystem
if (!isset($defaults['ssl']['cafile']) && !isset($defaults['ssl']['capath'])) { if (!isset($defaults['ssl']['cafile']) && !isset($defaults['ssl']['capath'])) {
$result = CaBundle::getSystemCaRootBundlePath($caBundleLogger); $result = CaBundle::getSystemCaRootBundlePath($caBundleLogger);
if (preg_match('{^phar://}', $result)) { if (is_dir($result)) {
$hash = hash_file('sha256', $result);
$targetPath = rtrim(sys_get_temp_dir(), '\\/') . '/composer-cacert-' . $hash . '.pem';
if (!file_exists($targetPath) || $hash !== hash_file('sha256', $targetPath)) {
$this->streamCopy($result, $targetPath);
chmod($targetPath, 0666);
}
$defaults['ssl']['cafile'] = $targetPath;
} elseif (is_dir($result)) {
$defaults['ssl']['capath'] = $result; $defaults['ssl']['capath'] = $result;
} else { } else {
$defaults['ssl']['cafile'] = $result; $defaults['ssl']['cafile'] = $result;
@ -939,24 +929,6 @@ class RemoteFilesystem
return $defaults; return $defaults;
} }
/**
* Uses stream_copy_to_stream instead of copy to work around https://bugs.php.net/bug.php?id=64634
*
* @param string $source
* @param string $target
*/
private function streamCopy($source, $target)
{
$source = fopen($source, 'r');
$target = fopen($target, 'w+');
stream_copy_to_stream($source, $target);
fclose($source);
fclose($target);
unset($source, $target);
}
/** /**
* Fetch certificate common name and fingerprint for validation of SAN. * Fetch certificate common name and fingerprint for validation of SAN.
* *