lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX #huntr5affff95-9a37-4004-bab2-a834b3b61ff7

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-11 15:39:16 +01:00
parent 968720bfdc
commit 81ef87cf6d
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/website2.lib.php
View File

@ -718,7 +718,12 @@ function checkPHPCode($phpfullcodestringold, $phpfullcodestring)
break; break;
} }
} }
// Check dynamic functions $xxx( // Deny dynamic functions '${a}(' or '$a[b](' - So we refuse '}(' and ']('
if (preg_match('/[}\]]\(/ims', $phpfullcodestring)) {
$error++;
setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", ']('), null, 'errors');
}
// Deny dynamic functions $xxx(
if (preg_match('/\$[a-z0-9_]+\(/ims', $phpfullcodestring)) { if (preg_match('/\$[a-z0-9_]+\(/ims', $phpfullcodestring)) {
$error++; $error++;
setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", '$...('), null, 'errors'); setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", '$...('), null, 'errors');
@ -732,6 +737,7 @@ function checkPHPCode($phpfullcodestringold, $phpfullcodestring)
if (!$error) { if (!$error) {
$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT); $dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
$allowimportsite = true; $allowimportsite = true;
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) { if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {
$allowimportsite = false; $allowimportsite = false;
} }

29
test/phpunit/Website.class.php
View File

@ -54,12 +54,17 @@ if (! defined("NOSESSION")) {
require_once dirname(__FILE__).'/../../htdocs/main.inc.php'; require_once dirname(__FILE__).'/../../htdocs/main.inc.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/website.lib.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/website.lib.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/website2.lib.php';
if (empty($user->id)) { if (empty($user->id)) {
print "Load permissions for admin user nb 1\n"; print "Load permissions for admin user nb 1\n";
$user->fetch(1); $user->fetch(1);
$user->getrights(); $user->getrights();
if (empty($user->rights->website)) {
$user->rights->website = new stdClass();
}
} }
$conf->global->MAIN_DISABLE_ALL_MAILS=1; $conf->global->MAIN_DISABLE_ALL_MAILS=1;
@ -175,4 +180,28 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
// We must found no line (so code should be KO). If we found somethiing, it means there is a SQL injection of the 1=1 // We must found no line (so code should be KO). If we found somethiing, it means there is a SQL injection of the 1=1
$this->assertEquals($res['code'], 'KO'); $this->assertEquals($res['code'], 'KO');
} }
/**
* testCheckPHPCode
*
* @return void
*/
public function testCheckPHPCode()
{
global $user;
// Force permission so this is not the permission that will affect result of checkPHPCode
$user->rights->website->writephp = 1;
$s = '<?php exec("eee"); ?>';
$result = checkPHPCode('', $s);
print __METHOD__." result checkPHPCode=".$result."\n";
$this->assertEquals($result, 1, 'checkPHPCode did not detect the string was dangerous');
$s = '<?php $_="{"; $_=($_^"<").($_^">;").($_^"/"); ?><?=${\'_\'.$_}["_"](${\'_\'.$_}["__"]);?>';
$result = checkPHPCode('', $s);
print __METHOD__." result checkPHPCode=".$result."\n";
$this->assertEquals($result, 1, 'checkPHPCode did not detect the string was dangerous');
}
} }