- Add a Clean() function to be able to clean Object before register a…

…nother one - Add public vector_part (Base, Temp and Env vector part) - Modify private to public base, env and tmp
security-database · Jul 27, 2016 · bd8ad2b · bd8ad2b
1 parent 0131f9f
commit bd8ad2b
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,9 @@
 
 ###Version
 ####1.3.2
+- Add a Clean() function to be able to clean Object before register another one
+- Add public vector_part (Base, Temp and Env vector part)
+- Modify private to public base, env and tmp
 - Change private to public some vars ($this->base, $this->env, $this->tmp)
 - Fix \Exception()
 - Add Code on some Exception (__construct && register && explodeVector)

diff --git a/src/Cvss3.php b/src/Cvss3.php
@@ -49,6 +49,7 @@ class Cvss3
 {
     const VERSION = '3.0';
 
+    public $vector_head = "CVSS:3.0";
     public $lang = "en_US";
     public $weight = array();
     public $sub_scores = array();
@@ -63,13 +64,17 @@ class Cvss3
                     );
     public $scoresLabel = array();
     public $formula = array();
+
     public $vector = "";
 
+    public $vector_part = array('base' => '', 'tmp' => '', 'env' => '');
+
     public $vector_input_array = array();
     public $vector_inputLabel_array = array();
 
-    private $env = array ('MAV', 'MAC', 'MPR', 'MUI', 'MS', 'MC', 'MI', 'MA', 'CR', 'IR', 'AR');
-    private $tmp = array ('E', 'RL', 'RC');
+    public $base = array ('AV', 'AC', 'PR', 'UI', 'S', 'C', 'I', 'A');
+    public $tmp = array ('E', 'RL', 'RC');
+    public $env = array ('CR', 'IR', 'AR', 'MAV', 'MAC', 'MPR', 'MUI', 'MS', 'MC', 'MI', 'MA');
 
     private $metrics_check_mandatory = array(
         "AV" => "[N,A,L,P]",
@@ -262,6 +267,9 @@ public function register($vector)
         if (strlen($vector) == 0) {
             throw new \Exception("ERROR: Vector is not defined", __LINE__);
         }
+
+        self::clean();
+
         self::explodeVector($vector);
         self::checkInput();
         self::checkMandatory();
@@ -610,7 +618,7 @@ private function buildLanguage() {
      */
     private function constructVector()
     {
-        $this->vector = "CVSS:3.0";
+        $this->vector = $this->vector_head;
 
         foreach ($this->vector_input_array as $vec => $input) {
             if (isset($this->metrics_check_mandatory[$vec])) {
@@ -621,8 +629,36 @@ private function constructVector()
                 $this->vector .= "/" . $vec . ":" . $input;
             }
         }
+
+        foreach ($this->base as $vec => $value) {
+            if (isset($this->vector_input_array[$value]))
+                $this->vector_part['base'] .= "/" . $value . ":" . $this->vector_input_array[$value];
+        }
+        foreach ($this->tmp as $vec => $value) {
+            if (isset($this->vector_input_array[$value]) && $this->vector_input_array[$value] != 'X')
+                $this->vector_part['tmp'] .= "/" . $value . ":" . $this->vector_input_array[$value];
+        }
+        foreach ($this->env as $vec => $value) {
+            if (isset($this->vector_input_array[$value]) && $this->vector_input_array[$value] != 'X')
+                $this->vector_part['env'] .= "/" . $value . ":" . $this->vector_input_array[$value];
+        }
+
+        foreach ($this->vector_part as $k => $v) {
+            $this->vector_part[$k] = substr($v, 1);
+        }
     }
 
+    /**
+     *
+     */
+    private function clean() {
+        $blankInstance = new static;
+        $reflBlankInstance = new \ReflectionClass($blankInstance);
+        foreach ($reflBlankInstance->getProperties() as $prop) {
+            $prop->setAccessible(true);
+            $this->{$prop->name} = $prop->getValue($blankInstance);
+        }
+    }
     /**
      * @param float $number number to round
      * @param number $precision precision for round