Changeset 56865

Timestamp:

10/12/2023 02:51:26 PM (14 months ago)

Author:

davidbaumwald

Message:

Grouped backports to the 4.9 branch.

• Comments: Prevent users who can not see a post from seeing comments on it.
• Shortcodes: Restrict media shortcode ajax to certain type.
• REST API: Ensure no-cache headers are sent when methods are overridden.
• REST API: Limit search_columns for users without list_users.
• Prevent unintended behavior when certain objects are unserialized.

Merges [56834], [56835], [56836], [56838], and [56840] to the 4.9 branch.
Props xknown, jorbin, joehoyle, timothyblynjacobs, peterwilsoncc, ehtis, tykoted, antpb, rmccue.

Location:

branches/4.9/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/Requests/Hooks.php (modified) (1 diff)
• wp-includes/Requests/IRI.php (modified) (1 diff)
• wp-includes/Requests/Session.php (modified) (1 diff)
• wp-includes/class-wp-theme.php (modified) (2 diffs)
• wp-includes/media.php (modified) (2 diffs)
• wp-includes/rest-api.php (modified) (1 diff)
• wp-includes/rest-api/class-wp-rest-server.php (modified) (2 diffs)
• wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php (modified) (1 diff)
• wp-includes/shortcodes.php (modified) (1 diff)

branches/4.9/src/wp-admin/includes/ajax-actions.php

@@ -3141 +3141 @@
     $shortcode = wp_unslash( $_POST['shortcode'] );
 
