Make WordPress Core

Changeset 54552


Ignore:
Timestamp:
10/17/2022 05:53:02 PM (19 months ago)
Author:
SergeyBiryukov
Message:

Grouped backports to the 4.1 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.1 branch.
Props voldemortensen, johnbillion, paulkevan, peterwilsoncc, xknown, dd32, audrasjb, martinkrcho, davidbaumwald, tykoted, johnjamesjacoby, ehtis, matveb, talldanwp.

Location:
branches/4.1
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1

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

    r30681 r54552  
    22012201        return 0;
    22022202    }
     2203
     2204    $filter_comment = false;
     2205    if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
     2206        $filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
     2207    }
     2208
     2209    if ( $filter_comment ) {
     2210        add_filter( 'pre_comment_content', 'wp_filter_kses' );
     2211    }
     2212
    22032213    // Escape data pulled from DB.
    22042214    $comment = wp_slash($comment);
     
    22102220
    22112221    $commentarr = wp_filter_comment( $commentarr );
     2222
     2223    if ( $filter_comment ) {
     2224        remove_filter( 'pre_comment_content', 'wp_filter_kses' );
     2225    }
    22122226
    22132227    // Now extract the merged array.
  • branches/4.1/src/wp-includes/date.php

    r31396 r54552  
    142142    public function __construct( $date_query, $default_column = 'post_date' ) {
    143143
    144         if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
    145             $this->relation = 'OR';
     144        if ( isset( $date_query['relation'] ) ) {
     145            $this->relation = $this->sanitize_relation( $date_query['relation'] );
    146146        } else {
    147147            $this->relation = 'AND';
     
    224224            $this->validate_date_values( $queries );
    225225        }
     226
     227        // Sanitize the relation parameter.
     228        $queries['relation'] = $this->sanitize_relation( $queries['relation'] );
    226229
    227230        foreach ( $queries as $key => $q ) {
     
    10031006        return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
    10041007    }
     1008
     1009    /**
     1010     * Sanitizes a 'relation' operator.
     1011     *
     1012     * @since 6.0.3
     1013     *
     1014     * @param string $relation Raw relation key from the query argument.
     1015     * @return string Sanitized relation ('AND' or 'OR').
     1016     */
     1017    public function sanitize_relation( $relation ) {
     1018        if ( 'OR' === strtoupper( $relation ) ) {
     1019            return 'OR';
     1020        } else {
     1021            return 'AND';
     1022        }
     1023    }
    10051024}
  • branches/4.1/src/wp-includes/default-widgets.php

    r33530 r54552  
    10191019    if ( is_wp_error($rss) ) {
    10201020        if ( is_admin() || current_user_can('manage_options') )
    1021             echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>';
     1021            echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), esc_html( $rss->get_error_message() ) ) . '</p>';
    10221022        return;
    10231023    }
     
    11291129
    11301130    if ( ! empty( $args['error'] ) ) {
    1131         echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), $args['error'] ) . '</strong></p>';
     1131        echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), esc_html( $args['error'] ) ) . '</strong></p>';
    11321132    }
    11331133
  • branches/4.1/src/wp-includes/functions.php

    r46501 r54552  
    24352435    } else {
    24362436        $html = __( 'Are you sure you want to do this?' );
    2437         if ( wp_get_referer() )
    2438             $html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
     2437        if ( wp_get_referer() ) {
     2438            $wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
     2439            $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
     2440            $html           .= '</p><p>';
     2441            $html           .= sprintf(
     2442                '<a href="%s">%s</a>',
     2443                esc_url( $wp_http_referer ),
     2444                __( 'Please try again.' )
     2445            );
     2446        }
    24392447    }
    24402448
  • branches/4.1/src/wp-includes/pluggable.php

    r47969 r54552  
    350350    $phpmailer->ClearCustomHeaders();
    351351    $phpmailer->ClearReplyTos();
     352    $phpmailer->Body    = '';
     353    $phpmailer->AltBody = '';
    352354
    353355    // From email and name
  • branches/4.1/src/wp-mail.php

    r39779 r54552  
    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.1/src/wp-trackback.php

    r30662 r54552  
    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.