feat(question): forbid use of some qustion types with public forms

btry · btry · commit ac557e3c099d · 2018-10-26T16:01:01.000+02:00
Signed-off-by: btry &lt;tbugier@teclib.com&gt;
diff --git a/inc/fieldinterface.class.php b/inc/fieldinterface.class.php
@@ -192,4 +192,10 @@ public function greaterThan($value);
     * @return boolean True if the value is less than the field value
     */
    public function LessThan($value);
+
+   /**
+    * Is the field compatible with anonymous form ?
+    * @return boolean true if the field can work with anonymous forms
+    */
+   public function isAnonymousFormCompatible();
 }
diff --git a/inc/fields/actorfield.class.php b/inc/fields/actorfield.class.php
@@ -293,4 +293,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       throw new PluginFormcreatorComparisonException('Meaningless comparison');
    }
+
+   public function isAnonymousFormCompatible() {
+      return false;
+   }
 }
diff --git a/inc/fields/checkboxesfield.class.php b/inc/fields/checkboxesfield.class.php
@@ -280,4 +280,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       throw new PluginFormcreatorComparisonException('Meaningless comparison');
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/datefield.class.php b/inc/fields/datefield.class.php
@@ -160,4 +160,8 @@ public function parseAnswerValues($input) {
       $this->value = $input[$key];
       return true;
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/datetimefield.class.php b/inc/fields/datetimefield.class.php
@@ -162,4 +162,8 @@ public function parseAnswerValues($input) {
       $this->value = $input[$key];
       return true;
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/descriptionfield.class.php b/inc/fields/descriptionfield.class.php
@@ -130,4 +130,8 @@ public function lessThan($value) {
    public function parseAnswerValues($input) {
       return true;
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -330,4 +330,8 @@ public function parseAnswerValues($input) {
        $this->value = $input[$key];
        return true;
    }
+
+   public function isAnonymousFormCompatible() {
+      return false;
+   }
 }
diff --git a/inc/fields/emailfield.class.php b/inc/fields/emailfield.class.php
@@ -173,4 +173,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       throw new PluginFormcreatorComparisonException('Meaningless comparison');
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/filefield.class.php b/inc/fields/filefield.class.php
@@ -228,4 +228,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       throw new PluginFormcreatorComparisonException('Meaningless comparison');
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/floatfield.class.php b/inc/fields/floatfield.class.php
@@ -250,4 +250,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/glpiselectfield.class.php b/inc/fields/glpiselectfield.class.php
@@ -122,4 +122,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return false;
+   }
 }
diff --git a/inc/fields/hiddenfield.class.php b/inc/fields/hiddenfield.class.php
@@ -126,4 +126,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/hostnamefield.class.php b/inc/fields/hostnamefield.class.php
@@ -99,4 +99,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/integerfield.class.php b/inc/fields/integerfield.class.php
@@ -250,4 +250,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/ipfield.class.php b/inc/fields/ipfield.class.php
@@ -137,4 +137,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       throw new PluginFormcreatorComparisonException('Meaningless comparison');
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/ldapselectfield.class.php b/inc/fields/ldapselectfield.class.php
@@ -213,4 +213,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       throw new PluginFormcreatorComparisonException('Meaningless comparison');
    }
+
+   public function isAnonymousFormCompatible() {
+      return false;
+   }
 }
diff --git a/inc/fields/multiselectfield.class.php b/inc/fields/multiselectfield.class.php
@@ -283,4 +283,8 @@ public function lessThan($value) {
       }
       return true;
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/radiosfield.class.php b/inc/fields/radiosfield.class.php
@@ -212,4 +212,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/selectfield.class.php b/inc/fields/selectfield.class.php
@@ -166,4 +166,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/tagfield.class.php b/inc/fields/tagfield.class.php
@@ -200,4 +200,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       throw new PluginFormcreatorComparisonException('Meaningless comparison');
    }
+
+   public function isAnonymousFormCompatible() {
+      return false;
+   }
 }
diff --git a/inc/fields/textareafield.class.php b/inc/fields/textareafield.class.php
@@ -138,4 +138,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/textfield.class.php b/inc/fields/textfield.class.php
@@ -233,4 +233,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/fields/urgencyfield.class.php b/inc/fields/urgencyfield.class.php
@@ -172,4 +172,8 @@ public function greaterThan($value) {
    public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
+
+   public function isAnonymousFormCompatible() {
+      return true;
+   }
 }
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -2215,4 +2215,27 @@ static function footer() {
             return Html::nullFooter();
       }
    }
