Code syncronized with shipsimu code base

[mailer.git] / inc / classes / main / rng / class_RandomNumberGenerator.php

diff --git a/inc/classes/main/rng/class_RandomNumberGenerator.php b/inc/classes/main/rng/class_RandomNumberGenerator.php
index 8875a4ca06ba2b8d4076973cf39558c8351ff9ed..93ba3988ed0ae28fa27f7aca7beec7b64a592724 100644 (file)
--- a/inc/classes/main/rng/class_RandomNumberGenerator.php
+++ b/inc/classes/main/rng/class_RandomNumberGenerator.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -19,7 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class RandomNumberGenerator extends BaseFrameworkSystem {
        /**
@@ -37,6 +37,11 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
         */
        private $extraSalt = "";
 
+       /**
+        * Fixed salt for secured hashing
+        */
+       private $fixedSalt = "";
+
        /**
         * Maximum length for random string
         */
@@ -52,12 +57,6 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                // Call parent constructor
                parent::__construct($className);
 
-               // Set part description
-               $this->setObjectDescription("Standard random number generator");
-
-               // Create unique ID number
-               $this->generateUniqueId();
-
                // Clean up a little
                $this->removeNumberFormaters();
                $this->removeSystemArray();
@@ -66,14 +65,15 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
        /**
         * Creates an instance of this class
         *
+        * @param       $extraInstance  An extra instance for more salt (default: null)
         * @return      $rngInstance    An instance of this random number generator
         */
-       public final static function createRandomNumberGenerator () {
+       public final static function createRandomNumberGenerator (FrameworkInterface $extraInstance = null) {
                // Get a new instance
                $rngInstance = new RandomNumberGenerator();
 
                // Initialize the RNG now
-               $rngInstance->initRng();
+               $rngInstance->initRng($extraInstance);
 
                // Return the instance
                return $rngInstance;
@@ -82,12 +82,11 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
        /**
         * Initializes the random number generator
         *
+        * @param       $extraInstance  An extra instance for more salt (default: null)
         * @return      void
+        * @todo        Add site key for stronger salt!
         */
-       protected function initRng () {
-               // Seed mt_rand()
-               mt_srand((double) microtime() * 1000000);
-
+       protected function initRng ($extraInstance) {
                // Get the prime number from config
                $this->prime = $this->getConfigInstance()->readConfig('math_prime');
 
@@ -95,17 +94,29 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                // a better prime number
                $this->extraNumber = ($this->prime * $this->prime / (pi() ^ 2));
 
+               // Seed mt_rand()
+               mt_srand((double) sqrt(microtime() * 100000000 * $this->extraNumber));
+
                // Set the server IP to cluster
                $serverIp = "cluster";
+
                // Do we have a single server?
-               if ($this->getConfigInstance()->readConfig('is_single_server') == "Y") {
+               if ($this->getConfigInstance()->readConfig('is_single_server') === "Y") {
                        // Then use that IP for extra security
                        $serverIp = getenv('SERVER_ADDR');
+               } // END - if
+
+               // Yet-another fixed salt. This is not dependend on server software or date
+               if ($extraInstance instanceof FrameworkInterface) {
+                       // With extra instance information
+                       $this->fixedSalt = sha1($serverIp . ":" . $extraInstance->__toString() . ":" . serialize($this->getDatabaseInstance()->getConnectionData()));
+               } else {
+                       // Without extra information
+                       $this->fixedSalt = sha1($serverIp . ":" . serialize($this->getDatabaseInstance()->getConnectionData()));
                }
 
                // One-way data we need for "extra-salting" the random number
-               // @TODO Add site for stronger salt!
-               $this->extraSalt = sha1($serverIp . ":" . getenv('SERVER_SOFTWARE') . ":" . $this->getConfigInstance()->readConfig('date_key') . ":" . serialize($this->getDatabaseInstance()->getConnectionData()));
+               $this->extraSalt = sha1($this->fixedSalt . ":" . getenv('SERVER_SOFTWARE') . ":" . $this->getConfigInstance()->readConfig('date_key') . $this->getConfigInstance()->readConfig('base_url'));
 
                // Get config entry for max salt length
                $this->rndStrLen = $this->getConfigInstance()->readConfig('rnd_str_length');
@@ -117,7 +128,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
         * @param       $length                 Length of the string, default: 128
         * @return      $randomString   The pseudo-random string
         */
-       public function makeRandomString ($length = -1) {
+       public function randomString ($length = -1) {
                // Is the number <1, then fix it to default length
                if ($length < 1) $length = $this->rndStrLen;
 
@@ -127,10 +138,10 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                // And generate it
                for ($idx = 0; $idx < $length; $idx++) {
                        // Add a random character and add it to our string
-                       $randomString .= chr($this->randomNumnber(0, 255));
+                       $randomString .= chr($this->randomNumber(0, 255));
                }
 
-               // Return the random string mixed up
+               // Return the random string a little mixed up
                return str_shuffle($randomString);
        }
 
@@ -140,9 +151,9 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
         * @param       $min    Min value to generate
         * @param       $max    Max value to generate
         * @return      $num    Pseudo-random number
+        * @todo        I had a better random number generator here but now it is somewhere lost :(
         */
-       public function randomNumnber ($min, $max) {
-               // @TODO I had a better random number generator here
+       public function randomNumber ($min, $max) {
                return mt_rand($min, $max);
        }
 
@@ -154,6 +165,15 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
        public final function getExtraSalt () {
                return $this->extraSalt;
        }
+
+       /**
+        * Getter for fixed salt
+        *
+        * @return      $fixedSalt
+        */
+       public final function getFixedSalt () {
+               return $this->fixedSalt;
+       }
 }
 
 // [EOF]