Grouped backports to the 4.3 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,
- Customize: Escape blogname option in underscores templates,
- 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], [54526], [54527], [54529], [54530], [54541] to the 4.3 branch.
Props voldemortensen, johnbillion, paulkevan, peterwilsoncc, xknown, dd32, audrasjb, martinkrcho, davidbaumwald, tykoted, johnjamesjacoby, ehtis, matveb, talldanwp.

Built from https://develop.svn.wordpress.org/branches/4.3@54557


git-svn-id: http://core.svn.wordpress.org/branches/4.3@54112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-10-17 18:00:20 +00:00
parent 9315dd4d4b
commit 3296fa0099
8 changed files with 55 additions and 8 deletions

View File

@ -2518,6 +2518,15 @@ function wp_update_comment($commentarr) {
return 0; return 0;
} }
$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. // Escape data pulled from DB.
$comment = wp_slash($comment); $comment = wp_slash($comment);
@ -2528,6 +2537,10 @@ function wp_update_comment($commentarr) {
$commentarr = wp_filter_comment( $commentarr ); $commentarr = wp_filter_comment( $commentarr );
if ( $filter_comment ) {
remove_filter( 'pre_comment_content', 'wp_filter_kses' );
}
// Now extract the merged array. // Now extract the merged array.
$data = wp_unslash( $commentarr ); $data = wp_unslash( $commentarr );

View File

@ -152,8 +152,8 @@ class WP_Date_Query {
*/ */
public function __construct( $date_query, $default_column = 'post_date' ) { public function __construct( $date_query, $default_column = 'post_date' ) {
if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) { if ( isset( $date_query['relation'] ) ) {
$this->relation = 'OR'; $this->relation = $this->sanitize_relation( $date_query['relation'] );
} else { } else {
$this->relation = 'AND'; $this->relation = 'AND';
} }
@ -233,6 +233,9 @@ class WP_Date_Query {
$this->validate_date_values( $queries ); $this->validate_date_values( $queries );
} }
// Sanitize the relation parameter.
$queries['relation'] = $this->sanitize_relation( $queries['relation'] );
foreach ( $queries as $key => $q ) { foreach ( $queries as $key => $q ) {
if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) { if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) {
// This is a first-order query. Trust the values and sanitize when building SQL. // This is a first-order query. Trust the values and sanitize when building SQL.
@ -1010,4 +1013,20 @@ class WP_Date_Query {
return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time ); 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';
}
}
} }

View File

@ -1193,7 +1193,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( is_wp_error($rss) ) { if ( is_wp_error($rss) ) {
if ( is_admin() || current_user_can('manage_options') ) 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; return;
} }
@ -1303,7 +1303,7 @@ function wp_widget_rss_form( $args, $inputs = null ) {
$args['show_date'] = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date']; $args['show_date'] = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
if ( ! empty( $args['error'] ) ) { 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>';
} }
if ( $inputs['url'] ) : if ( $inputs['url'] ) :

View File

@ -2448,8 +2448,16 @@ function wp_nonce_ays( $action ) {
$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) ); $html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
} else { } else {
$html = __( 'Are you sure you want to do this?' ); $html = __( 'Are you sure you want to do this?' );
if ( wp_get_referer() ) if ( wp_get_referer() ) {
$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>"; $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.' )
);
}
} }
wp_die( $html, __( 'WordPress Failure Notice' ), 403 ); wp_die( $html, __( 'WordPress Failure Notice' ), 403 );

View File

@ -1252,7 +1252,7 @@ function wp_print_media_templates() {
<div class="favicon"> <div class="favicon">
<img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/> <img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
</div> </div>
<span class="browser-title"><?php bloginfo( 'name' ); ?></span> <span class="browser-title"><?php echo esc_js( get_bloginfo( 'name' ) ); ?></span>
</div> </div>
<strong><?php _e( 'As an app icon' ); ?></strong> <strong><?php _e( 'As an app icon' ); ?></strong>

View File

@ -360,6 +360,8 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
$phpmailer->ClearAttachments(); $phpmailer->ClearAttachments();
$phpmailer->ClearCustomHeaders(); $phpmailer->ClearCustomHeaders();
$phpmailer->ClearReplyTos(); $phpmailer->ClearReplyTos();
$phpmailer->Body = '';
$phpmailer->AltBody = '';
// From email and name // From email and name
// If we don't have a name from the input headers // If we don't have a name from the input headers

View File

@ -60,6 +60,9 @@ if( 0 === $count ) {
wp_die( __('There doesn&#8217;t seem to be any new mail.') ); wp_die( __('There doesn&#8217;t seem to be any new mail.') );
} }
// Always run as an unauthenticated user.
wp_set_current_user( 0 );
for ( $i = 1; $i <= $count; $i++ ) { for ( $i = 1; $i <= $count; $i++ ) {
$message = $pop3->get($i); $message = $pop3->get($i);
@ -125,7 +128,6 @@ for ( $i = 1; $i <= $count; $i++ ) {
$author = trim($line); $author = trim($line);
$author = sanitize_email($author); $author = sanitize_email($author);
if ( is_email($author) ) { if ( is_email($author) ) {
echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
$userdata = get_user_by('email', $author); $userdata = get_user_by('email', $author);
if ( ! empty( $userdata ) ) { if ( ! empty( $userdata ) ) {
$post_author = $userdata->ID; $post_author = $userdata->ID;

View File

@ -13,6 +13,9 @@ if (empty($wp)) {
wp( array( 'tb' => '1' ) ); wp( array( 'tb' => '1' ) );
} }
// Always run as an unauthenticated user.
wp_set_current_user( 0 );
/** /**
* Response to a trackback. * Response to a trackback.
* *