Make WordPress Core

Changeset 56875


Ignore:
Timestamp:
10/12/2023 03:03:26 PM (7 months ago)
Author:
joemcgill
Message:

Grouped backports to the 5.9 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 5.9 branch.
Props xknown, jorbin, Vortfu, joehoyle, timothyblynjacobs, peterwilsoncc, ehtis, tykoted, martinkrcho, paulkevan, dd32, antpb, rmccue.

Location:
branches/5.9
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • branches/5.9

  • branches/5.9/src/wp-admin/includes/ajax-actions.php

    r55774 r56875  
    38133813    $shortcode = wp_unslash( $_POST['shortcode'] );
    38143814
     3815    // Only process previews for media related shortcodes:
     3816    $found_shortcodes = get_shortcode_tags_in_content( $shortcode );
     3817    $media_shortcodes = array(
     3818        'audio',
     3819        'embed',
     3820        'playlist',
     3821        'video',
     3822        'gallery',
     3823    );
     3824
     3825    $other_shortcodes = array_diff( $found_shortcodes, $media_shortcodes );
     3826
     3827    if ( ! empty( $other_shortcodes ) ) {
     3828        wp_send_json_error();
     3829    }
     3830
    38153831    if ( ! empty( $_POST['post_ID'] ) ) {
    38163832        $post = get_post( (int) $_POST['post_ID'] );
     
    38193835    // The embed shortcode requires a post.
    38203836    if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
    3821         if ( 'embed' === $shortcode ) {
     3837        if ( in_array( 'embed', $found_shortcodes, true ) ) {
    38223838            wp_send_json_error();
    38233839        }
  • branches/5.9/src/wp-admin/includes/class-wp-comments-list-table.php

    r52205 r56875  
    640640
    641641        $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
     642
     643        $edit_post_cap = $post ? 'edit_post' : 'edit_posts';
     644        if (
     645            current_user_can( $edit_post_cap, $comment->comment_post_ID ) ||
     646            (
     647                empty( $post->post_password ) &&
     648                current_user_can( 'read_post', $comment->comment_post_ID )
     649            )
     650        ) {
     651            // The user has access to the post
     652        } else {
     653            return false;
     654        }
    642655
    643656        echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
  • branches/5.9/src/wp-admin/includes/class-wp-list-table.php

    r51880 r56875  
    739739            $pending_comments_number
    740740        );
     741
     742        $post_object   = get_post( $post_id );
     743        $edit_post_cap = $post_object ? 'edit_post' : 'edit_posts';
     744        if (
     745            current_user_can( $edit_post_cap, $post_id ) ||
     746            (
     747                empty( $post_object->post_password ) &&
     748                current_user_can( 'read_post', $post_id )
     749            )
     750        ) {
     751            // The user has access to the post and thus can see comments
     752        } else {
     753            return false;
     754        }
    741755
    742756        if ( ! $approved_comments && ! $pending_comments ) {
  • branches/5.9/src/wp-admin/includes/dashboard.php

    r52442 r56875  
    10861086        echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
    10871087        foreach ( $comments as $comment ) {
    1088             _wp_dashboard_recent_comments_row( $comment );
     1088
     1089            $comment_post = get_post( $comment->comment_post_ID );
     1090            if (
     1091                current_user_can( 'edit_post', $comment->comment_post_ID ) ||
     1092                (
     1093                    empty( $comment_post->post_password ) &&
     1094                    current_user_can( 'read_post', $comment->comment_post_ID )
     1095                )
     1096            ) {
     1097                _wp_dashboard_recent_comments_row( $comment );
     1098            }
    10891099        }
    10901100        echo '</ul>';
  • branches/5.9/src/wp-admin/includes/user.php

    r52285 r56875  
    600600 *
    601601 * @since 5.6.0
     602 * @since 6.2.0 Allow insecure HTTP connections for the local environment.
     603 * @since 6.3.2 Validates the success and reject URLs to prevent javascript pseudo protocol being executed.
    602604 *
    603605 * @param array   $request {
     
    615617    $error = new WP_Error();
    616618
    617     if ( ! empty( $request['success_url'] ) ) {
    618         $scheme = wp_parse_url( $request['success_url'], PHP_URL_SCHEME );
    619 
    620         if ( 'http' === $scheme ) {
     619    if ( isset( $request['success_url'] ) ) {
     620        $validated_success_url = wp_is_authorize_application_redirect_url_valid( $request['success_url'] );
     621        if ( is_wp_error( $validated_success_url ) ) {
    621622            $error->add(
    622                 'invalid_redirect_scheme',
    623                 __( 'The success URL must be served over a secure connection.' )
     623                $validated_success_url->get_error_code(),
     624                $validated_success_url->get_error_message()
    624625            );
    625626        }
    626627    }
    627628
    628     if ( ! empty( $request['reject_url'] ) ) {
    629         $scheme = wp_parse_url( $request['reject_url'], PHP_URL_SCHEME );
    630 
    631         if ( 'http' === $scheme ) {
     629    if ( isset( $request['reject_url'] ) ) {
     630        $validated_reject_url = wp_is_authorize_application_redirect_url_valid( $request['reject_url'] );
     631        if ( is_wp_error( $validated_reject_url ) ) {
    632632            $error->add(
    633                 'invalid_redirect_scheme',
    634                 __( 'The rejection URL must be served over a secure connection.' )
     633                $validated_reject_url->get_error_code(),
     634                $validated_reject_url->get_error_message()
    635635            );
    636636        }
     
    661661    return true;
    662662}
     663
     664/**
     665 * Validates the redirect URL protocol scheme. The protocol can be anything except http and javascript.
     666 *
     667 * @since 6.3.2
     668 *
     669 * @param string $url - The redirect URL to be validated.
     670 *
     671 * @return true|WP_Error True if the redirect URL is valid, a WP_Error object otherwise.
     672 */
     673function wp_is_authorize_application_redirect_url_valid( $url ) {
     674    $bad_protocols = array( 'javascript', 'data' );
     675    if ( empty( $url ) ) {
     676        return true;
     677    }
     678
     679    // Based on https://www.rfc-editor.org/rfc/rfc2396#section-3.1
     680    $valid_scheme_regex = '/^[a-zA-Z][a-zA-Z0-9+.-]*:/';
     681    if ( ! preg_match( $valid_scheme_regex, $url ) ) {
     682        return new WP_Error(
     683            'invalid_redirect_url_format',
     684            __( 'Invalid URL format.' )
     685        );
     686    }
     687
     688    /**
     689     * Filters the list of invalid protocols used in applications redirect URLs.
     690     *
     691     * @since 6.3.2
     692     *
     693     * @param string[]  $bad_protocols Array of invalid protocols.
     694     * @param string    $url The redirect URL to be validated.
     695     */
     696    $invalid_protocols = array_map( 'strtolower', apply_filters( 'wp_authorize_application_redirect_url_invalid_protocols', $bad_protocols, $url ) );
     697
     698    $scheme   = wp_parse_url( $url, PHP_URL_SCHEME );
     699    $host     = wp_parse_url( $url, PHP_URL_HOST );
     700    $is_local = 'local' === wp_get_environment_type();
     701
     702    // validates if the proper URI format is applied to the $url
     703    if ( empty( $host ) || empty( $scheme ) || in_array( strtolower( $scheme ), $invalid_protocols, true ) ) {
     704        return new WP_Error(
     705            'invalid_redirect_url_format',
     706            __( 'Invalid URL format.' )
     707        );
     708    }
     709
     710    if ( 'http' === $scheme && ! $is_local ) {
     711        return new WP_Error(
     712            'invalid_redirect_scheme',
     713            __( 'The URL must be served over a secure connection.' )
     714        );
     715    }
     716
     717    return true;
     718}
  • branches/5.9/src/wp-includes/Requests/Hooks.php

    r52328 r56875  
    6666        return true;
    6767    }
     68
     69    public function __wakeup() {
     70        throw new \LogicException( __CLASS__ . ' should never be unserialized' );
     71    }
    6872}
  • branches/5.9/src/wp-includes/Requests/IRI.php

    r52328 r56875  
    706706    }
    707707
     708    public function __wakeup() {
     709        $class_props = get_class_vars( __CLASS__ );
     710        $string_props = array( 'scheme', 'iuserinfo', 'ihost', 'port', 'ipath', 'iquery', 'ifragment' );
     711        $array_props = array( 'normalization' );
     712        foreach ( $class_props as $prop => $default_value ) {
     713            if ( in_array( $prop, $string_props, true ) && ! is_string( $this->$prop ) ) {
     714                throw new UnexpectedValueException();
     715            } elseif ( in_array( $prop, $array_props, true ) && ! is_array( $this->$prop ) ) {
     716                throw new UnexpectedValueException();
     717            }
     718            $this->$prop = null;
     719        }
     720    }
     721
    708722    /**
    709723     * Set the entire IRI. Returns true on success, false on failure (if there
  • branches/5.9/src/wp-includes/Requests/Session.php

    r52328 r56875  
    230230    }
    231231
     232    public function __wakeup() {
     233        throw new \LogicException( __CLASS__ . ' should never be unserialized' );
     234    }
     235
    232236    /**
    233237     * Merge a request's data with the default data
  • branches/5.9/src/wp-includes/class-wp-block-patterns-registry.php

    r52236 r56875  
    157157    }
    158158
     159    public function __wakeup() {
     160        if ( ! $this->registered_patterns ) {
     161            return;
     162        }
     163        if ( ! is_array( $this->registered_patterns ) ) {
     164            throw new UnexpectedValueException();
     165        }
     166        foreach ( $this->registered_patterns as $value ) {
     167            if ( ! is_array( $value ) ) {
     168                throw new UnexpectedValueException();
     169            }
     170        }
     171        $this->registered_patterns_outside_init = array();
     172    }
     173
    159174    /**
    160175     * Utility method to retrieve the main instance of the class.
  • branches/5.9/src/wp-includes/class-wp-block-type-registry.php

    r51154 r56875  
    168168    }
    169169
     170    public function __wakeup() {
     171        if ( ! $this->registered_block_types ) {
     172            return;
     173        }
     174        if ( ! is_array( $this->registered_block_types ) ) {
     175            throw new UnexpectedValueException();
     176        }
     177        foreach ( $this->registered_block_types as $value ) {
     178            if ( ! $value instanceof WP_Block_Type ) {
     179                throw new UnexpectedValueException();
     180            }
     181        }
     182    }
     183
    170184    /**
    171185     * Utility method to retrieve the main instance of the class.
  • branches/5.9/src/wp-includes/class-wp-theme.php

    r52365 r56875  
    706706
    707707    /**
     708     * Perform reinitialization tasks.
     709     *
     710     * Prevents a callback from being injected during unserialization of an object.
     711     *
     712     * @return void
     713     */
     714    public function __wakeup() {
     715        if ( $this->parent && ! $this->parent instanceof self ) {
     716            throw new UnexpectedValueException();
     717        }
     718        if ( $this->headers && ! is_array( $this->headers ) ) {
     719            throw new UnexpectedValueException();
     720        }
     721        foreach ( $this->headers as $value ) {
     722            if ( ! is_string( $value ) ) {
     723                throw new UnexpectedValueException();
     724            }
     725        }
     726        $this->headers_sanitized = array();
     727    }
     728
     729    /**
    708730     * Adds theme data to cache.
    709731     *
     
    17641786        return strnatcasecmp( $a->name_translated, $b->name_translated );
    17651787    }
     1788
     1789    private static function _check_headers_property_has_correct_type( $headers ) {
     1790        if ( ! is_array( $headers ) ) {
     1791            return false;
     1792        }
     1793        foreach ( $headers as $key => $value ) {
     1794            if ( ! is_string( $key ) || ! is_string( $value ) ) {
     1795                return false;
     1796            }
     1797        }
     1798        return true;
     1799    }
    17661800}
  • branches/5.9/src/wp-includes/media.php

    r55774 r56875  
    23552355        }
    23562356    } elseif ( ! empty( $atts['exclude'] ) ) {
     2357        $post_parent_id = $id;
    23572358        $attachments = get_children(
    23582359            array(
     
    23672368        );
    23682369    } else {
     2370        $post_parent_id = $id;
    23692371        $attachments = get_children(
    23702372            array(
     
    23772379            )
    23782380        );
     2381    }
     2382
     2383    if ( ! empty( $post_parent_id ) ) {
     2384        $post_parent = get_post( $post_parent_id );
     2385
     2386        // terminate the shortcode execution if user cannot read the post or password-protected
     2387        if (
     2388        ( ! is_post_publicly_viewable( $post_parent->ID ) && ! current_user_can( 'read_post', $post_parent->ID ) )
     2389        || post_password_required( $post_parent ) ) {
     2390            return '';
     2391        }
    23792392    }
    23802393
     
    27052718    }
    27062719
     2720    if ( ! empty( $args['post_parent'] ) ) {
     2721        $post_parent = get_post( $id );
     2722
     2723        // terminate the shortcode execution if user cannot read the post or password-protected
     2724        if ( ! current_user_can( 'read_post', $post_parent->ID ) || post_password_required( $post_parent ) ) {
     2725            return '';
     2726        }
     2727    }
     2728
    27072729    if ( empty( $attachments ) ) {
    27082730        return '';
  • branches/5.9/src/wp-includes/rest-api.php

    r52328 r56875  
    10451045
    10461046    if ( ! $result ) {
     1047        add_filter( 'rest_send_nocache_headers', '__return_true', 20 );
    10471048        return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie check failed' ), array( 'status' => 403 ) );
    10481049    }
  • branches/5.9/src/wp-includes/rest-api/class-wp-rest-server.php

    r52204 r56875  
    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
     
    464448         */
    465449        $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
     450
     451        /**
     452         * Filters whether to send nocache headers on a REST API request.
     453         *
     454         * @since 4.4.0
     455         * @since 6.x.x Moved the block to catch the filter added on rest_cookie_check_errors() from rest-api.php
     456         *
     457         * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
     458         */
     459        $send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
     460
     461        // send no cache headers if the $send_no_cache_headers is true
     462        // OR if the HTTP_X_HTTP_METHOD_OVERRIDE is used but resulted a 4xx response code.
     463        if ( $send_no_cache_headers || ( true === $method_overridden && strpos( $code, '4' ) === 0 ) ) {
     464            foreach ( wp_get_nocache_headers() as $header => $header_value ) {
     465                if ( empty( $header_value ) ) {
     466                    $this->remove_header( $header );
     467                } else {
     468                    $this->send_header( $header, $header_value );
     469                }
     470            }
     471        }
    466472
    467473        if ( ! $served ) {
  • branches/5.9/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

    r52069 r56875  
    319319
    320320        if ( ! empty( $prepared_args['search'] ) ) {
     321            if ( ! current_user_can( 'list_users' ) ) {
     322                $prepared_args['search_columns'] = array( 'ID', 'user_login', 'user_nicename', 'display_name' );
     323            }
    321324            $prepared_args['search'] = '*' . $prepared_args['search'] . '*';
    322325        }
  • branches/5.9/src/wp-includes/shortcodes.php

    r51154 r56875  
    171171
    172172/**
    173  * Search content for shortcodes and filter shortcodes through their hooks.
     173 * Returns a list of registered shortcode names found in the given content.
     174 *
     175 * Example usage:
     176 *
     177 *     get_shortcode_tags_in_content( '[audio src="file.mp3"][/audio] [foo] [gallery ids="1,2,3"]' );
     178 *     // array( 'audio', 'gallery' )
     179 *
     180 * @since 6.3.2
     181 *
     182 * @param string $content The content to check.
     183 * @return string[] An array of registered shortcode names found in the content.
     184 */
     185function get_shortcode_tags_in_content( $content ) {
     186    if ( false === strpos( $content, '[' ) ) {
     187        return array();
     188    }
     189
     190    preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
     191    if ( empty( $matches ) ) {
     192        return array();
     193    }
     194
     195    $tags = array();
     196    foreach ( $matches as $shortcode ) {
     197        $tags[] = $shortcode[2];
     198
     199        if ( ! empty( $shortcode[5] ) ) {
     200            $deep_tags = get_shortcode_tags_in_content( $shortcode[5] );
     201            if ( ! empty( $deep_tags ) ) {
     202                $tags = array_merge( $tags, $deep_tags );
     203            }
     204        }
     205    }
     206
     207    return $tags;
     208}
     209
     210/**
     211 * Searches content for shortcodes and filter shortcodes through their hooks.
    174212 *
    175213 * This function is an alias for do_shortcode().
Note: See TracChangeset for help on using the changeset viewer.