+
+   /**
+    * Is the form accessible anonymously (without being logged in) ?
+    * @return boolean true if the form is accessible anonymously
+    */
+   public function isPublicAccess() {
+      if ($this->isNewItem()) {
+         return false;
+      }
+      return ($this->getField('access_rights') === (string) \PluginFormcreatorForm::ACCESS_PUBLIC);
+   }
+
+   /**
+    * gets the form containing the given section
+    * @param PluginFormcreatorSection $section
+    * @return boolean true if success else false
+    */
+   public function getFromDBBySection(PluginFormcreatorSection $section) {
+      if ($section->isNewItem()) {
+         return false;
+      }
+      return $this->getFromDB($section->getField(self::getForeignKeyField()));
+   }
 }
diff --git a/inc/question.class.php b/inc/question.class.php
@@ -264,13 +264,8 @@ public static function showForForm(CommonDBTM $item, $withtemplate = '') {
 
    /**
     * Validate form fields before add or update a question
-    *
     * @param  Array $input Datas used to add the item
-    *
     * @return Array        The modified $input array
-    *
-    * @param  array $input
-    * @return array
     */
    private function checkBeforeSave($input) {
       // Control fields values :
@@ -303,19 +298,46 @@ private function checkBeforeSave($input) {
          $input['fieldtype'],
          $this
       );
+      if ($this->field === null) {
+         Session::addMessageAfterRedirect(
+            // TRANS: $%1$s is a type of field, %2$s is the label of a question
+            sprintf(
+               __('Field type %1$s is not available for question %2$s.', 'formcreator'),
+               $input['fieldtype'],
+               $input['name']
+               ),
+            false,
+            ERROR
+         );
+         return [];
+      }
+      // - field type is compatible with accessibility of the form
+      $section = new PluginFormcreatorSection();
+      $sectionFk = PluginFormcreatorSection::getForeignKeyField();
+      if (isset($input[$sectionFk])) {
+         $section->getFromDB($input[$sectionFk]);
+      } else {
+         $section->getFromDB($this->fields[$sectionFk]);
+      }
+      $form = new PluginFormcreatorForm();
+      $form->getFromDBBySection($section);
+      if ($form->isPublicAccess() && !$this->field->isAnonymousFormCompatible()) {
+         Session::addMessageAfterRedirect(__('This type of question is not compatible with public forms.', 'formcreator'), false, ERROR);
+         return [];
+      }
 
       // Check the parameters are provided
       $parameters = $this->field->getEmptyParameters();
       if (count($parameters) > 0) {
          if (!isset($input['_parameters'][$input['fieldtype']])) {
             // This should not happen
-            Session::addMessageAfterRedirect(__('This type of question requires parameters', 'formcreator'));
+            Session::addMessageAfterRedirect(__('This type of question requires parameters', 'formcreator'), false, ERROR);
             return [];
          }
          foreach ($parameters as $parameter) {
             if (!isset($input['_parameters'][$input['fieldtype']][$parameter->getFieldName()])) {
                // This should not happen
-               Session::addMessageAfterRedirect(__('A parameter is missing for this question type', 'formcreator'));
+               Session::addMessageAfterRedirect(__('A parameter is missing for this question type', 'formcreator'), false, ERROR);
                return [];
             }
          }
diff --git a/tests/src/CommonTestCase.php b/tests/src/CommonTestCase.php
@@ -151,32 +151,33 @@ protected function restartSession() {
          session_start();
          session_regenerate_id();
          session_id();
-         //$_SESSION["MESSAGE_AFTER_REDIRECT"] = [];
       }
    }
 
    protected function getForm($input = []) {
       if (!isset($input['name'])) {
-         $input['name'] = 'form';
+         $input['name'] = $this->getUniqueString();
       }
       $form = new \PluginFormcreatorForm();
       $form->add($input);
+      $this->boolean($form->isNewItem())->isFalse();
       $form->getFromDB($form->getID());
 
       return $form;
    }
 
-   protected function getSection($input = []) {
+   protected function getSection($input = [], $formInput = []) {
       $formFk = \PluginFormcreatorForm::getForeignKeyField();
       if (!isset($input[$formFk])) {
-         $formId = $this->getForm()->getID();
+         $formId = $this->getForm($formInput)->getID();
          $input[$formFk] = $formId;
       }
       if (!isset($input['name'])) {
-         $input['name'] = 'section';
+         $input['name'] = $this->getUniqueString();
       }
       $section = new \PluginFormcreatorSection();
       $section->add($input);
+      $this->boolean($section->isNewItem())->isFalse();
       return $section;
    }
 
diff --git a/tests/suite-unit/PluginFormcreatorActorField.php b/tests/suite-unit/PluginFormcreatorActorField.php
@@ -368,4 +368,11 @@ function() {
          }
       )->isInstanceOf(\PluginFormcreatorComparisonException::class);
    }
+
+
+   public function testIsAnonymousFormCompatible() {
+      $instance = new \PluginFormcreatorActorField([]);
+      $output = $instance->isAnonymousFormCompatible();
+      $this->boolean($output)->isFalse();
+   }
 }
