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

Merge pull request #9334 from johnstevenson/proxy-streams 

Improve proxy error messages for streams
pull/9341/head
Jordi Boggiano 2020-10-25 14:13:40 +01:00 committed by GitHub
parent 6f3f5f090c c99e19db64
commit 0543b59e06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Exception/NoSslException.php
View File

@ -13,6 +13,8 @@
namespace Composer\Exception;
/**
* Specific exception for Composer\Util\HttpDownloader creation.
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
class NoSslException extends \RuntimeException

34
src/Composer/Util/StreamContextFactory.php
View File

@ -58,7 +58,7 @@ final class StreamContextFactory
/**
* @param string $url
* @param array $options
* @param bool $forCurl
* @param bool $forCurl When true, will not add proxy values as these are handled separately
* @psalm-return array{http:{header: string[], proxy?: string, request_fulluri: bool}, ssl: array}
* @return array formatted as a stream context array
*/
@ -75,23 +75,27 @@ final class StreamContextFactory
// Add stream proxy options if there is a proxy
if (!$forCurl) {
$proxy = ProxyManager::getInstance()->getProxyForRequest($url);
if ($proxy->isSecure()) {
if (!extension_loaded('openssl')) {
throw new TransportException('You must enable the openssl extension to use a proxy over https.');
}
if (0 === strpos($url, 'https://')) {
throw new TransportException('PHP does not support https requests to a secure proxy.');
}
}
if ($proxyOptions = $proxy->getContextOptions()) {
$isHttpsRequest = 0 === strpos($url, 'https://');
$proxyOptions = $proxy->getContextOptions();
if ($proxy->isSecure()) {
if (!extension_loaded('openssl')) {
throw new TransportException('You must enable the openssl extension to use a secure proxy.');
}
if ($isHttpsRequest) {
throw new TransportException('You must enable the curl extension to make https requests through a secure proxy.');
}
} elseif ($isHttpsRequest && !extension_loaded('openssl')) {
throw new TransportException('You must enable the openssl extension to make https requests through a proxy.');
}
// Header will be a Proxy-Authorization string or not set
if (isset($proxyOptions['http']['header'])) {
$options['http']['header'][] = $proxyOptions['http']['header'];
unset($proxyOptions['http']['header']);
// Header will be a Proxy-Authorization string or not set
if (isset($proxyOptions['http']['header'])) {
$options['http']['header'][] = $proxyOptions['http']['header'];
unset($proxyOptions['http']['header']);
}
$options = array_replace_recursive($options, $proxyOptions);
}
$options = array_replace_recursive($options, $proxyOptions);
}
if (defined('HHVM_VERSION')) {

4
tests/Composer/Test/Util/StreamContextFactoryTest.php
View File

@ -226,6 +226,10 @@ class StreamContextFactoryTest extends TestCase
public function testInitOptionsForCurlDoesNotIncludeProxyAuthHeaders()
{
if (!extension_loaded('curl')) {
$this->markTestSkipped('The curl is not available.');
}
$_SERVER['http_proxy'] = 'http://username:password@proxyserver.net:3128/';
$options = array();