From bb6a2aa182212d466a98b07fdaabc32d69741c8a Mon Sep 17 00:00:00 2001 From: whyisjake Date: Wed, 29 Apr 2020 16:06:08 +0000 Subject: [PATCH] Customize: Add additional filters to Customizer to prevent JSON corruption. User: Invalidate `user_activation_key` on password update. Query: Ensure that only a single post can be returned on date/time based queries. Block Editor: Coding standards, properly escape class names. Cache API: Ensure proper escaping around the stats method in the cache API. Formatting: Expand `sanitize_file_name` to have better support for utf8 characters. Brings the changes in [47633], [47634], [47635], [47636], [47637], and [47638] to the 5.4 branch. Props: aduth, batmoo, ehti, ellatrix, jorgefilipecosta, nickdaugherty, noisysocks, pento, peterwilsoncc, sergeybiryukov, sstoqnov, talldanwp, westi, westonruter, whyisjake, whyisjake, xknown. Built from https://develop.svn.wordpress.org/branches/5.3@47644 git-svn-id: http://core.svn.wordpress.org/branches/5.3@47419 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks/rss.php | 2 +- wp-includes/blocks/search.php | 2 +- wp-includes/cache.php | 2 +- wp-includes/class-wp-customize-manager.php | 73 +++++++++++++++------- wp-includes/class-wp-query.php | 4 -- wp-includes/formatting.php | 19 +++++- wp-includes/post.php | 21 +++++-- wp-includes/user.php | 2 +- wp-includes/version.php | 2 +- 9 files changed, 88 insertions(+), 39 deletions(-) diff --git a/wp-includes/blocks/rss.php b/wp-includes/blocks/rss.php index 0300585de2..f1b7f3f19d 100644 --- a/wp-includes/blocks/rss.php +++ b/wp-includes/blocks/rss.php @@ -96,7 +96,7 @@ function render_block_core_rss( $attributes ) { $class .= ' ' . $attributes['className']; } - $list_items_markup = ""; + $list_items_markup = sprintf( "", esc_attr( $class ), $list_items ); // PHP 5.2 compatibility. See: http://simplepie.org/wiki/faq/i_m_getting_memory_leaks. $rss->__destruct(); diff --git a/wp-includes/blocks/search.php b/wp-includes/blocks/search.php index 6cd909fc6f..c50b69a441 100644 --- a/wp-includes/blocks/search.php +++ b/wp-includes/blocks/search.php @@ -52,7 +52,7 @@ function render_block_core_search( $attributes ) { return sprintf( '', - $class, + esc_attr( $class ), esc_url( home_url( '/' ) ), $label_markup . $input_markup . $button_markup ); diff --git a/wp-includes/cache.php b/wp-includes/cache.php index 1af29d5f65..37a2108409 100644 --- a/wp-includes/cache.php +++ b/wp-includes/cache.php @@ -695,7 +695,7 @@ class WP_Object_Cache { echo '

