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

Merge remote-tracking branch 'maximcherny/proxy-auth'

pull/658/head
Jordi Boggiano 2012-05-06 13:41:41 +02:00
parent 5d74594c71 6b3aa764e8
commit 00e4d53bcf
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,23 +34,49 @@ final class StreamContextFactory
// Handle system proxy // Handle system proxy
if (isset($_SERVER['HTTP_PROXY']) || isset($_SERVER['http_proxy'])) { if (isset($_SERVER['HTTP_PROXY']) || isset($_SERVER['http_proxy'])) {
// Some systems seem to rely on a lowercased version instead... // Some systems seem to rely on a lowercased version instead...
$proxy = isset($_SERVER['http_proxy']) ? $_SERVER['http_proxy'] : $_SERVER['HTTP_PROXY']; $proxy = parse_url(isset($_SERVER['http_proxy']) ? $_SERVER['http_proxy'] : $_SERVER['HTTP_PROXY']);
} else {
$proxy = false;
}
// http(s):// is not supported in proxy if (false !== $proxy) {
if ('http://' == substr($proxy, 0, 7)) { $proxyURL = (isset($proxy['scheme']) ? $proxy['scheme'] : '') . '://';
$proxy = 'tcp://' . rtrim(substr($proxy, 7), '/') . (parse_url($proxy, PHP_URL_PORT) ? '' : ':80'); $proxyURL .= isset($proxy['host']) ? $proxy['host'] : '';
} else if ('https://' == substr($proxy, 0, 8)) {
$proxy = 'ssl://' . rtrim(substr($proxy, 8), '/') . (parse_url($proxy, PHP_URL_PORT) ? '' : ':443'); if (isset($proxy['port'])) {
$proxyURL .= ":" . $proxy['port'];
} elseif ('http://' == substr($proxyURL, 0, 7)) {
$proxyURL .= ":80";
} elseif ('https://' == substr($proxyURL, 0, 8)) {
$proxyURL .= ":443";
} }
if (0 === strpos($proxy, 'ssl:') && !extension_loaded('openssl')) { // http(s):// is not supported in proxy
$proxyURL = str_replace(array('http://', 'https://'), array('tcp://', 'ssl://'), $proxyURL);
if (0 === strpos($proxyURL, 'ssl:') && !extension_loaded('openssl')) {
throw new \RuntimeException('You must enable the openssl extension to use a proxy over https'); throw new \RuntimeException('You must enable the openssl extension to use a proxy over https');
} }
$options['http'] = array( $options['http'] = array(
'proxy' => $proxy, 'proxy' => $proxyURL,
'request_fulluri' => true, 'request_fulluri' => true,
); );
if (isset($proxy['user'])) {
$auth = $proxy['user'];
if (isset($proxy['pass'])) {
$auth .= ':' . $proxy['pass'];
}
$auth = base64_encode($auth);
// Preserve headers if already set in default options
if (isset($defaultOptions['http']['header'])) {
$defaultOptions['http']['header'] .= "Proxy-Authorization: Basic {$auth}\r\n";
} else {
$options['http']['header'] = "Proxy-Authorization: Basic {$auth}\r\n";
}
}
} }
$options = array_merge_recursive($options, $defaultOptions); $options = array_merge_recursive($options, $defaultOptions);

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

@ -63,12 +63,11 @@ class StreamContextFactoryTest extends \PHPUnit_Framework_TestCase
$context = StreamContextFactory::getContext(array('http' => array('method' => 'GET'))); $context = StreamContextFactory::getContext(array('http' => array('method' => 'GET')));
$options = stream_context_get_options($context); $options = stream_context_get_options($context);
$this->assertSame('http://proxyserver/', $_SERVER['HTTP_PROXY']);
$this->assertEquals(array('http' => array( $this->assertEquals(array('http' => array(
'proxy' => 'tcp://username:password@proxyserver.net:3128', 'proxy' => 'tcp://proxyserver.net:3128',
'request_fulluri' => true, 'request_fulluri' => true,
'method' => 'GET', 'method' => 'GET',
'header' => "Proxy-Authorization: Basic " . base64_encode('username:password') . "\r\n"
)), $options); )), $options);
} }
@ -80,9 +79,10 @@ class StreamContextFactoryTest extends \PHPUnit_Framework_TestCase
$options = stream_context_get_options($context); $options = stream_context_get_options($context);
$this->assertEquals(array('http' => array( $this->assertEquals(array('http' => array(
'proxy' => 'tcp://username:password@proxyserver.net:80', 'proxy' => 'tcp://proxyserver.net:80',
'request_fulluri' => true, 'request_fulluri' => true,
'method' => 'GET', 'method' => 'GET',
'header' => "Proxy-Authorization: Basic " . base64_encode('username:password') . "\r\n"
)), $options); )), $options);
} }