+    // Only process previews for media related shortcodes:
+    $found_shortcodes = get_shortcode_tags_in_content( $shortcode );
+    $media_shortcodes = array(
+        'audio',
+        'embed',
+        'playlist',
+        'video',
+        'gallery',
+    );
+
+    $other_shortcodes = array_diff( $found_shortcodes, $media_shortcodes );
+
+    if ( ! empty( $other_shortcodes ) ) {
+        wp_send_json_error();
+    }
+
     if ( ! empty( $_POST['post_ID'] ) ) {
         $post = get_post( (int) $_POST['post_ID'] );
@@ -3147 +3163 @@
     // the embed shortcode requires a post
     if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
-        if ( 'embed' === $shortcode ) {
+        if ( in_array( 'embed', $found_shortcodes, true ) ) {
             wp_send_json_error();
         }

branches/4.9/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -501 +501 @@
         $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
 
+        $edit_post_cap = $post ? 'edit_post' : 'edit_posts';
+        if (
+            current_user_can( $edit_post_cap, $comment->comment_post_ID ) ||
+            (
+                empty( $post->post_password ) &&
+                current_user_can( 'read_post', $comment->comment_post_ID )
+            )
+        ) {
+            // The user has access to the post
+        } else {
+            return false;
+        }
+
         echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
         $this->single_row_columns( $comment );

branches/4.9/src/wp-admin/includes/class-wp-list-table.php

@@ -623 +623 @@
         $pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
 
-        // No comments at all.
+        $post_object   = get_post( $post_id );
+        $edit_post_cap = $post_object ? 'edit_post' : 'edit_posts';
+        if (
+            current_user_can( $edit_post_cap, $post_id ) ||
+            (
+                empty( $post_object->post_password ) &&
+                current_user_can( 'read_post', $post_id )
+            )
+        ) {
+            // The user has access to the post and thus can see comments
+        } else {
+            return false;
+        }
+
         if ( ! $approved_comments && ! $pending_comments ) {
             printf( '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',

branches/4.9/src/wp-admin/includes/dashboard.php

@@ -920 +920 @@
 
         echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
-        foreach ( $comments as $comment )
-            _wp_dashboard_recent_comments_row( $comment );
+        foreach ( $comments as $comment ) {
+            $comment_post = get_post( $comment->comment_post_ID );
+            if (
+                current_user_can( 'edit_post', $comment->comment_post_ID ) ||
+                (
+                    empty( $comment_post->post_password ) &&
+                    current_user_can( 'read_post', $comment->comment_post_ID )
+                )
+            ) {
+                _wp_dashboard_recent_comments_row( $comment );
+            }
+        }
         echo '</ul>';
 

branches/4.9/src/wp-includes/Requests/Hooks.php

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

branches/4.9/src/wp-includes/Requests/IRI.php

@@ -704 +704 @@
     }
 
+    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

branches/4.9/src/wp-includes/Requests/Session.php

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

branches/4.9/src/wp-includes/class-wp-theme.php

@@ -536 +536 @@
 
     /**
+     * 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.
      *
@@ -1487 +1509 @@
         return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
     }
+
+    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;
+    }
 }

branches/4.9/src/wp-includes/media.php

@@ -1688 +1688 @@
         }
     } elseif ( ! empty( $atts['exclude'] ) ) {
+        $post_parent_id = $id;
         $attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
     } else {
+        $post_parent_id = $id;
         $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+    }
+
+    if ( ! empty( $post_parent_id ) ) {
+        $post_parent = get_post( $post_parent_id );
+
+        // terminate the shortcode execution if user cannot read the post or password-protected
+        if (
+        ( ! is_post_publicly_viewable( $post_parent->ID ) && ! current_user_can( 'read_post', $post_parent->ID ) )
+        || post_password_required( $post_parent ) ) {
+            return '';
+        }
     }
 
@@ -1992 +2005 @@
     }
 
+    if ( ! empty( $args['post_parent'] ) ) {
+        $post_parent = get_post( $id );
+
+        // terminate the shortcode execution if user cannot read the post or password-protected
+        if ( ! current_user_can( 'read_post', $post_parent->ID ) || post_password_required( $post_parent ) ) {
+            return '';
+        }
+    }
+
     if ( empty( $attachments ) ) {
         return '';

branches/4.9/src/wp-includes/rest-api.php

@@ -784 +784 @@
 
     if ( ! $result ) {
+        add_filter( 'rest_send_nocache_headers', '__return_true', 20 );
         return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie nonce is invalid' ), array( 'status' => 403 ) );
     }

branches/4.9/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -236 +236 @@
 
         /**
-         * Send nocache headers on authenticated requests.
+         * Filters whether the REST API is enabled.
          *
          * @since 4.4.0
+         * @deprecated 4.7.0 Use the rest_authentication_errors filter to restrict access to the API
+         *
+         * @param bool $rest_enabled Whether the REST API is enabled. Default true.
+         */
+        apply_filters_deprecated( 'rest_enabled', array( true ), '4.7.0', 'rest_authentication_errors',
+            __( 'The REST API can no longer be completely disabled, the rest_authentication_errors filter can be used to restrict access to the API, instead.' )
+        );
+
+        /**
+         * Filters whether jsonp is enabled.
+         *
+         * @since 4.4.0
+         *
+         * @param bool $jsonp_enabled Whether jsonp is enabled. Default true.
+         */
+        $jsonp_enabled = apply_filters( 'rest_jsonp_enabled', true );
+
+        $jsonp_callback = null;
+
+        if ( isset( $_GET['_jsonp'] ) ) {
+            if ( ! $jsonp_enabled ) {
+                echo $this->json_error( 'rest_callback_disabled', __( 'JSONP support is disabled on this site.' ), 400 );
+                return false;
+            }
+
+            $jsonp_callback = $_GET['_jsonp'];
+            if ( ! wp_check_jsonp_callback( $jsonp_callback ) ) {
+                echo $this->json_error( 'rest_callback_invalid', __( 'Invalid JSONP callback function.' ), 400 );
+                return false;
+            }
+        }
+
+        if ( empty( $path ) ) {
+            if ( isset( $_SERVER['PATH_INFO'] ) ) {
+                $path = $_SERVER['PATH_INFO'];
+            } else {
+                $path = '/';
+            }
+        }
+
+        $request = new WP_REST_Request( $_SERVER['REQUEST_METHOD'], $path );
+
+        $request->set_query_params( wp_unslash( $_GET ) );
+        $request->set_body_params( wp_unslash( $_POST ) );
+        $request->set_file_params( $_FILES );
+        $request->set_headers( $this->get_headers( wp_unslash( $_SERVER ) ) );
+        $request->set_body( $this->get_raw_data() );
+
+        /*
+         * HTTP method override for clients that can't use PUT/PATCH/DELETE. First, we check
+         * $_GET['_method']. If that is not set, we check for the HTTP_X_HTTP_METHOD_OVERRIDE
+         * header.
+         */
+        $method_overridden = false;
+        if ( isset( $_GET['_method'] ) ) {
+            $request->set_method( $_GET['_method'] );
+        } elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) {
+            $request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] );
+            $method_overridden = true;
+        }
+
+        $result = $this->check_authentication();
+
+        if ( ! is_wp_error( $result ) ) {
+            $result = $this->dispatch( $request );
+        }
+
+        // Normalize to either WP_Error or WP_REST_Response...
+        $result = rest_ensure_response( $result );
+
+        // ...then convert WP_Error across.
+        if ( is_wp_error( $result ) ) {
+            $result = $this->error_to_response( $result );
+        }
+
+        /**
+         * Filters the API response.
+         *
+         * Allows modification of the response before returning.
+         *
+         * @since 4.4.0
+         * @since 4.5.0 Applied to embedded responses.
+         *
+         * @param WP_HTTP_Response $result  Result to send to the client. Usually a WP_REST_Response.
+         * @param WP_REST_Server   $this    Server instance.
+         * @param WP_REST_Request  $request Request used to generate the response.
+         */
+        $result = apply_filters( 'rest_post_dispatch', rest_ensure_response( $result ), $this, $request );
+
+        // Wrap the response in an envelope if asked for.
+        if ( isset( $_GET['_envelope'] ) ) {
+            $result = $this->envelope_response( $result, isset( $_GET['_embed'] ) );
+        }
+
+        // Send extra data from response objects.
+        $headers = $result->get_headers();
+        $this->send_headers( $headers );
+
+        $code = $result->get_status();
+        $this->set_status( $code );
+
+        /**
+         * Filters whether the request has already been served.
+         *
+         * Allow sending the request manually - by returning true, the API result
+         * will not be sent to the client.
+         *
+         * @since 4.4.0
+         *
+         * @param bool             $served  Whether the request has already been served.
+         *                                           Default false.
+         * @param WP_HTTP_Response $result  Result to send to the client. Usually a WP_REST_Response.
+         * @param WP_REST_Request  $request Request used to generate the response.
+         * @param WP_REST_Server   $this    Server instance.
+         */
+        $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
+
+        /**
+         * Filters whether to send nocache headers on a REST API request.
+         *
+         * @since 4.4.0
+         * @since 6.x.x Moved the block to catch the filter added on rest_cookie_check_errors() from rest-api.php
          *
          * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
          */
         $send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