'; echo ''; } diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 36b9c7bea1..105ca0896e 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -2923,22 +2923,11 @@ final class WP_Customize_Manager { add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 5, 3 ); /* - * Update the changeset post. The publish_customize_changeset action - * will cause the settings in the changeset to be saved via - * WP_Customize_Setting::save(). + * Update the changeset post. The publish_customize_changeset action will cause the settings in the + * changeset to be saved via WP_Customize_Setting::save(). Updating a post with publish status will + * trigger WP_Customize_Manager::publish_changeset_values(). */ - - // Prevent content filters from corrupting JSON in post_content. - $has_kses = ( false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' ) ); - if ( $has_kses ) { - kses_remove_filters(); - } - $has_targeted_link_rel_filters = ( false !== has_filter( 'content_save_pre', 'wp_targeted_link_rel' ) ); - if ( $has_targeted_link_rel_filters ) { - wp_remove_targeted_link_rel_filters(); - } - - // Note that updating a post with publish status will trigger WP_Customize_Manager::publish_changeset_values(). + add_filter( 'wp_insert_post_data', array( $this, 'preserve_insert_changeset_post_content' ), 5, 3 ); if ( $changeset_post_id ) { if ( $args['autosave'] && 'auto-draft' !== get_post_status( $changeset_post_id ) ) { // See _wp_translate_postdata() for why this is required as it will use the edit_post meta capability. @@ -2965,14 +2954,7 @@ final class WP_Customize_Manager { $this->_changeset_post_id = $r; // Update cached post ID for the loaded changeset. } } - - // Restore removed content filters. - if ( $has_kses ) { - kses_init_filters(); - } - if ( $has_targeted_link_rel_filters ) { - wp_init_targeted_link_rel_filters(); - } + remove_filter( 'wp_insert_post_data', array( $this, 'preserve_insert_changeset_post_content' ), 5 ); $this->_changeset_data = null; // Reset so WP_Customize_Manager::changeset_data() will re-populate with updated contents. @@ -2990,6 +2972,51 @@ final class WP_Customize_Manager { return $response; } + /** + * Preserve the initial JSON post_content passed to save into the post. + * + * This is needed to prevent KSES and other {@see 'content_save_pre'} filters + * from corrupting JSON data. + * + * Note that WP_Customize_Manager::validate_setting_values() have already + * run on the setting values being serialized as JSON into the post content + * so it is pre-sanitized. + * + * Also, the sanitization logic is re-run through the respective + * WP_Customize_Setting::sanitize() method when being read out of the + * changeset, via WP_Customize_Manager::post_value(), and this sanitized + * value will also be sent into WP_Customize_Setting::update() for + * persisting to the DB. + * + * Multiple users can collaborate on a single changeset, where one user may + * have the unfiltered_html capability but another may not. A user with + * unfiltered_html may add a script tag to some field which needs to be kept + * intact even when another user updates the changeset to modify another field + * when they do not have unfiltered_html. + * + * @since 5.4.1 + * + * @param array $data An array of slashed and processed post data. + * @param array $postarr An array of sanitized (and slashed) but otherwise unmodified post data. + * @param array $unsanitized_postarr An array of slashed yet *unsanitized* and unprocessed post data as originally passed to wp_insert_post(). + * @return array Filtered post data. + */ + public function preserve_insert_changeset_post_content( $data, $postarr, $unsanitized_postarr ) { + if ( + isset( $data['post_type'] ) && + isset( $unsanitized_postarr['post_content'] ) && + 'customize_changeset' === $data['post_type'] || + ( + 'revision' === $data['post_type'] && + ! empty( $data['post_parent'] ) && + 'customize_changeset' === get_post_type( $data['post_parent'] ) + ) + ) { + $data['post_content'] = $unsanitized_postarr['post_content']; + } + return $data; + } + /** * Trash or delete a changeset post. * diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php index 43317ab838..b75d9e176f 100644 --- a/wp-includes/class-wp-query.php +++ b/wp-includes/class-wp-query.php @@ -800,10 +800,6 @@ class WP_Query { $this->is_single = true; } elseif ( $qv['p'] ) { $this->is_single = true; - } elseif ( ( '' !== $qv['hour'] ) && ( '' !== $qv['minute'] ) && ( '' !== $qv['second'] ) && ( '' != $qv['year'] ) && ( '' != $qv['monthnum'] ) && ( '' != $qv['day'] ) ) { - // If year, month, day, hour, minute, and second are set, a single - // post is being queried. - $this->is_single = true; } elseif ( '' != $qv['pagename'] || ! empty( $qv['page_id'] ) ) { $this->is_page = true; $this->is_single = false; diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index a72c4be4b8..7aeaab53ce 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -2003,6 +2003,24 @@ function remove_accents( $string ) { function sanitize_file_name( $filename ) { $filename_raw = $filename; $special_chars = array( '?', '[', ']', '/', '\\', '=', '<', '>', ':', ';', ',', "'", '"', '&', '$', '#', '*', '(', ')', '|', '~', '`', '!', '{', '}', '%', '+', chr( 0 ) ); + + // Check for support for utf8 in the installed PCRE library once and store the result in a static. + static $utf8_pcre = null; + if ( ! isset( $utf8_pcre ) ) { + // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged + $utf8_pcre = @preg_match( '/^./u', 'a' ); + } + + if ( ! seems_utf8( $filename ) ) { + $_ext = pathinfo( $filename, PATHINFO_EXTENSION ); + $_name = pathinfo( $filename, PATHINFO_FILENAME ); + $filename = sanitize_title_with_dashes( $_name ) . '.' . $_ext; + } + + if ( $utf8_pcre ) { + $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename ); + } + /** * Filters the list of characters to remove from a filename. * @@ -2012,7 +2030,6 @@ function sanitize_file_name( $filename ) { * @param string $filename_raw Filename as it was passed into sanitize_file_name(). */ $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw ); - $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename ); $filename = str_replace( $special_chars, '', $filename ); $filename = str_replace( array( '%20', '+' ), '-', $filename ); $filename = preg_replace( '/[\r\n\t -]+/', '-', $filename ); diff --git a/wp-includes/post.php b/wp-includes/post.php index 9ecd442617..dd9833a4dd 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -3554,6 +3554,9 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) { function wp_insert_post( $postarr, $wp_error = false ) { global $wpdb; + // Capture original pre-sanitized array for passing into filters. + $unsanitized_postarr = $postarr; + $user_id = get_current_user_id(); $defaults = array( @@ -3865,21 +3868,27 @@ function wp_insert_post( $postarr, $wp_error = false ) { * Filters attachment post data before it is updated in or added to the database. * * @since 3.9.0 + * @since 5.4.1 `$unsanitized_postarr` argument added. * - * @param array $data An array of sanitized attachment post data. - * @param array $postarr An array of unsanitized attachment post data. + * @param array $data An array of slashed, sanitized, and processed attachment post data. + * @param array $postarr An array of slashed and sanitized attachment post data, but not processed. + * @param array $unsanitized_postarr An array of slashed yet *unsanitized* and unprocessed attachment post data + * as originally passed to wp_insert_post(). */ - $data = apply_filters( 'wp_insert_attachment_data', $data, $postarr ); + $data = apply_filters( 'wp_insert_attachment_data', $data, $postarr, $unsanitized_postarr ); } else { /** * Filters slashed post data just before it is inserted into the database. * * @since 2.7.0 + * @since 5.4.1 `$unsanitized_postarr` argument added. * - * @param array $data An array of slashed post data. - * @param array $postarr An array of sanitized, but otherwise unmodified post data. + * @param array $data An array of slashed, sanitized, and processed post data. + * @param array $postarr An array of sanitized (and slashed) but otherwise unmodified post data. + * @param array $unsanitized_postarr An array of slashed yet *unsanitized* and unprocessed post data as + * originally passed to wp_insert_post(). */ - $data = apply_filters( 'wp_insert_post_data', $data, $postarr ); + $data = apply_filters( 'wp_insert_post_data', $data, $postarr, $unsanitized_postarr ); } $data = wp_unslash( $data ); $where = array( 'ID' => $post_ID ); diff --git a/wp-includes/user.php b/wp-includes/user.php index e2a245445a..fa9634c894 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -1793,7 +1793,7 @@ function wp_insert_user( $userdata ) { } if ( $update ) { - if ( $user_email !== $old_user_data->user_email ) { + if ( $user_email !== $old_user_data->user_email || $user_pass !== $old_user_data->user_pass ) { $data['user_activation_key'] = ''; } $wpdb->update( $wpdb->users, $data, compact( 'ID' ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 84044cdbb9..cf05cdba2a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3.3-alpha-47630'; +$wp_version = '5.3.3-alpha-47644'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.