mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refacotr: Use HTTPS to fetch Composer (#8309)

Browse Source 
* use https for composer

* Fixe alternate --version output for composer
This commit is contained in:
Tony Murray
2018-02-28 14:04:44 -06:00
committed by Neil Lathwood
parent 68d42b065e
commit 9459eeb55f
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LibreNMS/Validations/Dependencies.php
View File

@@ -39,13 +39,13 @@ class Dependencies extends BaseValidation
public function validate(Validator $validator) public function validate(Validator $validator)
{ {
$composer_output = trim(shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php --version')); $composer_output = trim(shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php --version'));
$found = preg_match('/Composer version ([.0-9]+)/', $composer_output, $matches); $found = preg_match('/Composer (version )?([.0-9]+)/', $composer_output, $matches);
if (!$found) { if (!$found) {
$validator->fail("No composer available, please install composer", "https://getcomposer.org/"); $validator->fail("No composer available, please install composer", "https://getcomposer.org/");
return; return;
} else { } else {
$validator->ok("Composer Version: " . $matches[1]); $validator->ok("Composer Version: " . $matches[2]);
} }
$dep_check = shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php install --no-dev --dry-run'); $dep_check = shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php install --no-dev --dry-run');

23
scripts/composer_wrapper.php
View File

@@ -27,11 +27,18 @@
$install_dir = realpath(__DIR__ . '/..'); $install_dir = realpath(__DIR__ . '/..');
chdir($install_dir); chdir($install_dir);
// Set up proxy if needed $use_https = true;
$proxy = getenv("HTTP_PROXY") ?: getenv("http_proxy"); // Set up proxy if needed, check git config for proxies too
if (!$proxy && $proxy = rtrim(shell_exec('git config --global --get http.proxy'))) { if ($proxy = getenv("HTTPS_PROXY") ?: getenv("https_proxy")) {
// Use git http.proxy if available $use_https = true;
} elseif ($proxy = getenv("HTTP_PROXY") ?: getenv("http_proxy")) {
$use_https = false;
} elseif ($proxy = trim(shell_exec('git config --global --get https.proxy'))) {
putenv("HTTPS_PROXY=$proxy");
$use_https = true;
} elseif ($proxy = trim(shell_exec('git config --global --get http.proxy'))) {
putenv("HTTP_PROXY=$proxy"); putenv("HTTP_PROXY=$proxy");
$use_https = false;
} }
$exec = false; $exec = false;
@@ -44,8 +51,8 @@ if (!empty($path_exec)) {
} else { } else {
if ($proxy) { if ($proxy) {
$stream_default_opts = array( $stream_default_opts = array(
'http' => array( ($use_https ? 'https' : 'http') => array(
'proxy' => str_replace('http://', 'tcp://', $proxy), 'proxy' => str_replace(array('http://', 'https://'), 'tcp://', $proxy),
'request_fulluri' => true, 'request_fulluri' => true,
) )
); );
@@ -54,10 +61,10 @@ if (!empty($path_exec)) {
} }
// Download composer.phar (code from the composer web site) // Download composer.phar (code from the composer web site)
$good_sha = trim(@file_get_contents('http://composer.github.io/installer.sig')); $good_sha = trim(@file_get_contents(($use_https ? 'https' : 'http') . '://composer.github.io/installer.sig'));
// Download composer.phar (code from the composer web site) // Download composer.phar (code from the composer web site)
@copy('http://getcomposer.org/installer', 'composer-setup.php'); @copy(($use_https ? 'https' : 'http') . '://getcomposer.org/installer', 'composer-setup.php');
if (!empty($good_sha) && @hash_file('SHA384', 'composer-setup.php') === $good_sha) { if (!empty($good_sha) && @hash_file('SHA384', 'composer-setup.php') === $good_sha) {
// Installer verified // Installer verified
shell_exec('php composer-setup.php'); shell_exec('php composer-setup.php');