Changeset 30865

Timestamp:

Jan 8, 2015, 2:09:38 PM (9 years ago)

Author:

plg

Message:

merge r30864 from trunk to branch 2.5

bug 3186: improved security on search.php

Location:

branches/2.5

Files:

• include/functions.inc.php (modified) (1 diff)
• search.php (modified) (3 diffs)

branches/2.5/include/functions.inc.php

@@ -1566 +1566 @@
     }
 
-    foreach ($param_value as $item_to_check)
-    {
-      if (!preg_match($pattern, $item_to_check))
+    foreach ($param_value as $key => $item_to_check)
+    {
+      if (!preg_match(PATTERN_ID, $key) or !preg_match($pattern, $item_to_check))
       {
         fatal_error('[Hacking attempt] an item is not valid in input parameter "'.$param_name.'"');

branches/2.5/search.php

@@ -49 +49 @@
   {
     check_input_parameter('mode', $_POST, false, '/^(OR|AND)$/');
-    
+
     $drop_char_match = array(
       '-','^','$',';','#','&','(',')','<','>','`','\'','"','|',',','@','_',
@@ -106 +106 @@
 
   // dates
+  check_input_parameter('date_type', $_POST, false, '/^date_(creation|available)$/');
+  
   $type_date = $_POST['date_type'];
 
@@ -145 +147 @@
   (rules, last_seen)
   VALUES
-  (\''.serialize($search).'\', NOW())
+  (\''.pwg_db_real_escape_string(serialize($search)).'\', NOW())
 ;';
     pwg_query($query);