diff --git a/tests/suite-unit/PluginFormcreatorCheckboxesField.php b/tests/suite-unit/PluginFormcreatorCheckboxesField.php
@@ -269,4 +269,10 @@ public function testGetEmptyParameters() {
       $this->object($output['range'])
          ->isInstanceOf(\PluginFormcreatorQuestionRange::class);
    }
+
+   public function testIsAnonymousFormCompatible() {
+      $instance = new \PluginFormcreatorCheckboxesField([]);
+      $output = $instance->isAnonymousFormCompatible();
+      $this->boolean($output)->isTrue();
+   }
 }
diff --git a/tests/suite-unit/PluginFormcreatorDateField.php b/tests/suite-unit/PluginFormcreatorDateField.php
@@ -148,4 +148,10 @@ public function testGetName() {
       $output = \PluginFormcreatorDateField::getName();
       $this->string($output)->isEqualTo('Date');
    }
+
+   public function testIsAnonymousFormCompatible() {
+      $instance = new \PluginFormcreatorDateField([]);
+      $output = $instance->isAnonymousFormCompatible();
+      $this->boolean($output)->isTrue();
+   }
 }
diff --git a/tests/suite-unit/PluginFormcreatorDatetimeField.php b/tests/suite-unit/PluginFormcreatorDatetimeField.php
@@ -210,4 +210,11 @@ public function providerSerializeValue() {
    public function testSerializeValue() {
       $instance = $this->newTestedInstance([]);
    }
+
+
+   public function testIsAnonymousFormCompatible() {
+      $instance = new \PluginFormcreatorDatetimeField([]);
+      $output = $instance->isAnonymousFormCompatible();
+      $this->boolean($output)->isTrue();
+   }
 }
diff --git a/tests/suite-unit/PluginFormcreatorDescriptionField.php b/tests/suite-unit/PluginFormcreatorDescriptionField.php
@@ -93,4 +93,10 @@ public function testPrepareQuestionInputForSave($input, $expected, $message) {
          }
       }
    }
+
+   public function testIsAnonymousFormCompatible() {
+      $instance = new \PluginFormcreatorDescriptionField([]);
+      $output = $instance->isAnonymousFormCompatible();
+      $this->boolean($output)->isTrue();
+   }
 }
diff --git a/tests/suite-unit/PluginFormcreatorDropdownField.php b/tests/suite-unit/PluginFormcreatorDropdownField.php
diff --git a/tests/suite-unit/PluginFormcreatorFloatField.php b/tests/suite-unit/PluginFormcreatorFloatField.php
diff --git a/tests/suite-unit/PluginFormcreatorForm.php b/tests/suite-unit/PluginFormcreatorForm.php
diff --git a/tests/suite-unit/PluginFormcreatorGlpiselectField.php b/tests/suite-unit/PluginFormcreatorGlpiselectField.php
diff --git a/tests/suite-unit/PluginFormcreatorHiddenField.php b/tests/suite-unit/PluginFormcreatorHiddenField.php
diff --git a/tests/suite-unit/PluginFormcreatorIntegerField.php b/tests/suite-unit/PluginFormcreatorIntegerField.php
diff --git a/tests/suite-unit/PluginFormcreatorIpField.php b/tests/suite-unit/PluginFormcreatorIpField.php
diff --git a/tests/suite-unit/PluginFormcreatorLdapselectField.php b/tests/suite-unit/PluginFormcreatorLdapselectField.php
diff --git a/tests/suite-unit/PluginFormcreatorMultiSelectField.php b/tests/suite-unit/PluginFormcreatorMultiSelectField.php
diff --git a/tests/suite-unit/PluginFormcreatorQuestion.php b/tests/suite-unit/PluginFormcreatorQuestion.php
diff --git a/tests/suite-unit/PluginFormcreatorRadiosField.php b/tests/suite-unit/PluginFormcreatorRadiosField.php
diff --git a/tests/suite-unit/PluginFormcreatorSelectField.php b/tests/suite-unit/PluginFormcreatorSelectField.php
diff --git a/tests/suite-unit/PluginFormcreatorTextField.php b/tests/suite-unit/PluginFormcreatorTextField.php

