Changeset 35365

Timestamp:

10/23/2015 04:21:01 AM (9 years ago)

Author:

dd32

Message:

Update to Random_Compat 1.0.9.
This update includes fixes for Windows support & libSodium support, and removes the Throwable Polyfill due to PHP7 incompatibilities.

Fixes #28633

Location:

trunk/src/wp-includes

Files:

• pluggable.php (modified) (1 diff)
• random_compat/byte_safe_strings.php (modified) (2 diffs)
• random_compat/cast_to_int.php (added)
• random_compat/error_polyfill.php (modified) (1 diff)
• random_compat/random.php (modified) (4 diffs)
• random_compat/random_bytes_com_dotnet.php (modified) (1 diff)
• random_compat/random_bytes_dev_urandom.php (modified) (1 diff)
• random_compat/random_bytes_libsodium.php (added)
• random_compat/random_bytes_mcrypt.php (modified) (2 diffs)
• random_compat/random_bytes_openssl.php (modified) (1 diff)
• random_compat/random_int.php (modified) (2 diffs)

trunk/src/wp-includes/pluggable.php

@@ -2189 +2189 @@
                 $use_random_int_functionality = false;
             }
-        } catch ( Throwable $t ) {
+        } catch ( Error $e ) {
             $use_random_int_functionality = false;
         } catch ( Exception $e ) {

trunk/src/wp-includes/random_compat/byte_safe_strings.php

@@ -28 +28 @@
 
 if (!function_exists('RandomCompat_strlen')) {
-    if (defined('MB_OVERLOAD_STRING') && ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING) {
+    if (
+        defined('MB_OVERLOAD_STRING') &&
+        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+    ) {
         /**
          * strlen() implementation that isn't brittle to mbstring.func_overload
@@ -75 +78 @@
 
 if (!function_exists('RandomCompat_substr')) {
-    if (defined('MB_OVERLOAD_STRING') && ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING) {
+    if (
+        defined('MB_OVERLOAD_STRING') &&
+        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+    ) {
         /**
          * substr() implementation that isn't brittle to mbstring.func_overload

trunk/src/wp-includes/random_compat/error_polyfill.php

@@ -27 +27 @@
  */
 
-if (!interface_exists('Throwable', false)) {
-    interface Throwable
-    {
-    }
-}
-
 if (!class_exists('Error', false)) {
     // We can't really avoid making this extend Exception in PHP 5.
-    class Error extends Exception implements Throwable
+    class Error extends Exception
     {
         

trunk/src/wp-includes/random_compat/random.php

@@ -29 +29 @@
 if (!defined('PHP_VERSION_ID')) {
     // This constant was introduced in PHP 5.2.7
-    $version = explode('.', PHP_VERSION);
-    define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2]));
+    $RandomCompatversion = explode('.', PHP_VERSION);
+    define('PHP_VERSION_ID', ($RandomCompatversion[0] * 10000 + $RandomCompatversion[1] * 100 + $RandomCompatversion[2]));
+    unset($RandomCompatversion);
 }
 if (PHP_VERSION_ID < 70000) {
@@ -36 +37 @@
         define('RANDOM_COMPAT_READ_BUFFER', 8);
     }
-    require_once "byte_safe_strings.php";
-    require_once "error_polyfill.php";
+    $__DIR__ = dirname(__FILE__);
+    require_once $__DIR__.'/byte_safe_strings.php';
+    require_once $__DIR__.'/cast_to_int.php';
+    require_once $__DIR__.'/error_polyfill.php';
     if (!function_exists('random_bytes')) {
         /**
@@ -46 +49 @@
          * 
          * In order of preference:
-         *   1. fread() /dev/urandom if available
-         *   2. mcrypt_create_iv($bytes, MCRYPT_CREATE_IV)
-         *   3. COM('CAPICOM.Utilities.1')->GetRandom()
-         *   4. openssl_random_pseudo_bytes()
+         *   1. Use libsodium if available.
+         *   2. fread() /dev/urandom if available (never on Windows)
+         *   3. mcrypt_create_iv($bytes, MCRYPT_CREATE_IV)
+         *   4. COM('CAPICOM.Utilities.1')->GetRandom()
+         *   5. openssl_random_pseudo_bytes() (absolute last resort)
          * 
          * See ERRATA.md for our reasoning behind this particular order
          */
-        if (!ini_get('open_basedir') && is_readable('/dev/urandom')) {
+        if (extension_loaded('libsodium')) {
+            // See random_bytes_libsodium.php
+            require_once $__DIR__.'/random_bytes_libsodium.php';
+        }
+        if (
+            !function_exists('random_bytes') && 
+            DIRECTORY_SEPARATOR === '/' &&
+            @is_readable('/dev/urandom')
+        ) {
+            // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
+            // way to exclude Windows.
+            // 
+            // Error suppression on is_readable() in case of an open_basedir or 
+            // safe_mode failure. All we care about is whether or not we can 
+            // read it at this point. If the PHP environment is going to panic 
+            // over trying to see if the file can be read in the first place,
+            // that is not helpful to us here.
+            
             // See random_bytes_dev_urandom.php
-            require_once "random_bytes_dev_urandom.php";
-        } elseif (PHP_VERSION_ID >= 50307 && function_exists('mcrypt_create_iv')) {
+            require_once $__DIR__.'/random_bytes_dev_urandom.php';
+        }
+        if (
+            !function_exists('random_bytes') &&
+            PHP_VERSION_ID >= 50307 &&
+            extension_loaded('mcrypt')
+        ) {
             // See random_bytes_mcrypt.php
-            require_once "random_bytes_mcrypt.php";
-        } elseif (extension_loaded('com_dotnet')) {
-            // See random_bytes_com_dotnet.php
-            require_once "random_bytes_com_dotnet.php";
-        } elseif (function_exists('openssl_random_pseudo_bytes')) {
+            require_once $__DIR__.'/random_bytes_mcrypt.php';
+        }
+        if (
+            !function_exists('random_bytes') && 
+            extension_loaded('com_dotnet') &&
+            class_exists('COM')
+        ) {
+            try {
+                $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
+                if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+                    // See random_bytes_com_dotnet.php
+                    require_once $__DIR__.'/random_bytes_com_dotnet.php';
+                }
+            } catch (com_exception $e) {
+                // Don't try to use it.
+            }
+            unset($RandomCompatCOMtest);
+        }
+        if (
+            !function_exists('random_bytes') && 
+            extension_loaded('openssl') &&
+            PHP_VERSION_ID >= 50300
+        ) {
             // See random_bytes_openssl.php
-            require_once "random_bytes_openssl.php";
-        } else {
+            require_once $__DIR__.'/random_bytes_openssl.php';
+        }
+        if (!function_exists('random_bytes')) {
             /**
              * We don't have any more options, so let's throw an exception right now
@@ -79 +124 @@
     }
     if (!function_exists('random_int')) {
-        require_once "random_int.php";
+        require_once $__DIR__.'/random_int.php';
     }
+    unset($__DIR__);
 }

trunk/src/wp-includes/random_compat/random_bytes_com_dotnet.php

@@ -40 +40 @@
 function random_bytes($bytes)
 {
-    if (!is_int($bytes)) {
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
         throw new TypeError(
-            'Length must be an integer'
+            'random_bytes(): $bytes must be an integer'
         );
     }

trunk/src/wp-includes/random_compat/random_bytes_dev_urandom.php

@@ -75 +75 @@
         }
     }
-    if (!is_int($bytes)) {
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
         throw new TypeError(
-            'Length must be an integer'
+            'random_bytes(): $bytes must be an integer'
         );
     }

trunk/src/wp-includes/random_compat/random_bytes_mcrypt.php

@@ -42 +42 @@
 function random_bytes($bytes)
 {
-    if (!is_int($bytes)) {
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
         throw new TypeError(
-            'Length must be an integer'
+            'random_bytes(): $bytes must be an integer'
         );
     }
@@ -53 +55 @@
     }
 
-    $buf = mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
+    $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
     if ($buf !== false) {
         if (RandomCompat_strlen($buf) === $bytes) {

trunk/src/wp-includes/random_compat/random_bytes_openssl.php

@@ -42 +42 @@
 function random_bytes($bytes)
 {
-    if (!is_int($bytes)) {
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
         throw new TypeError(
-            'Length must be an integer'
+            'random_bytes(): $bytes must be an integer'
         );
     }

trunk/src/wp-includes/random_compat/random_int.php

@@ -41 +41 @@
     /**
      * Type and input logic checks
+     * 
+     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
+     * lose precision, so the <= and => operators might accidentally let a float
+     * through.
      */
-    if (!is_numeric($min)) {
+    
+    try {
+        $min = RandomCompat_intval($min);
+    } catch (TypeError $ex) {
         throw new TypeError(
             'random_int(): $min must be an integer'
         );
     }
-    if (!is_numeric($max)) {
+    try {
+        $max = RandomCompat_intval($max);
+    } catch (TypeError $ex) {
         throw new TypeError(
             'random_int(): $max must be an integer'
         );
     }
-
-    $min = (int) $min;
-    $max = (int) $max;
-
+    
+    /**
+     * Now that we've verified our weak typing system has given us an integer,
+     * let's validate the logic then we can move forward with generating random
+     * integers along a given range.
+     */
     if ($min > $max) {
         throw new Error(
@@ -165 +178 @@
          * If $val overflows to a floating point number,
          * ... or is larger than $max,
-         * ... or smaller than $int,
+         * ... or smaller than $min,
          * then try again.
          */