composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge wrongfully performed

Browse Source 
(thanks @molkobain & @piRGoif & @odain-cbd)
This commit is contained in:
bruno-ds
2021-02-23 10:24:30 +01:00
parent 88f45a69b1
commit c3cb4fbe75
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
setup/setuputils.class.inc.php
View File

@@ -617,8 +617,11 @@ class SetupUtils
clearstatcache();
if (!is_file($sGraphvizPath) || !is_executable($sGraphvizPath)) {
//N°3412 avoid shell injection
return new CheckResult(CheckResult::ERROR,
"$sGraphvizPath could not be executed: Please make sure it is installed and in the path");
$aResult = [];
$aResult[] = new CheckResult(CheckResult::ERROR,
self::GetStringForJsonEncode("$sGraphvizPath could not be executed: Please make sure it is installed and in the path", 'Graphviz could not be executed')
);
return $aResult;
}
if (!utils::IsWindowsEnvironment()){

25
test/setup/SetupUtilsTest.php
View File

@@ -21,6 +21,11 @@ use SetupUtils;
*/
class SetupUtilsTest extends ItopTestCase
{
const ERROR = 0;
const WARNING = 1;
const INFO = 2;
const TRACE = 3; // for log purposes : replace old SetupLog::Log calls
protected function setUp()
{
parent::setUp();
@@ -34,9 +39,15 @@ class SetupUtilsTest extends ItopTestCase
*/
public function testCheckGraphviz($sScriptPath, $iSeverity, $sLabel){
/** @var \CheckResult $oCheck */
$oCheck = SetupUtils::CheckGraphviz($sScriptPath);
$this->assertEquals($iSeverity, $oCheck->iSeverity);
$this->assertContains($sLabel, $oCheck->sLabel);
$aCheck = SetupUtils::CheckGraphviz($sScriptPath);
$bLabelFound = false;
foreach ($aCheck as $oCheck) {
$this->assertGreaterThanOrEqual($iSeverity, $oCheck->iSeverity);
if (!$bLabelFound && (empty($sLabel) || strpos($oCheck->sLabel, $sLabel) !== false)) {
$bLabelFound = true;
}
}
$this->assertTrue($bLabelFound, "label '$sLabel' not found");
}
public function CheckGraphvizProvider(){
@@ -47,22 +58,22 @@ class SetupUtilsTest extends ItopTestCase
return [
"bash injection" => [
"touch /tmp/toto",
0,
self::ERROR,
"could not be executed: Please make sure it is installed and in the path",
],
"command ok" => [
"/usr/bin/whereis",
2,
self::INFO,
"",
],
"empty command => dot by default" => [
"",
2,
self::INFO,
"",
],
"command failed" => [
"/bin/ls",
1,
self::WARNING,
"dot could not be executed (retcode=2): Please make sure it is installed and in the path",
]
];