From 86b2ec3a46fc32f69efc33930bc41a343160d763 Mon Sep 17 00:00:00 2001
From: sparkyx <dany118@gmail.com>
Date: Fri, 8 Jul 2005 18:18:34 +0000
Subject: [PATCH] =?UTF-8?q?Task=20#4402=20:=20Security=20Problem=20Probl?=
 =?UTF-8?q?=C3=A8me=20est=20resolu=20grace=20=C3=A0=20une=20procedure=20de?=
 =?UTF-8?q?=20check=20Avantage=20:=20la=20validit=C3=A9=20des=20formules?=
 =?UTF-8?q?=20est=20directement=20v=C3=A9rifi=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/bnb.sxw             | Bin 9776 -> 9245 bytes
 html/form.php           |   8 +++++++-
 include/class_form.php  |  12 ++++++------
 include/form_inc.php    |  36 +++++++++++++++++++++++++++++++-----
 include/impress_inc.php |  29 +++++++++++++++++++++++++++--
 5 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/doc/bnb.sxw b/doc/bnb.sxw
index ad3275600ab5600b309c4b67da280d6081484e96..8f291d99aaab19f8599ce1218fe6907500a8ce22 100644
GIT binary patch
delta 6363
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

delta 6789
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
NLFvDBie~$>^iR!6Va@;m

diff --git a/html/form.php b/html/form.php
index d3094dc1e..c03b27f70 100644
--- a/html/form.php
+++ b/html/form.php
@@ -18,7 +18,6 @@
 */
 /* $Revision$ */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
-/* $Revision$ */
 
 include_once ("ac_common.php");
 include_once ("user_menu.php");
@@ -53,6 +52,11 @@ if ( isset ($_POST["record"] )) {
   AddForm($cn,$HTTP_POST_VARS);
   echo "</DIV>";
 }
+if ( isset ($_POST["del_form"]) ) {
+  echo '<DIV class="ccontent">';
+  DeleteForm($cn,$_POST['fr_id']);
+   echo "</DIV>";
+}
 
 ShowMenuComptaForm($_SESSION['g_dossier']);
 
