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

Fix SQL injection

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-29 11:38:06 +01:00
parent 782be2ac37
commit 5d2130a5ae
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/resource/class/dolresource.class.php
View File

@ -533,7 +533,7 @@ class Dolresource extends CommonObject
$sql.= $value; $sql.= $value;
} }
else { else {
$sql.= ' AND '.$key.' LIKE \'%'.$value.'%\''; $sql.= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
} }
} }
} }
@ -617,7 +617,7 @@ class Dolresource extends CommonObject
$sql.= ' AND '.$key.' = \''.$this->db->idate($value).'\''; $sql.= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
} }
else { else {
$sql.= ' AND '.$key.' LIKE \'%'.$value.'%\''; $sql.= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
} }
} }
} }
@ -699,7 +699,7 @@ class Dolresource extends CommonObject
$sql.= ' AND '.$key.' = \''.$this->db->idate($value).'\''; $sql.= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
} }
else { else {
$sql.= ' AND '.$key.' LIKE \'%'.$value.'%\''; $sql.= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
} }
} }
} }

14
htdocs/resource/list.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file resource/index.php * \file resource/list.php
* \ingroup resource * \ingroup resource
* \brief Page to manage resource objects * \brief Page to manage resource objects
*/ */
@ -52,20 +52,19 @@ $extrafields = new ExtraFields($db);
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); $search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
if (! is_array($search_array_options)) $search_array_options = array(); if (! is_array($search_array_options)) $search_array_options = array();
$search_ref=GETPOST("search_ref"); $search_ref = GETPOST("search_ref", 'alpha');
$search_type=GETPOST("search_type"); $search_type = GETPOST("search_type", 'alpha');
$filter=array(); $filter=array();
if ($search_ref != ''){ if ($search_ref != ''){
$param.='&search_ref='.$search_ref; $param.='&search_ref='.urlencode($search_ref);
$filter['t.ref']=$search_ref; $filter['t.ref']=$search_ref;
} }
if ($search_type != ''){ if ($search_type != ''){
$param.='&search_type='.$search_type; $param.='&search_type='.urlencode($search_type);
$filter['ty.label']=$search_type; $filter['ty.label']=$search_type;
} }
if ($search_label != '') $param.='&search_label='.$search_label;
// Add $param from extra fields // Add $param from extra fields
foreach ($search_array_options as $key => $val) foreach ($search_array_options as $key => $val)
{ {
@ -83,7 +82,7 @@ foreach ($search_array_options as $key => $val)
$filter['ef.'.$tmpkey] = natural_search('ef.'.$tmpkey, $crit, $mode_search); $filter['ef.'.$tmpkey] = natural_search('ef.'.$tmpkey, $crit, $mode_search);
} }
} }
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
$hookmanager->initHooks(array('resourcelist')); $hookmanager->initHooks(array('resourcelist'));
@ -133,7 +132,6 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
{ {
$search_ref=""; $search_ref="";
$search_label="";
$search_type=""; $search_type="";
$search_array_options=array(); $search_array_options=array();
$filter=array(); $filter=array();