Make WordPress Core

Changeset 54553


Ignore:
Timestamp:
10/17/2022 05:53:05 PM (21 months ago)
Author:
audrasjb
Message:

Grouped backports to the 5.7 branch.

  • Editor: Bump @wordpress packages for the branch,
  • Media: Refactor search by filename within the admin,
  • REST API: Lockdown post parameter of the terms endpoint,
  • Customize: Escape blogname option in underscores templates,
  • Query: Validate relation in WP_Date_Query,
  • Posts, Post types: Apply KSES to post-by-email content,
  • General: Validate host on "Are you sure?" screen,
  • Posts, Post types: Remove emails from post-by-email logs,
  • Pings/trackbacks: Apply KSES to all trackbacks,
  • Mail: Reset PHPMailer properties between use,
  • Comments: Apply kses when editing comments,
  • Widgets: Escape RSS error messages for display.

Merges [54521-54530] to the 5.7 branch.
Props audrasjb, costdev, cu121, dd32, davidbaumwald, ehtis, johnbillion, johnjamesjacoby, martinkrcho, matveb, oztaser, paulkevan, peterwilsoncc, ravipatel, SergeyBiryukov, talldanwp, timothyblynjacobs, tykoted, voldemortensen, vortfu, xknown.

Location:
branches/5.7
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • branches/5.7

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

    r50390 r54553  
    29752975    // Filter query clauses to include filenames.
    29762976    if ( isset( $query['s'] ) ) {
    2977         add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
     2977        add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
    29782978    }
    29792979
  • branches/5.7/src/wp-admin/includes/post.php

    r50297 r54553  
    12701270    // Filter query clauses to include filenames.
    12711271    if ( isset( $q['s'] ) ) {
    1272         add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
     1272        add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
    12731273    }
    12741274
  • branches/5.7/src/wp-includes/class-wp-date-query.php

    r49672 r54553  
    150150        }
    151151
    152         if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
    153             $this->relation = 'OR';
     152        if ( isset( $date_query['relation'] ) ) {
     153            $this->relation = $this->sanitize_relation( $date_query['relation'] );
    154154        } else {
    155155            $this->relation = 'AND';
     
    219219            $this->validate_date_values( $queries );
    220220        }
     221
     222        // Sanitize the relation parameter.
     223        $queries['relation'] = $this->sanitize_relation( $queries['relation'] );
    221224
    222225        foreach ( $queries as $key => $q ) {
     
    10401043        return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
    10411044    }
     1045
     1046    /**
     1047     * Sanitizes a 'relation' operator.
     1048     *
     1049     * @since 6.0.3
     1050     *
     1051     * @param string $relation Raw relation key from the query argument.
     1052     * @return string Sanitized relation ('AND' or 'OR').
     1053     */
     1054    public function sanitize_relation( $relation ) {
     1055        if ( 'OR' === strtoupper( $relation ) ) {
     1056            return 'OR';
     1057        } else {
     1058            return 'AND';
     1059        }
     1060    }
    10421061}
  • branches/5.7/src/wp-includes/class-wp-query.php

    r49946 r54553  
    445445    public $thumbnails_cached = false;
    446446
     447    /**
     448     * Controls whether an attachment query should include filenames or not.
     449     *
     450     * @since 6.0.3
     451     * @var bool
     452     */
     453    protected $allow_query_attachment_by_filename = false;
    447454    /**
    448455     * Cached list of search stopwords.
     
    13951402
    13961403            $like      = $n . $wpdb->esc_like( $term ) . $n;
    1397             $search   .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
     1404
     1405            if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
     1406                $search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s) $andor_op (sq1.meta_value $like_op %s))", $like, $like, $like, $like );
     1407            } else {
     1408                $search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
     1409            }
    13981410            $searchand = ' AND ';
    13991411        }
     
    17901802        $q = $this->fill_query_vars( $q );
    17911803
     1804        /**
     1805         * Filters whether an attachment query should include filenames or not.
     1806         *
     1807         * @since 6.0.3
     1808         *
     1809         * @param bool $allow_query_attachment_by_filename Whether or not to include filenames.
     1810         */
     1811        $this->allow_query_attachment_by_filename = apply_filters( 'wp_allow_query_attachment_by_filename', false );
     1812        remove_all_filters( 'wp_allow_query_attachment_by_filename' );
     1813
    17921814        // Parse meta query.
    17931815        $this->meta_query = new WP_Meta_Query();
     
    22212243        }
    22222244
    2223         if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
     2245        if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ! empty( $this->allow_query_attachment_by_filename ) ) {
    22242246            $groupby = "{$wpdb->posts}.ID";
    22252247        }
     
    22972319        }
    22982320        $where .= $search . $whichauthor . $whichmimetype;
     2321
     2322        if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
     2323            $join .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
     2324        }
    22992325
    23002326        if ( ! empty( $this->meta_query->queries ) ) {
  • branches/5.7/src/wp-includes/comment.php

    r50375 r54553  
    24622462    }
    24632463
     2464    $filter_comment = false;
     2465    if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
     2466        $filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
     2467    }
     2468
     2469    if ( $filter_comment ) {
     2470        add_filter( 'pre_comment_content', 'wp_filter_kses' );
     2471    }
     2472
    24642473    // Escape data pulled from DB.
    24652474    $comment = wp_slash( $comment );
     
    24712480
    24722481    $commentarr = wp_filter_comment( $commentarr );
     2482
     2483    if ( $filter_comment ) {
     2484        remove_filter( 'pre_comment_content', 'wp_filter_kses' );
     2485    }
    24732486
    24742487    // Now extract the merged array.
  • branches/5.7/src/wp-includes/customize/class-wp-customize-header-image-control.php

    r48834 r54553  
    131131
    132132            <button type="button" class="choice thumbnail"
    133                 data-customize-image-value="{{{data.header.url}}}"
     133                data-customize-image-value="{{data.header.url}}"
    134134                data-customize-header-image-data="{{JSON.stringify(data.header)}}">
    135135                <span class="screen-reader-text"><?php _e( 'Set image' ); ?></span>
    136                 <img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}" />
     136                <img src="{{data.header.thumbnail_url}}" alt="{{data.header.alt_text || data.header.description}}" />
    137137            </button>
    138138
     
    159159                <# } else { #>
    160160
    161             <img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}" />
     161            <img src="{{data.header.thumbnail_url}}" alt="{{data.header.alt_text || data.header.description}}" />
    162162
    163163                <# } #>
  • branches/5.7/src/wp-includes/customize/class-wp-customize-site-icon-control.php

    r47382 r54553  
    6969                                <img src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
    7070                            </div>
    71                             <span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
     71                            <span class="browser-title" aria-hidden="true"><# print( '<?php echo esc_js( get_bloginfo( 'name' ) ); ?>' ) #></span>
    7272                        </div>
    7373                        <img class="app-icon-preview" src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
  • branches/5.7/src/wp-includes/deprecated.php

    r50146 r54553  
    42044204    wp_strict_cross_origin_referrer();
    42054205}
     4206
     4207/**
     4208 * Filter the SQL clauses of an attachment query to include filenames.
     4209 *
     4210 * @since 4.7.0
     4211 * @deprecated 6.0.3
     4212 * @access private
     4213 *
     4214 * @param array $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
     4215 *                       DISTINCT, fields (SELECT), and LIMITS clauses.
     4216 * @return array The unmodified clauses.
     4217 */
     4218function _filter_query_attachment_filenames( $clauses ) {
     4219    _deprecated_function( __FUNCTION__, '6.0.3', 'add_filter( "wp_allow_query_attachment_by_filename", "__return_true" )');
     4220    remove_filter( 'posts_clauses', __FUNCTION__ );
     4221    return $clauses;
     4222}
     4223
  • branches/5.7/src/wp-includes/functions.php

    r51742 r54553  
    32893289        $html = __( 'The link you followed has expired.' );
    32903290        if ( wp_get_referer() ) {
     3291            $wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
     3292            $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
    32913293            $html .= '</p><p>';
    32923294            $html .= sprintf(
    32933295                '<a href="%s">%s</a>',
    3294                 esc_url( remove_query_arg( 'updated', wp_get_referer() ) ),
     3296                esc_url( $wp_http_referer ),
    32953297                __( 'Please try again.' )
    32963298            );
  • branches/5.7/src/wp-includes/media-template.php

    r50352 r54553  
    14941494                <img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
    14951495            </div>
    1496             <span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
     1496            <span class="browser-title" aria-hidden="true"><# print( '<?php echo esc_js( get_bloginfo( 'name' ) ); ?>' ) #></span>
    14971497        </div>
    14981498
  • branches/5.7/src/wp-includes/pluggable.php

    r50034 r54553  
    351351        $phpmailer->clearCustomHeaders();
    352352        $phpmailer->clearReplyTos();
     353        $phpmailer->Body    = '';
     354        $phpmailer->AltBody = '';
    353355
    354356        // Set "From" name and email.
  • branches/5.7/src/wp-includes/post.php

    r52466 r54553  
    75917591
    75927592/**
    7593  * Filters the SQL clauses of an attachment query to include filenames.
    7594  *
    7595  * @since 4.7.0
    7596  * @access private
    7597  *
    7598  * @global wpdb $wpdb WordPress database abstraction object.
    7599  *
    7600  * @param string[] $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
    7601  *                          DISTINCT, fields (SELECT), and LIMITS clauses.
    7602  * @return string[] The modified array of clauses.
    7603  */
    7604 function _filter_query_attachment_filenames( $clauses ) {
    7605     global $wpdb;
    7606     remove_filter( 'posts_clauses', __FUNCTION__ );
    7607 
    7608     // Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
    7609     $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
    7610 
    7611     $clauses['groupby'] = "{$wpdb->posts}.ID";
    7612 
    7613     $clauses['where'] = preg_replace(
    7614         "/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
    7615         '$0 OR ( sq1.meta_value $1 $2 )',
    7616         $clauses['where']
    7617     );
    7618 
    7619     return $clauses;
    7620 }
    7621 
    7622 /**
    76237593 * Sets the last changed time for the 'posts' cache group.
    76247594 *
  • branches/5.7/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

    r50152 r54553  
    9090        // Filter query clauses to include filenames.
    9191        if ( isset( $query_args['s'] ) ) {
    92             add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
     92            add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
    9393        }
    9494
  • branches/5.7/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php

    r49942 r54553  
    136136
    137137    /**
     138     * Checks if the terms for a post can be read.
     139     *
     140     * @since 6.0.3
     141     *
     142     * @param WP_Post         $post    Post object.
     143     * @param WP_REST_Request $request Full details about the request.
     144     * @return bool Whether the terms for the post can be read.
     145     */
     146    public function check_read_terms_permission_for_post( $post, $request ) {
     147        // If the requested post isn't associated with this taxonomy, deny access.
     148        if ( ! is_object_in_taxonomy( $post->post_type, $this->taxonomy ) ) {
     149            return false;
     150        }
     151
     152        // Grant access if the post is publicly viewable.
     153        if ( is_post_publicly_viewable( $post ) ) {
     154            return true;
     155        }
     156
     157        // Otherwise grant access if the post is readable by the logged in user.
     158        if ( current_user_can( 'read_post', $post->ID ) ) {
     159            return true;
     160        }
     161
     162        // Otherwise, deny access.
     163        return false;
     164    }
     165
     166    /**
    138167     * Checks if a request has access to read terms in the specified taxonomy.
    139168     *
     
    156185                array( 'status' => rest_authorization_required_code() )
    157186            );
     187        }
     188
     189        if ( ! empty( $request['post'] ) ) {
     190            $post = get_post( $request['post'] );
     191
     192            if ( ! $post ) {
     193                return new WP_Error(
     194                    'rest_post_invalid_id',
     195                    __( 'Invalid post ID.' ),
     196                    array(
     197                        'status' => 400,
     198                    )
     199                );
     200            }
     201
     202            if ( ! $this->check_read_terms_permission_for_post( $post, $request ) ) {
     203                return new WP_Error(
     204                    'rest_forbidden_context',
     205                    __( 'Sorry, you are not allowed to view terms for this post.' ),
     206                    array(
     207                        'status' => rest_authorization_required_code(),
     208                    )
     209                );
     210            }
    158211        }
    159212
  • branches/5.7/src/wp-includes/widgets.php

    r50372 r54553  
    15271527    if ( is_wp_error( $rss ) ) {
    15281528        if ( is_admin() || current_user_can( 'manage_options' ) ) {
    1529             echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</p>';
     1529            echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . esc_html( $rss->get_error_message() ) . '</p>';
    15301530        }
    15311531        return;
     
    16501650
    16511651    if ( ! empty( $args['error'] ) ) {
    1652         echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . $args['error'] . '</p>';
     1652        echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . esc_html( $args['error'] ) . '</p>';
    16531653    }
    16541654
  • branches/5.7/src/wp-mail.php

    r47580 r54553  
    6565    wp_die( __( 'There doesn&#8217;t seem to be any new mail.' ) );
    6666}
     67
     68// Always run as an unauthenticated user.
     69wp_set_current_user( 0 );
    6770
    6871for ( $i = 1; $i <= $count; $i++ ) {
     
    132135                $author = sanitize_email( $author );
    133136                if ( is_email( $author ) ) {
    134                     /* translators: %s: Post author email address. */
    135                     echo '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
    136137                    $userdata = get_user_by( 'email', $author );
    137138                    if ( ! empty( $userdata ) ) {
  • branches/5.7/src/wp-trackback.php

    r49108 r54553  
    1313    wp( array( 'tb' => '1' ) );
    1414}
     15
     16// Always run as an unauthenticated user.
     17wp_set_current_user( 0 );
    1518
    1619/**
  • branches/5.7/tests/phpunit/tests/query/search.php

    r48939 r54553  
    456456
    457457        add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
    458         add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
     458        add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
    459459
    460460        // Pass post_type a string value.
     
    486486
    487487        add_post_meta( $attachment, '_wp_attached_file', 'some-image2.png', true );
    488         add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
     488        add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
    489489
    490490        // Pass post_type an array value.
     
    545545        add_post_meta( $attachment, '_wp_attached_file', 'some-image4.png', true );
    546546        add_post_meta( $attachment, '_test_meta_key', 'value', true );
    547         add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
     547        add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
    548548
    549549        // Pass post_type a string value.
     
    585585
    586586        add_post_meta( $attachment, '_wp_attached_file', 'some-image5.png', true );
    587         add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
     587        add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
    588588
    589589        // Pass post_type a string value.
     
    610610     * @ticket 22744
    611611     */
    612     public function test_filter_query_attachment_filenames_unhooks_itself() {
    613         add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
    614 
    615         apply_filters(
    616             'posts_clauses',
    617             array(
    618                 'where'    => '',
    619                 'groupby'  => '',
    620                 'join'     => '',
    621                 'orderby'  => '',
    622                 'distinct' => '',
    623                 'fields'   => '',
    624                 'limit'    => '',
    625             )
    626         );
    627 
    628         $result = has_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
    629 
    630         $this->assertFalse( $result );
     612    public function test_wp_query_removes_filter_wp_allow_query_attachment_by_filename() {
     613        $attachment = self::factory()->post->create(
     614            array(
     615                'post_type'    => 'attachment',
     616                'post_status'  => 'publish',
     617                'post_title'   => 'bar foo',
     618                'post_content' => 'foo bar',
     619                'post_excerpt' => 'This post has foo',
     620            )
     621        );
     622
     623        add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
     624        add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
     625
     626        $q = new WP_Query(
     627            array(
     628                's'           => 'image1',
     629                'fields'      => 'ids',
     630                'post_type'   => 'attachment',
     631                'post_status' => 'inherit',
     632            )
     633        );
     634
     635        $this->assertSame( array( $attachment ), $q->posts );
     636
     637        /*
     638         * WP_Query should have removed the wp_allow_query_attachment_by_filename filter
     639         * and thus not match the attachment created above
     640         */
     641        $q->get_posts();
     642        $this->assertEmpty( $q->posts );
    631643    }
    632644
  • branches/5.7/tests/phpunit/tests/rest-api/rest-comments-controller.php

    r49603 r54553  
    29732973                    'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
    29742974                    'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
     2975                    'author'            => self::$editor_id,
    29752976                ),
    29762977                array(
     
    29812982                    'author_name'       => 'div strong',
    29822983                    'author_user_agent' => 'div strong',
     2984                    'author'            => self::$editor_id,
    29832985                )
    29842986            );
     
    29902992                    'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
    29912993                    'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
     2994                    'author'            => self::$editor_id,
    29922995                ),
    29932996                array(
     
    29983001                    'author_name'       => 'div strong',
    29993002                    'author_user_agent' => 'div strong',
     3003                    'author'            => self::$editor_id,
    30003004                )
    30013005            );
     
    30123016                'author_name'       => '\\\&\\\ &amp; &invalid; < &lt; &amp;lt;',
    30133017                'author_user_agent' => '\\\&\\\ &amp; &invalid; < &lt; &amp;lt;',
     3018                'author'            => self::$superadmin_id,
    30143019            ),
    30153020            array(
     
    30203025                'author_name'       => '\\\&amp;\\\ &amp; &amp;invalid; &lt; &lt; &amp;lt;',
    30213026                'author_user_agent' => '\\\&\\\ &amp; &invalid; &lt; &lt; &amp;lt;',
     3027                'author'            => self::$superadmin_id,
    30223028            )
    30233029        );
     
    30333039                'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
    30343040                'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
     3041                'author'            => self::$superadmin_id,
    30353042            ),
    30363043            array(
     
    30413048                'author_name'       => 'div strong',
    30423049                'author_user_agent' => 'div strong',
     3050                'author'            => self::$superadmin_id,
    30433051            )
    30443052        );
Note: See TracChangeset for help on using the changeset viewer.