@@ -94,6 +98,8 @@ if ( isset ($_POST["add_line"]) ) {
 if ( isset ($_POST["update"]) ) {
   echo '<DIV class="ccontent">';
   UpdateForm($cn,$HTTP_POST_VARS);
+    ViewForm($cn,$sessid,$_POST["fr_id"]);
+
   echo "</DIV>";
 }
 
diff --git a/include/class_form.php b/include/class_form.php
index e281c259e..5a4c61156 100644
--- a/include/class_form.php
+++ b/include/class_form.php
@@ -50,12 +50,12 @@ class formulaire {
     $col=array();
     for ($i=0;$i<$Max;$i++) {
       $l_line=pg_fetch_array($Res,$i);
-      $col[]=ParseFormula($this->db,
-                   $l_line['fo_label'],
-                   $l_line['fo_formula'],
-			  $p_start,
-			  $p_end
-			  );
+	$col[]=ParseFormula($this->db,
+			    $l_line['fo_label'],
+			    $l_line['fo_formula'],
+			    $p_start,
+			    $p_end
+			    );
      
     } //for ($i
     $this->row=$col;
diff --git a/include/form_inc.php b/include/form_inc.php
index 8e9b25705..e81189db5 100644
--- a/include/form_inc.php
+++ b/include/form_inc.php
@@ -20,7 +20,7 @@
 
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 //$Revision$
-
+include_once("impress_inc.php");
 /* function EncodeForm
  * Purpose : 
  *          Encoding Form
@@ -104,6 +104,8 @@ if ( isset ($fr_id))   printf ('<INPUT TYPE="HIDDEN" NAME="fr_id" value="%s"',
     echo '<INPUT TYPE="submit" value="Enregistre" name="record">';
   }
   echo '<INPUT TYPE="submit" value="Ajoute une ligne" name="add_line">';
+  echo '<INPUT TYPE="submit" value="Efface ce formulaire" name="del_form">';
+
   echo "</FORM>";
 
 }
@@ -129,6 +131,23 @@ function ViewForm($p_cn,$p_sessid,$p_id) {
   EncodeForm($l_line,$p_sessid,$array);
 
 }
+/* function ViewForm
+ * Purpose : Show the details of a form
+ * 
+ * parm : 
+ *	- $p_cn connection
+ *      - $p_id gives the formdef.fr_id
+ *      - sessid for the search window
+ * gen :
+ *	- none
+ * return: 
+ *	- none
+ *
+ */ 
+function DeleteForm($p_cn,$p_id) {
+  ExecSql($p_cn,"delete from form where fo_fr_id=$p_id");
+  ExecSql($p_cn,"delete from formdef where fr_id=$p_id");
+}
 /* function GetDataForm
  * Purpose :
  *         Get data from a form 
@@ -218,7 +237,7 @@ function UpdateForm($p_cn,$p_array) {
     echo_debug ("UpdateForm $key = $element");
     ${"$key"}=$element;
   }
-  $Res=ExecSql($p_cn,"update formdef set fr_label='".$form_nom."' where fr_id=".$fr_id);
+  $Res=ExecSql($p_cn,"update formdef set fr_label='".FormatString($form_nom)."' where fr_id=".$fr_id);
   $Res=ExecSql($p_cn,"delete from form where fo_fr_id=".$fr_id);
   // Test les positions
   for ($i =0; $i <$line;$i++) {
@@ -243,6 +262,9 @@ function UpdateForm($p_cn,$p_array) {
       ${"text$i"}=FormatString(${"text$i"});
       ${"form$i"}=FormatString(${"form$i"});
       if ( ${"text$i"} != null ) {
+	if ( CheckFormula(${"form$i"}) == false ) 
+	  ${"form$i"}="!!!!!!! FORMULE INVALIDE ".${"form$i"};
+
 	${"form$i"}=(${"form$i"}==null)?"null":"'".${"form$i"}."'";
 	$sql=sprintf("insert into form (fo_fr_id,
                                   fo_pos,
@@ -252,7 +274,9 @@ function UpdateForm($p_cn,$p_array) {
                                     %d,
                                     '%s',
                                     %s)",
-		     $fr_id,${"pos$i"},${"text$i"},${"form$i"}
+		     $fr_id,${"pos$i"},
+		     ${"text$i"},
+		     ${"form$i"}
 		     );
 	$Res=ExecSql($p_cn,$sql);
       }
@@ -283,7 +307,7 @@ function AddForm($p_cn,$p_array) {
     echo_error("Nom ou ligne non défini");
     return;
   }
-  $sql="insert into formdef (fr_label) values ('".$form_nom."')";
+  $sql="insert into formdef (fr_label) values ('".FormatString($form_nom)."')";
   $Res=ExecSql($p_cn,$sql);
   $n=GetSequence($p_cn,"s_formdef");
 
@@ -291,7 +315,9 @@ function AddForm($p_cn,$p_array) {
       ${"text$i"}=FormatString(${"text$i"});
       ${"form$i"}=FormatString(${"form$i"});
       if ( ${"text$i"} != null ) {
-	${"form$i"}=(${"form$i"}==null)?${"form$i"}:"'".${"form$i"}."'";
+	//	${"form$i"}=(${"form$i"}==null)?${"form$i"}:"'".${"form$i"}."'";
+	${"form$i"}=(${"form$i"}==null)?"null":"'".${"form$i"}."'";
+	CheckFormula(${"form$i"});
 	$sql=sprintf("insert into form (fo_fr_id,
                                   fo_pos,
                                   fo_label,
diff --git a/include/impress_inc.php b/include/impress_inc.php
index 49dd0381e..fc0f94d82 100644
--- a/include/impress_inc.php
+++ b/include/impress_inc.php
@@ -718,10 +718,15 @@ function GetRappel($p_cn,$p_jrnx_id,$p_jrn_id,$p_exercice,$which,$p_type,$p_cent
  *	- array
  *
  *
- * NOTE: problem: the formulas don't take date range parameters into account....TODO.
- * --> I would like to get the sum of operations between two specified dates.
  */ 
 function ParseFormula($p_cn,$p_label,$p_formula,$p_start,$p_end) {
+  if ( CheckFormula($p_formula) == false) {
+    $aret=array('desc'=>$p_label.'  Erreur Formule!',
+		'montant'=>0);
+    return $aret;
+    
+  }
+
   if ( $p_start == $p_end ) 
     $cond=" j_tech_per = $p_start ";
   else
@@ -822,4 +827,24 @@ function GetFormulaValue($p_cn,$p_label,$p_formula,$p_cond)
   }
   return $aret;
 }
+/* function CheckFormula
+ **************************************************
+ * Purpose : Check if formula doesn't contain
+ *           php injection
+ *        
+ * parm : 
+ *	- string
+ * gen :
+ *	- 
+ * return: none : stop on error
+ */
+function CheckFormula($p_string) {
+  if ( ereg ("^((\[{0,1}[0-9]+\.*[0-9]*%{0,1}\]{0,1})+ *([+-\*/])* *(\[{0,1}[0-9]+\.*[0-9]*%{0,1}\]{0,1})*)*( *FROM=[0-9][0-0].20[0-9][0-9]){0,1}$",$p_string) == false)
+    {
+      return false;
+    } else {
+      return true;
+  }
+}
+
 ?>