Make WordPress Core

Changeset 54554 for branches/4.2


Ignore:
Timestamp:
10/17/2022 05:55:03 PM (20 months ago)
Author:
SergeyBiryukov
Message:

Grouped backports to the 4.2 branch.

  • 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,
  • Comments: Apply kses when editing comments,
  • Mail: Reset PHPMailer properties between use,
  • Query: Validate relation in WP_Date_Query,
  • Widgets: Escape RSS error messages for display.

Merges [54521], [54522], [54523], [54525], [54527], [54529], [54530], [54541] to the 4.2 branch.
Props voldemortensen, johnbillion, paulkevan, peterwilsoncc, xknown, dd32, audrasjb, martinkrcho, davidbaumwald, tykoted, johnjamesjacoby, ehtis, matveb, talldanwp.

Location:
branches/4.2
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2

  • branches/4.2/src/wp-includes/comment.php

    r32367 r54554  
    24272427    }
    24282428
     2429    $filter_comment = false;
     2430    if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
     2431        $filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
     2432    }
     2433
     2434    if ( $filter_comment ) {
     2435        add_filter( 'pre_comment_content', 'wp_filter_kses' );
     2436    }
     2437
    24292438    // Escape data pulled from DB.
    24302439    $comment = wp_slash($comment);
     
    24362445
    24372446    $commentarr = wp_filter_comment( $commentarr );
     2447
     2448    if ( $filter_comment ) {
     2449        remove_filter( 'pre_comment_content', 'wp_filter_kses' );
     2450    }
    24382451
    24392452    // Now extract the merged array.
  • branches/4.2/src/wp-includes/date.php

    r32116 r54554  
    153153    public function __construct( $date_query, $default_column = 'post_date' ) {
    154154
    155         if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
    156             $this->relation = 'OR';
     155        if ( isset( $date_query['relation'] ) ) {
     156            $this->relation = $this->sanitize_relation( $date_query['relation'] );
    157157        } else {
    158158            $this->relation = 'AND';
     
    233233            $this->validate_date_values( $queries );
    234234        }
     235
     236        // Sanitize the relation parameter.
     237        $queries['relation'] = $this->sanitize_relation( $queries['relation'] );
    235238
    236239        foreach ( $queries as $key => $q ) {
     
    10111014        return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
    10121015    }
     1016
     1017    /**
     1018     * Sanitizes a 'relation' operator.
     1019     *
     1020     * @since 6.0.3
     1021     *
     1022     * @param string $relation Raw relation key from the query argument.
     1023     * @return string Sanitized relation ('AND' or 'OR').
     1024     */
     1025    public function sanitize_relation( $relation ) {
     1026        if ( 'OR' === strtoupper( $relation ) ) {
     1027            return 'OR';
     1028        } else {
     1029            return 'AND';
     1030        }
     1031    }
    10131032}
  • branches/4.2/src/wp-includes/default-widgets.php

    r33529 r54554  
    10551055    if ( is_wp_error($rss) ) {
    10561056        if ( is_admin() || current_user_can('manage_options') )
    1057             echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>';
     1057            echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), esc_html( $rss->get_error_message() ) ) . '</p>';
    10581058        return;
    10591059    }
     
    11651165
    11661166    if ( ! empty( $args['error'] ) ) {
    1167         echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), $args['error'] ) . '</strong></p>';
     1167        echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), esc_html( $args['error'] ) ) . '</strong></p>';
    11681168    }
    11691169
  • branches/4.2/src/wp-includes/functions.php

    r46500 r54554  
    24412441    } else {
    24422442        $html = __( 'Are you sure you want to do this?' );
    2443         if ( wp_get_referer() )
    2444             $html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
     2443        if ( wp_get_referer() ) {
     2444            $wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
     2445            $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
     2446            $html           .= '</p><p>';
     2447            $html           .= sprintf(
     2448                '<a href="%s">%s</a>',
     2449                esc_url( $wp_http_referer ),
     2450                __( 'Please try again.' )
     2451            );
     2452        }
    24452453    }
    24462454
  • branches/4.2/src/wp-includes/pluggable.php

    r47970 r54554  
    357357    $phpmailer->ClearCustomHeaders();
    358358    $phpmailer->ClearReplyTos();
     359    $phpmailer->Body    = '';
     360    $phpmailer->AltBody = '';
    359361
    360362    // From email and name
  • branches/4.2/src/wp-mail.php

    r39778 r54554  
    6060    wp_die( __('There doesn&#8217;t seem to be any new mail.') );
    6161}
     62
     63// Always run as an unauthenticated user.
     64wp_set_current_user( 0 );
    6265
    6366for ( $i = 1; $i <= $count; $i++ ) {
     
    126129                $author = sanitize_email($author);
    127130                if ( is_email($author) ) {
    128                     echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
    129131                    $userdata = get_user_by('email', $author);
    130132                    if ( ! empty( $userdata ) ) {
  • branches/4.2/src/wp-trackback.php

    r30662 r54554  
    1313    wp( array( 'tb' => '1' ) );
    1414}
     15
     16// Always run as an unauthenticated user.
     17wp_set_current_user( 0 );
    1518
    1619/**
Note: See TracChangeset for help on using the changeset viewer.