Original file line number	Diff line number	Diff line change
`@@ -293,4 +293,8 @@ public function greaterThan($value) {`
`293`	`293`	`public function lessThan($value) {`
`294`	`294`	`throw new PluginFormcreatorComparisonException('Meaningless comparison');`
`295`	`295`	`}`
	`296`	`+`
	`297`	`+ public function isAnonymousFormCompatible() {`
	`298`	`+ return false;`
	`299`	`+ }`
`296`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,4 +280,8 @@ public function greaterThan($value) {`
`280`	`280`	`public function lessThan($value) {`
`281`	`281`	`throw new PluginFormcreatorComparisonException('Meaningless comparison');`
`282`	`282`	`}`
	`283`	`+`
	`284`	`+ public function isAnonymousFormCompatible() {`
	`285`	`+ return true;`
	`286`	`+ }`
`283`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,4 +160,8 @@ public function parseAnswerValues($input) {`
`160`	`160`	`$this->value = $input[$key];`
`161`	`161`	`return true;`
`162`	`162`	`}`
	`163`	`+`
	`164`	`+ public function isAnonymousFormCompatible() {`
	`165`	`+ return true;`
	`166`	`+ }`
`163`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,4 +162,8 @@ public function parseAnswerValues($input) {`
`162`	`162`	`$this->value = $input[$key];`
`163`	`163`	`return true;`
`164`	`164`	`}`
	`165`	`+`
	`166`	`+ public function isAnonymousFormCompatible() {`
	`167`	`+ return true;`
	`168`	`+ }`
`165`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,4 +130,8 @@ public function lessThan($value) {`
`130`	`130`	`public function parseAnswerValues($input) {`
`131`	`131`	`return true;`
`132`	`132`	`}`
	`133`	`+`
	`134`	`+ public function isAnonymousFormCompatible() {`
	`135`	`+ return true;`
	`136`	`+ }`
`133`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -330,4 +330,8 @@ public function parseAnswerValues($input) {`
`330`	`330`	`$this->value = $input[$key];`
`331`	`331`	`return true;`
`332`	`332`	`}`
	`333`	`+`
	`334`	`+ public function isAnonymousFormCompatible() {`
	`335`	`+ return false;`
	`336`	`+ }`
`333`	`337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,4 +173,8 @@ public function greaterThan($value) {`
`173`	`173`	`public function lessThan($value) {`
`174`	`174`	`throw new PluginFormcreatorComparisonException('Meaningless comparison');`
`175`	`175`	`}`
	`176`	`+`
	`177`	`+ public function isAnonymousFormCompatible() {`
	`178`	`+ return true;`
	`179`	`+ }`
`176`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,4 +228,8 @@ public function greaterThan($value) {`
`228`	`228`	`public function lessThan($value) {`
`229`	`229`	`throw new PluginFormcreatorComparisonException('Meaningless comparison');`
`230`	`230`	`}`
	`231`	`+`
	`232`	`+ public function isAnonymousFormCompatible() {`
	`233`	`+ return true;`
	`234`	`+ }`
`231`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,4 +250,8 @@ public function greaterThan($value) {`
`250`	`250`	`public function lessThan($value) {`
`251`	`251`	`return !$this->greaterThan($value) && !$this->equals($value);`
`252`	`252`	`}`
	`253`	`+`
	`254`	`+ public function isAnonymousFormCompatible() {`
	`255`	`+ return true;`
	`256`	`+ }`
`253`	`257`	`}`