N°3412 - Command Injection vulnerability in the Setup Wizard - fix test and code

This commit is contained in:
odain
2021-02-16 17:12:41 +01:00
parent 905ee19519
commit e9cff0920b
2 changed files with 73 additions and 8 deletions

View File

@@ -551,15 +551,17 @@ class SetupUtils
SetupPage::log('Info - PHP functions disabled: '.implode(', ', $aDisabled));
if (in_array('exec', $aDisabled))
{
$aResult[] = new CheckResult(CheckResult::ERROR, "The PHP exec() function has been disabled on this server");
return new CheckResult(CheckResult::ERROR, "The PHP exec() function has been disabled on this server");
}
$sEscapedGraphvizPath = \escapeshellarg($sGraphvizPath);
if (!is_file($sEscapedGraphvizPath) || ! is_executable($sEscapedGraphvizPath)){
clearstatcache();
if (!is_file($sGraphvizPath) || ! is_executable($sGraphvizPath)){
//N°3412 avoid shell injection
return new CheckResult(CheckResult::WARNING, "$sGraphvizPath could not be executed: Please make sure it is installed and in the path");
return new CheckResult(CheckResult::ERROR, "$sGraphvizPath could not be executed: Please make sure it is installed and in the path");
}
$sGraphvizPath = escapeshellcmd($sGraphvizPath);
// availability of dot / dot.exe
if (empty($sGraphvizPath))
{
@@ -574,10 +576,6 @@ class SetupUtils
{
$oResult = new CheckResult(CheckResult::INFO, "dot is present: ".$aOutput[0]);
}
elseif ($iRetCode == 1)
{
$oResult = new CheckResult(CheckResult::WARNING, "dot could not be found: ".implode(' ', $aOutput)." - Please make sure it is installed and in the path.");
}
else
{
$oResult = new CheckResult(CheckResult::WARNING, "dot could not be executed (retcode=$iRetCode): Please make sure it is installed and in the path");