Changeset 56835

Timestamp:

10/12/2023 12:32:43 PM (12 months ago)

Author:

jorbin

Message:

Prevent unintended behavior when certain objects are unserialized.

Props ehtis, xknown.

Location:

trunk/src/wp-includes

Files:

• Requests/src/Hooks.php (modified) (1 diff)
• Requests/src/Iri.php (modified) (1 diff)
• Requests/src/Session.php (modified) (1 diff)
• class-wp-block-patterns-registry.php (modified) (1 diff)
• class-wp-block-type-registry.php (modified) (1 diff)
• class-wp-theme.php (modified) (2 diffs)

trunk/src/wp-includes/Requests/src/Hooks.php

@@ -97 +97 @@
         return true;
     }
+
+    public function __wakeup() {
+        throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+    }
 }

trunk/src/wp-includes/Requests/src/Iri.php

@@ -718 +718 @@
     }
 
+    public function __wakeup() {
+        $class_props = get_class_vars( __CLASS__ );
+        $string_props = array( 'scheme', 'iuserinfo', 'ihost', 'port', 'ipath', 'iquery', 'ifragment' );
+        $array_props = array( 'normalization' );
+        foreach ( $class_props as $prop => $default_value ) {
+            if ( in_array( $prop, $string_props, true ) && ! is_string( $this->$prop ) ) {
+                throw new UnexpectedValueException();
+            } elseif ( in_array( $prop, $array_props, true ) && ! is_array( $this->$prop ) ) {
+                throw new UnexpectedValueException();
+            }
+            $this->$prop = null;
+        }
+    }
+
     /**
      * Set the entire IRI. Returns true on success, false on failure (if there

trunk/src/wp-includes/Requests/src/Session.php

@@ -266 +266 @@
     }
 
+    public function __wakeup() {
+        throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+    }
+
     /**
      * Merge a request's data with the default data

trunk/src/wp-includes/class-wp-block-patterns-registry.php

@@ -231 +231 @@
     }
 
+    public function __wakeup() {
+        if ( ! $this->registered_patterns ) {
+            return;
+        }
+        if ( ! is_array( $this->registered_patterns ) ) {
+            throw new UnexpectedValueException();
+        }
+        foreach ( $this->registered_patterns as $value ) {
+            if ( ! is_array( $value ) ) {
+                throw new UnexpectedValueException();
+            }
+        }
+        $this->registered_patterns_outside_init = array();
+    }
+
     /**
      * Utility method to retrieve the main instance of the class.

trunk/src/wp-includes/class-wp-block-type-registry.php

@@ -169 +169 @@
     }
 
+    public function __wakeup() {
+        if ( ! $this->registered_block_types ) {
+            return;
+        }
+        if ( ! is_array( $this->registered_block_types ) ) {
+            throw new UnexpectedValueException();
+        }
+        foreach ( $this->registered_block_types as $value ) {
+            if ( ! $value instanceof WP_Block_Type ) {
+                throw new UnexpectedValueException();
+            }
+        }
+    }
+
     /**
      * Utility method to retrieve the main instance of the class.

trunk/src/wp-includes/class-wp-theme.php

@@ -774 +774 @@
 
     /**
+     * Perform reinitialization tasks.
+     *
+     * Prevents a callback from being injected during unserialization of an object.
+     *
+     * @return void
+     */
+    public function __wakeup() {
+        if ( $this->parent && ! $this->parent instanceof self ) {
+            throw new UnexpectedValueException();
+        }
+        if ( $this->headers && ! is_array( $this->headers ) ) {
+            throw new UnexpectedValueException();
+        }
+        foreach ( $this->headers as $value ) {
+            if ( ! is_string( $value ) ) {
+                throw new UnexpectedValueException();
+            }
+        }
+        $this->headers_sanitized = array();
+    }
+
+    /**
      * Adds theme data to cache.
      *
@@ -1919 +1941 @@
         return strnatcasecmp( $a->name_translated, $b->name_translated );
     }
+
+    private static function _check_headers_property_has_correct_type( $headers ) {
+        if ( ! is_array( $headers ) ) {
+            return false;
+        }
+        foreach ( $headers as $key => $value ) {
+            if ( ! is_string( $key ) || ! is_string( $value ) ) {
+                return false;
+            }
+        }
+        return true;
+    }
 }