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

Fix #yogosha7605

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-11 17:08:35 +01:00
parent fd74e33ef1
commit 0021381201
6 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/db/mysqli.class.php
View File

@ -663,9 +663,13 @@ class DoliDBMysqli extends DoliDB
$like = ''; $like = '';
if ($table) { if ($table) {
$like = "LIKE '".$table."'"; $tmptable = preg_replace('/[^a-z0-9\.\-\_%]/i', '', $table);
$like = "LIKE '".$this->escape($tmptable)."'";
} }
$sql = "SHOW TABLES FROM ".$database." ".$like.";"; $tmpdatabase = preg_replace('/[^a-z0-9\.\-\_]/i', '', $database);
$sql = "SHOW TABLES FROM ".$tmpdatabase." ".$like.";";
//print $sql; //print $sql;
$result = $this->query($sql); $result = $this->query($sql);
if ($result) { if ($result) {
@ -688,7 +692,9 @@ class DoliDBMysqli extends DoliDB
// phpcs:enable // phpcs:enable
$infotables = array(); $infotables = array();
$sql = "SHOW FULL COLUMNS FROM ".$table.";"; $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
$sql = "SHOW FULL COLUMNS FROM ".$tmptable.";";
dol_syslog($sql, LOG_DEBUG); dol_syslog($sql, LOG_DEBUG);
$result = $this->query($sql); $result = $this->query($sql);
@ -794,7 +800,9 @@ class DoliDBMysqli extends DoliDB
public function DDLDropTable($table) public function DDLDropTable($table)
{ {
// phpcs:enable // phpcs:enable
$sql = "DROP TABLE ".$table; $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
$sql = "DROP TABLE ".$tmptable;
if (!$this->query($sql)) { if (!$this->query($sql)) {
return -1; return -1;

8
htdocs/core/db/pgsql.class.php
View File

@ -937,7 +937,9 @@ class DoliDBPgsql extends DoliDB
$escapedlike = ''; $escapedlike = '';
if ($table) { if ($table) {
$escapedlike = " AND table_name LIKE '".$this->escape($table)."'"; $tmptable = preg_replace('/[^a-z0-9\.\-\_%]/i', '', $table);
$escapedlike = " AND table_name LIKE '".$this->escape($tmptable)."'";
} }
$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$escapedlike." ORDER BY table_name"); $result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$escapedlike." ORDER BY table_name");
if ($result) { if ($result) {
@ -1078,7 +1080,9 @@ class DoliDBPgsql extends DoliDB
public function DDLDropTable($table) public function DDLDropTable($table)
{ {
// phpcs:enable // phpcs:enable
$sql = "DROP TABLE ".$table; $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
$sql = "DROP TABLE ".$tmptable;
if (!$this->query($sql)) { if (!$this->query($sql)) {
return -1; return -1;

16
htdocs/core/db/sqlite3.class.php
View File

@ -875,9 +875,13 @@ class DoliDBSqlite3 extends DoliDB
$like = ''; $like = '';
if ($table) { if ($table) {
$like = "LIKE '".$table."'"; $tmptable = preg_replace('/[^a-z0-9\.\-\_%]/i', '', $table);
$like = "LIKE '".$this->escape($tmptable)."'";
} }
$sql = "SHOW TABLES FROM ".$database." ".$like.";"; $tmpdatabase = preg_replace('/[^a-z0-9\.\-\_]/i', '', $database);
$sql = "SHOW TABLES FROM ".$tmpdatabase." ".$like.";";
//print $sql; //print $sql;
$result = $this->query($sql); $result = $this->query($sql);
if ($result) { if ($result) {
@ -901,7 +905,9 @@ class DoliDBSqlite3 extends DoliDB
// phpcs:enable // phpcs:enable
$infotables = array(); $infotables = array();
$sql = "SHOW FULL COLUMNS FROM ".$table.";"; $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
$sql = "SHOW FULL COLUMNS FROM ".$tmptable.";";
dol_syslog($sql, LOG_DEBUG); dol_syslog($sql, LOG_DEBUG);
$result = $this->query($sql); $result = $this->query($sql);
@ -1002,7 +1008,9 @@ class DoliDBSqlite3 extends DoliDB
public function DDLDropTable($table) public function DDLDropTable($table)
{ {
// phpcs:enable // phpcs:enable
$sql = "DROP TABLE ".$table; $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
$sql = "DROP TABLE ".$tmptable;
if (!$this->query($sql)) { if (!$this->query($sql)) {
return -1; return -1;

1
htdocs/install/upgrade.php
View File

@ -260,6 +260,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
); );
$listtables = $db->DDLListTables($conf->db->name, ''); $listtables = $db->DDLListTables($conf->db->name, '');
foreach ($listtables as $val) { foreach ($listtables as $val) {
// Database prefix filter // Database prefix filter
if (preg_match('/^'.MAIN_DB_PREFIX.'/', $val)) { if (preg_match('/^'.MAIN_DB_PREFIX.'/', $val)) {

4
test/phpunit/CodingPhpTest.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file test/phpunit/SqlTest.php * \file test/phpunit/CodingPhpTest.php
* \ingroup test * \ingroup test
* \brief PHPUnit test * \brief PHPUnit test
* \remarks To run this script as CLI: phpunit filename.php * \remarks To run this script as CLI: phpunit filename.php
@ -363,7 +363,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
// Check string sql|set|WHERE|...'".$yyy->xxx with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request. // Check string sql|set|WHERE|...'".$yyy->xxx with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
$ok=true; $ok=true;
$matches=array(); $matches=array();
preg_match_all('/(sql|SET|WHERE|INSERT|VALUES).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER); preg_match_all('/(sql|SET|WHERE|INSERT|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER);
foreach ($matches as $key => $val) { foreach ($matches as $key => $val) {
if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) { if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
$ok=false; // This will generate error $ok=false; // This will generate error

2
test/phpunit/CodingSqlTest.php
View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \file test/phpunit/SqlTest.php * \file test/phpunit/CodingSqlTest.php
* \ingroup test * \ingroup test
* \brief PHPUnit test * \brief PHPUnit test
* \remarks To run this script as CLI: phpunit filename.php * \remarks To run this script as CLI: phpunit filename.php