composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 09:08:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/2.7

Browse Source
This commit is contained in:
bruno-ds
2021-02-24 12:06:40 +01:00
parent c601082a5e 5836be7131
commit e1d644c33b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,8 +562,7 @@ 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");
return new CheckResult(CheckResult::WARNING, "$sGraphvizPath could not be executed: Please make sure it is installed and in the path");
}
if (!utils::IsWindowsEnvironment()){

2
test/setup/SetupUtilsTest.php
View File

@@ -47,7 +47,7 @@ class SetupUtilsTest extends ItopTestCase
return [
"bash injection" => [
"touch /tmp/toto",
0,
1,
"could not be executed: Please make sure it is installed and in the path",
],
"command ok" => [