HOR-1356

gulliver/system/class.g.php

@@ -75,25 +75,99 @@ class G
 
     /**
      * Generate Password Random
-     * @access public
+     * $availableSets set next options:
-     * @param  Int
+     * l: lowercase set a-z
-     * @return String
+     * u: uppercase set A-Z
+     * n: numbers set 0-9
+     * s: symbols set _-+=!@#$%*&,.;:?^()[]{}<>
+     * 
+     * $symbol is source symbol generate
+     * 
+     * @param int $length
+     * @param string $availableSets
+     * @param string $symbol
+     * @return string
      */
-    public function generate_password($length = 8)
+    public function generate_password($length = 15, $availableSets = "luns", $symbol = "_-+=!@#$%*&,.")
     {
+        $chars = "";
+        if (strpos($availableSets, "l") !== false) {
+            $chars = $chars . "abcdefghjkmnpqrstuvwxyz";
+        }
+        if (strpos($availableSets, "u") !== false) {
+            $chars = $chars . "ABCDEFGHJKMNPQRSTUVWXYZ";
+        }
+        if (strpos($availableSets, "n") !== false) {
+            $chars = $chars . "0123456789";
+        }
+        if (strpos($availableSets, "s") !== false) {
+            $chars = $chars . $symbol;
+        }
+        $n = strlen($chars);
+        do {
         $password = "";
-        $possible = "0123456789bcdfghjkmnpqrstvwxyz";
+            $i = 0;
-        $i        = 0;
+            while ($i < $length) {
-        while ($i<$length) {
+                $chars = str_shuffle($chars);
-            $char = substr($possible, mt_rand(0, strlen($possible)-1), 1);
+                $char = substr($chars, mt_rand(0, $n - 1), 1);
             if (!strstr($password, $char)) {
-                $password .= $char;
+                    $password = $password . $char;
                 $i++;
             }
+                $password = str_shuffle($password);
         }
+            $info = G::check_password($password, $length, $length, $availableSets);
+        } while (!$info->isValid);
         return $password;
     }
 
+    /**
+     * Check password strong
+     * 
+     * $availableSets set next options:
+     * l: lowercase set a-z
+     * u: uppercase set A-Z
+     * n: numbers set 0-9
+     * s: symbols set _-+=!@#$%*&,.;:?^()[]{}<>
+     * 
+     * @param string $password
+     * @param int $min
+     * @param int $max
+     * @param string $availableSets
+     * @return \stdClass
+     */
+    public function check_password($password, $min = 2, $max = 20, $availableSets = "luns")
+    {
+        $info = new stdClass();
+        $info->isValid = true;
+        $info->error = "";
+        if (strlen($password) < $min) {
+            $info->error .= G::LoadTranslation("ID_PASSWORD_TOO_SHORT") . " ";
+            $info->isValid = false;
+        }
+        if (strlen($password) > $max) {
+            $info->error .= G::LoadTranslation("ID_PASSWORD_TOO_LONG") . " ";
+            $info->isValid = false;
+        }
+        if (strpos($availableSets, "l") !== false && !preg_match("#[a-z]+#", $password)) {
+            $info->error .= G::LoadTranslation("ID_PASSWORD_MUST_INCLUDE_AT_LEAST_ONE_LETTER") . " ";
+            $info->isValid = false;
+        }
+        if (strpos($availableSets, "u") !== false && !preg_match("#[A-Z]+#", $password)) {
+            $info->error .= G::LoadTranslation("ID_PASSWORD_MUST_INCLUDE_AT_LEAST_ONE_CAPS") . " ";
+            $info->isValid = false;
+        }
+        if (strpos($availableSets, "n") !== false && !preg_match("#[0-9]+#", $password)) {
+            $info->error .= G::LoadTranslation("ID_PASSWORD_MUST_INCLUDE_AT_LEAST_ONE_NUMBER") . " ";
+            $info->isValid = false;
+        }
+        if (strpos($availableSets, "s") !== false && !preg_match("#\W+#", $password)) {
+            $info->error .= G::LoadTranslation("ID_PASSWORD_MUST_INCLUDE_AT_LEAST_ONE_SYMBOL") . " ";
+            $info->isValid = false;
+        }
+        return $info;
+    }
+
     /**
      * Array concat
      * array_concat(ArrayToConcat,ArrayOriginal);

workflow/engine/classes/class.Installer.php

@@ -68,7 +68,7 @@ class Installer
      */
     public function create_site($config = Array(), $confirmed = false)
     {
-        $this->options = G::array_concat(Array('isset' => false, 'password' => G::generate_password(12), 'path_data' => @PATH_DATA, 'path_compiled' => @PATH_C, 'name' => $config['name'], 'database' => Array(), 'admin' => Array('username' => 'admin', 'password' => 'admin'
+        $this->options = G::array_concat(Array('isset' => false, 'password' => G::generate_password(15), 'path_data' => @PATH_DATA, 'path_compiled' => @PATH_C, 'name' => $config['name'], 'database' => Array(), 'admin' => Array('username' => 'admin', 'password' => 'admin'
                     ), 'advanced' => Array('ao_db_wf' => 'wf_' . $config['name'], 'ao_db_rb' => 'rb_' . $config['name'], 'ao_db_rp' => 'rp_' . $config['name'], 'ao_db_drop' => false
                     )
                         ), $config);

workflow/engine/controllers/installer.php

@@ -727,7 +727,7 @@ class Installer extends Controller
             $rb_workpace = $wf;
             $rp_workpace = $wf;
             if (!$userLogged) {
-                $wfPass = G::generate_password( 12 );
+                $wfPass = G::generate_password( 15 );
                 $this->setGrantPrivilegesMySQL( $wf, $wfPass, $wf, $db_hostname );
                 $this->setGrantPrivilegesMySQL( $rb, $wfPass, $wf, $db_hostname );
                 $this->setGrantPrivilegesMySQL( $rp, $wfPass, $wf, $db_hostname );
@@ -1064,7 +1064,7 @@ class Installer extends Controller
             $this->mssqlQuery( $q );
 
             //CREATE users and GRANT Privileges
-            $wfPass = G::generate_password( 12 );
+            $wfPass = G::generate_password( 15 );
             $this->setGrantPrivilegesMSSQL( $wf, $wfPass, $wf );
 
             //Generate the db.php file and folders