Changeset 54554

Timestamp:

10/17/2022 05:55:03 PM (2 years 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:

• . (modified) (1 prop)
• src/wp-includes/comment.php (modified) (2 diffs)
• src/wp-includes/date.php (modified) (3 diffs)
• src/wp-includes/default-widgets.php (modified) (2 diffs)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/pluggable.php (modified) (1 diff)
• src/wp-mail.php (modified) (2 diffs)
• src/wp-trackback.php (modified) (1 diff)

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

@@ -2427 +2427 @@
     }
 
+    $filter_comment = false;
+    if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
+        $filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
+    }
+
+    if ( $filter_comment ) {
+        add_filter( 'pre_comment_content', 'wp_filter_kses' );
+    }
+
     // Escape data pulled from DB.
     $comment = wp_slash($comment);
@@ -2436 +2445 @@
 
     $commentarr = wp_filter_comment( $commentarr );
+
+    if ( $filter_comment ) {
+        remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+    }
 
     // Now extract the merged array.

branches/4.2/src/wp-includes/date.php

@@ -153 +153 @@
     public function __construct( $date_query, $default_column = 'post_date' ) {
 
-        if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
-            $this->relation = 'OR';
+        if ( isset( $date_query['relation'] ) ) {
+            $this->relation = $this->sanitize_relation( $date_query['relation'] );
         } else {
             $this->relation = 'AND';
@@ -233 +233 @@
             $this->validate_date_values( $queries );
         }
+
+        // Sanitize the relation parameter.
+        $queries['relation'] = $this->sanitize_relation( $queries['relation'] );
 
         foreach ( $queries as $key => $q ) {
@@ -1011 +1014 @@
         return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
     }
+
+    /**
+     * Sanitizes a 'relation' operator.
+     *
+     * @since 6.0.3
+     *
+     * @param string $relation Raw relation key from the query argument.
+     * @return string Sanitized relation ('AND' or 'OR').
+     */
+    public function sanitize_relation( $relation ) {
+        if ( 'OR' === strtoupper( $relation ) ) {
+            return 'OR';
+        } else {
+            return 'AND';
+        }
+    }
 }

branches/4.2/src/wp-includes/default-widgets.php

@@ -1055 +1055 @@
     if ( is_wp_error($rss) ) {
         if ( is_admin() || current_user_can('manage_options') )
-            echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>';
+            echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), esc_html( $rss->get_error_message() ) ) . '</p>';
         return;
     }
@@ -1165 +1165 @@
 
     if ( ! empty( $args['error'] ) ) {
-        echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), $args['error'] ) . '</strong></p>';
+        echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), esc_html( $args['error'] ) ) . '</strong></p>';
     }
 

branches/4.2/src/wp-includes/functions.php

@@ -2441 +2441 @@
     } else {
         $html = __( 'Are you sure you want to do this?' );
-        if ( wp_get_referer() )
-            $html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+        if ( wp_get_referer() ) {
+            $wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
+            $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
+            $html           .= '</p><p>';
+            $html           .= sprintf(
+                '<a href="%s">%s</a>',
+                esc_url( $wp_http_referer ),
+                __( 'Please try again.' )
+            );
+        }
     }
 

branches/4.2/src/wp-includes/pluggable.php

@@ -357 +357 @@
     $phpmailer->ClearCustomHeaders();
     $phpmailer->ClearReplyTos();
+    $phpmailer->Body    = '';
+    $phpmailer->AltBody = '';
 
     // From email and name

branches/4.2/src/wp-mail.php

@@ -60 +60 @@
     wp_die( __('There doesn’t seem to be any new mail.') );
 }
+
+// Always run as an unauthenticated user.
+wp_set_current_user( 0 );
 
 for ( $i = 1; $i <= $count; $i++ ) {
@@ -126 +129 @@
                 $author = sanitize_email($author);
                 if ( is_email($author) ) {
-                    echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
                     $userdata = get_user_by('email', $author);
                     if ( ! empty( $userdata ) ) {

branches/4.2/src/wp-trackback.php

@@ -13 +13 @@
     wp( array( 'tb' => '1' ) );
 }
+
+// Always run as an unauthenticated user.
+wp_set_current_user( 0 );
 
 /**