From 01a575e1b03dcbff41c4b7db9834b856f236d24f Mon Sep 17 00:00:00 2001 From: whyisjake Date: Thu, 29 Oct 2020 18:53:27 +0000 Subject: [PATCH] General: WordPress updates * XML-RPC: Improve error messages for unprivileged users. * External Libraries: Disable deserialization in Requests_Utility_FilteredIterator * Embeds: Disable embeds on deactivated Multisite sites. * Coding standards: Modify escaping functions to avoid potential false positives. * XML-RPC: Return error message if attachment ID is incorrect. * Upgrade/install: Improve logic check when determining installation status. * Meta: Sanitize meta key before checking protection status. * Themes: Ensure that only privileged users can set a background image when a theme is using the deprecated custom background page. Brings the changes from [49380,49382-49388] to the 4.9 branch. Props xknown, zieladam, peterwilsoncc, whyisjake, desrosj, dd32. Built from https://develop.svn.wordpress.org/branches/4.9@49397 git-svn-id: http://core.svn.wordpress.org/branches/4.9@49156 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-header.php | 14 +++++++------- wp-admin/custom-background.php | 1 + wp-admin/custom-header.php | 2 +- wp-admin/includes/media.php | 2 +- wp-admin/includes/ms.php | 2 +- wp-admin/includes/template.php | 12 ++++++------ wp-admin/js/custom-background.js | 2 ++ wp-admin/js/custom-background.min.js | 2 +- wp-admin/js/media-gallery.js | 4 +++- wp-admin/js/media-gallery.min.js | 2 +- wp-admin/media-new.php | 4 ++-- wp-admin/network/site-users.php | 2 +- .../Requests/Utility/FilteredIterator.php | 1 + wp-includes/class-wp-xmlrpc-server.php | 19 ++++++++++++++++++- wp-includes/embed.php | 7 ++++++- wp-includes/formatting.php | 13 +++++++------ wp-includes/meta.php | 5 +++-- 17 files changed, 62 insertions(+), 32 deletions(-) diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index d5ceeccd61..b91dad9610 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -75,13 +75,13 @@ wp_enqueue_script( 'svg-painter' ); $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix); ?> diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index 7326f7e83c..9b1ab048a4 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -541,6 +541,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) * @deprecated 3.5.0 */ public function wp_set_background_image() { + check_ajax_referer( 'custom-background' ); if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit; $attachment_id = absint($_POST['attachment_id']); /** This filter is documented in wp-admin/includes/media.php */ diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index d345766afa..006012eeff 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -322,7 +322,7 @@ class Custom_Image_Header { ?> addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}; function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();} -var ajaxurl = '', - pagenow = 'id; ?>', - typenow = 'post_type; ?>', - adminpage = '', - thousandsSeparator = 'number_format['thousands_sep'] ); ?>', - decimalPoint = 'number_format['decimal_point'] ); ?>', +var ajaxurl = '', + pagenow = 'id ); ?>', + typenow = 'post_type ); ?>', + adminpage = '', + thousandsSeparator = 'number_format['thousands_sep'] ); ?>', + decimalPoint = 'number_format['decimal_point'] ); ?>', isRtl = ; - +
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index 42f71b5acf..93a20dc2df 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -211,7 +211,7 @@ if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users require( ABSPATH . 'wp-admin/admin-header.php' ); ?> diff --git a/wp-includes/Requests/Utility/FilteredIterator.php b/wp-includes/Requests/Utility/FilteredIterator.php index 76a29e7228..b90cbcd76a 100644 --- a/wp-includes/Requests/Utility/FilteredIterator.php +++ b/wp-includes/Requests/Utility/FilteredIterator.php @@ -42,4 +42,5 @@ class Requests_Utility_FilteredIterator extends ArrayIterator { $value = call_user_func($this->callback, $value); return $value; } + } diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php index 826f2efdfe..ef9298d8b1 100644 --- a/wp-includes/class-wp-xmlrpc-server.php +++ b/wp-includes/class-wp-xmlrpc-server.php @@ -3638,6 +3638,21 @@ class wp_xmlrpc_server extends IXR_Server { return new IXR_Error( 403, __( 'Comment is required.' ) ); } + if ( + 'publish' === get_post_status( $post_id ) && + ! current_user_can( 'edit_post', $post_id ) && + post_password_required( $post_id ) + ) { + return new IXR_Error( 403, __( 'Sorry, you are not allowed to comment on this post.' ) ); + } + + if ( + 'private' === get_post_status( $post_id ) && + ! current_user_can( 'read_post', $post_id ) + ) { + return new IXR_Error( 403, __( 'Sorry, you are not allowed to comment on this post.' ) ); + } + $comment = array( 'comment_post_ID' => $post_id, 'comment_content' => $content_struct['content'], @@ -4023,8 +4038,10 @@ class wp_xmlrpc_server extends IXR_Server { /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */ do_action( 'xmlrpc_call', 'wp.getMediaItem' ); - if ( ! $attachment = get_post($attachment_id) ) + $attachment = get_post( $attachment_id ); + if ( ! $attachment || 'attachment' !== $attachment->post_type ) { return new IXR_Error( 404, __( 'Invalid attachment ID.' ) ); + } return $this->_prepare_media_item( $attachment ); } diff --git a/wp-includes/embed.php b/wp-includes/embed.php index 9f52259182..8ea5dfb23a 100644 --- a/wp-includes/embed.php +++ b/wp-includes/embed.php @@ -1094,7 +1094,12 @@ function wp_filter_pre_oembed_result( $result, $url, $args ) { $sites = get_sites( $qv ); $site = reset( $sites ); - if ( $site && (int) $site->blog_id !== get_current_blog_id() ) { + // Do not allow embeds for deleted/archived/spam sites. + if ( ! empty( $site->deleted ) || ! empty( $site->spam ) || ! empty( $site->archived ) ) { + return false; + } + + if ( $site && get_current_blog_id() !== (int) $site->blog_id ) { switch_to_blog( $site->blog_id ); $switched_blog = true; } diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index bb9f3bb9a8..2237e1f509 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -1090,9 +1090,9 @@ function wp_check_invalid_utf8( $string, $strip = false ) { * @return string String with Unicode encoded for URI. */ function utf8_uri_encode( $utf8_string, $length = 0 ) { - $unicode = ''; - $values = array(); - $num_octets = 1; + $unicode = ''; + $values = array(); + $num_octets = 1; $unicode_length = 0; mbstring_binary_safe_encoding(); @@ -1104,9 +1104,10 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) { $value = ord( $utf8_string[ $i ] ); if ( $value < 128 ) { - if ( $length && ( $unicode_length >= $length ) ) + if ( $length && ( $unicode_length >= $length ) ) { break; - $unicode .= chr($value); + } + $unicode .= chr( $value ); $unicode_length++; } else { if ( count( $values ) == 0 ) { @@ -2007,7 +2008,7 @@ function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'displa if (function_exists('mb_strtolower')) { $title = mb_strtolower($title, 'UTF-8'); } - $title = utf8_uri_encode($title, 200); + $title = utf8_uri_encode( $title, 200 ); } $title = strtolower($title); diff --git a/wp-includes/meta.php b/wp-includes/meta.php index 73dadb498f..cd88d99f1d 100644 --- a/wp-includes/meta.php +++ b/wp-includes/meta.php @@ -923,8 +923,9 @@ function _get_meta_table($type) { * term, or user). * @return bool True if the key is protected, false otherwise. */ -function is_protected_meta( $meta_key, $meta_type = null ) { - $protected = ( '_' == $meta_key[0] ); +function is_protected_meta( $meta_key, $meta_type = '' ) { + $sanitized_key = preg_replace( "/[^\x20-\x7E\p{L}]/", '', $meta_key ); + $protected = strlen( $sanitized_key ) > 0 && ( '_' === $sanitized_key[0] ); /** * Filters whether a meta key is protected.