-        if ( $send_no_cache_headers ) {
+
+        // send no cache headers if the $send_no_cache_headers is true
+        // OR if the HTTP_X_HTTP_METHOD_OVERRIDE is used but resulted a 4xx response code.
+        if ( $send_no_cache_headers || ( true === $method_overridden && strpos( $code, '4' ) === 0 ) ) {
             foreach ( wp_get_nocache_headers() as $header => $header_value ) {
                 if ( empty( $header_value ) ) {
@@ -252 +377 @@
             }
         }
-
-        /**
-         * Filters whether the REST API is enabled.
-         *
-         * @since 4.4.0
-         * @deprecated 4.7.0 Use the rest_authentication_errors filter to restrict access to the API
-         *
-         * @param bool $rest_enabled Whether the REST API is enabled. Default true.
-         */
-        apply_filters_deprecated( 'rest_enabled', array( true ), '4.7.0', 'rest_authentication_errors',
-            __( 'The REST API can no longer be completely disabled, the rest_authentication_errors filter can be used to restrict access to the API, instead.' )
-        );
-
-        /**
-         * Filters whether jsonp is enabled.
-         *
-         * @since 4.4.0
-         *
-         * @param bool $jsonp_enabled Whether jsonp is enabled. Default true.
-         */
-        $jsonp_enabled = apply_filters( 'rest_jsonp_enabled', true );
-
-        $jsonp_callback = null;
-
-        if ( isset( $_GET['_jsonp'] ) ) {
-            if ( ! $jsonp_enabled ) {
-                echo $this->json_error( 'rest_callback_disabled', __( 'JSONP support is disabled on this site.' ), 400 );
-                return false;
-            }
-
-            $jsonp_callback = $_GET['_jsonp'];
-            if ( ! wp_check_jsonp_callback( $jsonp_callback ) ) {
-                echo $this->json_error( 'rest_callback_invalid', __( 'Invalid JSONP callback function.' ), 400 );
-                return false;
-            }
-        }
-
-        if ( empty( $path ) ) {
-            if ( isset( $_SERVER['PATH_INFO'] ) ) {
-                $path = $_SERVER['PATH_INFO'];
-            } else {
-                $path = '/';
-            }
-        }
-
-        $request = new WP_REST_Request( $_SERVER['REQUEST_METHOD'], $path );
-
-        $request->set_query_params( wp_unslash( $_GET ) );
-        $request->set_body_params( wp_unslash( $_POST ) );
-        $request->set_file_params( $_FILES );
-        $request->set_headers( $this->get_headers( wp_unslash( $_SERVER ) ) );
-        $request->set_body( $this->get_raw_data() );
-
-        /*
-         * HTTP method override for clients that can't use PUT/PATCH/DELETE. First, we check
-         * $_GET['_method']. If that is not set, we check for the HTTP_X_HTTP_METHOD_OVERRIDE
-         * header.
-         */
-        if ( isset( $_GET['_method'] ) ) {
-            $request->set_method( $_GET['_method'] );
-        } elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) {
-            $request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] );
-        }
-
-        $result = $this->check_authentication();
-
-        if ( ! is_wp_error( $result ) ) {
-            $result = $this->dispatch( $request );
-        }
-
-        // Normalize to either WP_Error or WP_REST_Response...
-        $result = rest_ensure_response( $result );
-
-        // ...then convert WP_Error across.
-        if ( is_wp_error( $result ) ) {
-            $result = $this->error_to_response( $result );
-        }
-
-        /**
-         * Filters the API response.
-         *
-         * Allows modification of the response before returning.
-         *
-         * @since 4.4.0
-         * @since 4.5.0 Applied to embedded responses.
-         *
-         * @param WP_HTTP_Response $result  Result to send to the client. Usually a WP_REST_Response.
-         * @param WP_REST_Server   $this    Server instance.
-         * @param WP_REST_Request  $request Request used to generate the response.
-         */
-        $result = apply_filters( 'rest_post_dispatch', rest_ensure_response( $result ), $this, $request );
-
-        // Wrap the response in an envelope if asked for.
-        if ( isset( $_GET['_envelope'] ) ) {
-            $result = $this->envelope_response( $result, isset( $_GET['_embed'] ) );
-        }
-
-        // Send extra data from response objects.
-        $headers = $result->get_headers();
-        $this->send_headers( $headers );
-
-        $code = $result->get_status();
-        $this->set_status( $code );
-
-        /**
-         * Filters whether the request has already been served.
-         *
-         * Allow sending the request manually - by returning true, the API result
-         * will not be sent to the client.
-         *
-         * @since 4.4.0
-         *
-         * @param bool             $served  Whether the request has already been served.
-         *                                           Default false.
-         * @param WP_HTTP_Response $result  Result to send to the client. Usually a WP_REST_Response.
-         * @param WP_REST_Request  $request Request used to generate the response.
-         * @param WP_REST_Server   $this    Server instance.
-         */
-        $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
 
         if ( ! $served ) {

branches/4.9/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

@@ -272 +272 @@
 
         if ( ! empty( $prepared_args['search'] ) ) {
+            if ( ! current_user_can( 'list_users' ) ) {
+                $prepared_args['search_columns'] = array( 'ID', 'user_login', 'user_nicename', 'display_name' );
+            }
             $prepared_args['search'] = '*' . $prepared_args['search'] . '*';
         }

branches/4.9/src/wp-includes/shortcodes.php

@@ -160 +160 @@
 
 /**
- * Search content for shortcodes and filter shortcodes through their hooks.
+ * Returns a list of registered shortcode names found in the given content.
+ *
+ * Example usage:
+ *
+ *     get_shortcode_tags_in_content( '[audio src="file.mp3"][/audio] [foo] [gallery ids="1,2,3"]' );
+ *     // array( 'audio', 'gallery' )
+ *
+ * @since 6.3.2
+ *
+ * @param string $content The content to check.
+ * @return string[] An array of registered shortcode names found in the content.
+ */
+function get_shortcode_tags_in_content( $content ) {
+    if ( false === strpos( $content, '[' ) ) {
+        return array();
+    }
+
+    preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
+    if ( empty( $matches ) ) {
+        return array();
+    }
+
+    $tags = array();
+    foreach ( $matches as $shortcode ) {
+        $tags[] = $shortcode[2];
+
+        if ( ! empty( $shortcode[5] ) ) {
+            $deep_tags = get_shortcode_tags_in_content( $shortcode[5] );
+            if ( ! empty( $deep_tags ) ) {
+                $tags = array_merge( $tags, $deep_tags );
+            }
+        }
+    }
+
+    return $tags;
+}
+
+/**
+ * Searches content for shortcodes and filter shortcodes through their hooks.
  *
  * If there are no shortcode tags defined, then the content will be returned