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

Run git as the configured user when ./validate.php is run as root

Browse Source 
Move the modified files check out of the get_version function
This commit is contained in:
Tony Murray
2016-07-01 12:47:15 -05:00
parent bc7e5ffb46
commit 2dbec67088
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/common.php
View File

@@ -1039,10 +1039,6 @@ function version_info($remote=true) {
$output['local_sha'] = rtrim(`git rev-parse HEAD`);
$output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
exec('git diff --name-only --exit-code', $cmdoutput, $code);
$output['git_modified'] = ($code !== 0);
$output['git_modified_files'] = $cmdoutput;
$output['db_schema'] = dbFetchCell('SELECT version FROM dbSchema');
$output['php_ver'] = phpversion();
$output['mysql_ver'] = dbFetchCell('SELECT version()');

11
validate.php
View File

@@ -36,7 +36,7 @@ if (isset($options['h'])) {
if (strstr(`php -ln config.php`, 'No syntax errors detected')) {
$first_line = `head -n1 config.php`;
$last_lines = explode(PHP_EOL, `tail -n2 config.php`);
if (strstr($first_line, '\<\?php')) {
if (substr($first_line, 0, 5) !== '<?php') {
print_fail("config.php doesn't start with a <?php - please fix this ($first_line)");
}
else if ($last_lines[0] == '?>' && $last_lines[1] == '') {
@@ -84,9 +84,14 @@ else {
if($versions['local_branch'] != 'master') {
print_warn("Your local git branch is not master, this will prevent automatic updates.");
}
if($versions['git_modified'] === true) {
$modifiedcmd = 'git diff --name-only --exit-code';
if($username === 'root') {
$modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
}
if(exec($modifiedcmd, $cmdoutput, $code) !== 0) {
print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
echo(implode("\n", $versions['git_modified_files']) . "\n");
echo(implode("\n", $cmdoutput) . "\n");
}
echo "DB Schema: ".$versions['db_schema']."\n";