Make WordPress Core


Ignore:
Timestamp:
10/12/2023 02:59:09 PM (8 months ago)
Author:
joemcgill
Message:

Grouped backports to the 6.0 branch.

  • REST API: Limit search_columns for users without list_users.
  • Comments: Prevent users who can not see a post from seeing comments on it.
  • Application Passwords: Prevent the use of some pseudo protocols in application passwords.
  • Restrict media shortcode ajax to certain type
  • REST API: Ensure no-cache headers are sent when methods are overriden.
  • Prevent unintended behavior when certain objects are unserialized.

Merges [56833], [56834], [56835], [56836], [56837], and [56838] to the 6.0 branch.
Props xknown, jorbin, Vortfu, joehoyle, timothyblynjacobs, peterwilsoncc, ehtis, tykoted, martinkrcho, paulkevan, dd32, antpb, rmccue.

Location:
branches/6.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/6.0

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

    r53110 r56870  
    332332
    333333        /**
    334          * Filters whether to send nocache headers on a REST API request.
    335          *
    336          * @since 4.4.0
    337          *
    338          * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
    339          */
    340         $send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
    341         if ( $send_no_cache_headers ) {
    342             foreach ( wp_get_nocache_headers() as $header => $header_value ) {
    343                 if ( empty( $header_value ) ) {
    344                     $this->remove_header( $header );
    345                 } else {
    346                     $this->send_header( $header, $header_value );
    347                 }
    348             }
    349         }
    350 
    351         /**
    352334         * Filters whether the REST API is enabled.
    353335         *
     
    403385         * header.
    404386         */
     387        $method_overridden = false;
    405388        if ( isset( $_GET['_method'] ) ) {
    406389            $request->set_method( $_GET['_method'] );
    407390        } elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) {
    408391            $request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] );
     392            $method_overridden = true;
    409393        }
    410394
     
    465449         */
    466450        $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
     451
     452        /**
     453         * Filters whether to send nocache headers on a REST API request.
     454         *
     455         * @since 4.4.0
     456         * @since 6.x.x Moved the block to catch the filter added on rest_cookie_check_errors() from rest-api.php
     457         *
     458         * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
     459         */
     460        $send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
     461
     462        // send no cache headers if the $send_no_cache_headers is true
     463        // OR if the HTTP_X_HTTP_METHOD_OVERRIDE is used but resulted a 4xx response code.
     464        if ( $send_no_cache_headers || ( true === $method_overridden && strpos( $code, '4' ) === 0 ) ) {
     465            foreach ( wp_get_nocache_headers() as $header => $header_value ) {
     466                if ( empty( $header_value ) ) {
     467                    $this->remove_header( $header );
     468                } else {
     469                    $this->send_header( $header, $header_value );
     470                }
     471            }
     472        }
    467473
    468474        if ( ! $served ) {
Note: See TracChangeset for help on using the changeset viewer.