Changeset 55771

Timestamp:

05/16/2023 03:13:50 PM (16 months ago)

Author:

audrasjb

Message:

Grouped backports to the 6.1 branch.

• Media: Prevent CSRF setting attachment thumbnails.
• Embeds: Add protocol validation for WordPress Embed code.
• I18N: Introduce sanitization function for locale.
• Editor: Ensure block comments are of a valid form.
• Editor: Remove shortcode support from block templates.

Merges [55760-55764] to the 6.1 branch.
Props dd32, isabel_brison, martinkrcho, matveb, ocean90, paulkevan, peterwilsoncc, timothyblynjacobs, xknown, youknowriad.

Location:

branches/6.1

Files:

• src/js/_enqueues/wp/embed.js (modified) (2 diffs)
• src/js/media/views/frame/video-details.js (modified) (1 diff)
• src/wp-admin/about.php (modified) (1 diff)
• src/wp-admin/includes/ajax-actions.php (modified) (1 diff)
• src/wp-includes/block-template.php (modified) (1 diff)
• src/wp-includes/blocks.php (modified) (2 diffs)
• src/wp-includes/formatting.php (modified) (1 diff)
• src/wp-includes/l10n.php (modified) (1 diff)
• src/wp-includes/media.php (modified) (1 diff)
• src/wp-includes/version.php (modified) (1 diff)
• tests/phpunit/tests/ajax/Attachments.php (modified) (1 diff)
• tests/phpunit/tests/formatting/sanitizeLocaleName.php (added)

branches/6.1/src/js/_enqueues/wp/embed.js

@@ -50 +50 @@
         var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ),
             blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' ),
+            allowedProtocols = new RegExp( '^https?:$', 'i' ),
             i, source, height, sourceURL, targetURL;
 
@@ -84 +85 @@
                 sourceURL.href = source.getAttribute( 'src' );
                 targetURL.href = data.value;
+
+                /* Only follow link if the protocol is in the allow list. */
+                if ( ! allowedProtocols.test( targetURL.protocol ) ) {
+                    continue;
+                }
 
                 /* Only continue if link hostname matches iframe's hostname. */

branches/6.1/src/js/media/views/frame/video-details.js

@@ -107 +107 @@
             wp.ajax.send( 'set-attachment-thumbnail', {
                 data : {
+                    _ajax_nonce: wp.media.view.settings.nonce.setAttachmentThumbnail,
                     urls: urls,
                     thumbnail_id: attachment.get( 'id' )

branches/6.1/src/wp-admin/about.php

@@ -46 +46 @@
             <div class="column">
                 <h2><?php _e( 'Maintenance and Security Releases' ); ?></h2>
+                <p>
+                    <?php
+                    printf(
+                        __( '<strong>Version %s</strong> addressed some security issues.' ),
+                        '6.1.2'
+                    );
+                    ?>
+                    <?php
+                    printf(
+                        /* translators: %s: HelpHub URL. */
+                        __( 'For more information, see <a href="%s">the release notes</a>.' ),
+                        sprintf(
+                            /* translators: %s: WordPress version. */
+                            esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+                            sanitize_title( '6.1.2' )
+                        )
+                    );
+                    ?>
+                </p>
+
                 <p>
                     <?php

branches/6.1/src/wp-admin/includes/ajax-actions.php

@@ -2772 +2772 @@
     }
 
+    if ( false === check_ajax_referer( 'set-attachment-thumbnail', '_ajax_nonce', false ) ) {
+        wp_send_json_error();
+    }
+
     $post_ids = array();
     // For each URL, try to find its corresponding post ID.

branches/6.1/src/wp-includes/block-template.php

@@ -241 +241 @@
     $content = wptexturize( $content );
     $content = convert_smilies( $content );
-    $content = shortcode_unautop( $content );
     $content = wp_filter_content_tags( $content );
-    $content = do_shortcode( $content );
     $content = str_replace( ']]>', ']]>', $content );
 

branches/6.1/src/wp-includes/blocks.php

@@ -795 +795 @@
     $result = '';
 
+    if ( false !== strpos( $text, '<!--' ) && false !== strpos( $text, '--->' ) ) {
+        $text = preg_replace_callback( '%<!--(.*?)--->%', '_filter_block_content_callback', $text );
+    }
+
     $blocks = parse_blocks( $text );
     foreach ( $blocks as $block ) {
@@ -802 +806 @@
 
     return $result;
+}
+
+/**
+ * Callback used for regular expression replacement in filter_block_content().
+ *
+ * @private
+ * @since 6.2.1
+ *
+ * @param array $matches Array of preg_replace_callback matches.
+ * @return string Replacement string.
+ */
+function _filter_block_content_callback( $matches ) {
+    return '<!--' . rtrim( $matches[1], '-' ) . '-->';
 }
 

branches/6.1/src/wp-includes/formatting.php

@@ -2434 +2434 @@
 
 /**
+ * Strips out all characters not allowed in a locale name.
+ *
+ * @since 6.2.1
+ *
+ * @param string $locale_name The locale name to be sanitized.
+ * @return string The sanitized value.
+ */
+function sanitize_locale_name( $locale_name ) {
+    // Limit to A-Z, a-z, 0-9, '_', '-'.
+    $sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $locale_name );
+
+    /**
+     * Filters a sanitized locale name string.
+     *
+     * @since 6.2.1
+     *
+     * @param string $sanitized   The sanitized locale name.
+     * @param string $locale_name The locale name before sanitization.
+     */
+    return apply_filters( 'sanitize_locale_name', $sanitized, $locale_name );
+}
+
+/**
  * Converts lone & characters into `&` (a.k.a. `&`)
  *

branches/6.1/src/wp-includes/l10n.php

@@ -150 +150 @@
 
     if ( ! empty( $_GET['wp_lang'] ) ) {
-        $wp_lang = sanitize_text_field( $_GET['wp_lang'] );
+        $wp_lang = sanitize_locale_name( wp_unslash( $_GET['wp_lang'] ) );
     } elseif ( ! empty( $_COOKIE['wp_lang'] ) ) {
-        $wp_lang = sanitize_text_field( $_COOKIE['wp_lang'] );
+        $wp_lang = sanitize_locale_name( wp_unslash( $_COOKIE['wp_lang'] ) );
     }
 

branches/6.1/src/wp-includes/media.php

@@ -4517 +4517 @@
         'captions'          => ! apply_filters( 'disable_captions', '' ),
         'nonce'             => array(
-            'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
+            'sendToEditor'           => wp_create_nonce( 'media-send-to-editor' ),
+            'setAttachmentThumbnail' => wp_create_nonce( 'set-attachment-thumbnail' ),
         ),
         'post'              => array(

branches/6.1/src/wp-includes/version.php

@@ -17 +17 @@
  * @global string $wp_version
  */
-$wp_version = '6.1.2-alpha-54847-src';
+$wp_version = '6.1.2-src';
 
 /**

branches/6.1/tests/phpunit/tests/ajax/Attachments.php

@@ -104 +104 @@
         $this->assertSame( $expected, $response['data'] );
     }
+
+    public function test_wp_ajax_set_attachment_thumbnail_success() {
+        // Become an administrator.
+        $post    = $_POST;
+        $user_id = self::factory()->user->create(
+            array(
+                'role'       => 'administrator',
+                'user_login' => 'user_36578_administrator',
+                'user_email' => 'user_36578_administrator@example.com',
+            )
+        );
+        wp_set_current_user( $user_id );
+        $_POST = array_merge( $_POST, $post );
+
+        // Upload the attachment itself.
+        $filename = DIR_TESTDATA . '/uploads/small-audio.mp3';
+        $contents = file_get_contents( $filename );
+
+        $upload     = wp_upload_bits( wp_basename( $filename ), null, $contents );
+        $attachment = $this->_make_attachment( $upload );
+
+        // Upload the thumbnail.
+        $filename = DIR_TESTDATA . '/images/waffles.jpg';
+        $contents = file_get_contents( $filename );
+
+        $upload    = wp_upload_bits( wp_basename( $filename ), null, $contents );
+        $thumbnail = $this->_make_attachment( $upload );
+
+        // Set up a default request.
+        $_POST['_ajax_nonce']  = wp_create_nonce( 'set-attachment-thumbnail' );
+        $_POST['thumbnail_id'] = $thumbnail;
+        $_POST['urls']         = array( wp_get_attachment_url( $attachment ) );
+
+        // Make the request.
+        try {
+            $this->_handleAjax( 'set-attachment-thumbnail' );
+        } catch ( WPAjaxDieContinueException $e ) {
+            unset( $e );
+        }
+
+        // Get the response.
+        $response = json_decode( $this->_last_response, true );
+
+        // Ensure everything is correct.
+        $this->assertTrue( $response['success'] );
+    }
+
+    public function test_wp_ajax_set_attachment_thumbnail_missing_nonce() {
+        // Become an administrator.
+        $post    = $_POST;
+        $user_id = self::factory()->user->create(
+            array(
+                'role'       => 'administrator',
+                'user_login' => 'user_36578_administrator',
+                'user_email' => 'user_36578_administrator@example.com',
+            )
+        );
+        wp_set_current_user( $user_id );
+        $_POST = array_merge( $_POST, $post );
+
+        // Upload the attachment itself.
+        $filename = DIR_TESTDATA . '/uploads/small-audio.mp3';
+        $contents = file_get_contents( $filename );
+
+        $upload     = wp_upload_bits( wp_basename( $filename ), null, $contents );
+        $attachment = $this->_make_attachment( $upload );
+
+        // Upload the thumbnail.
+        $filename = DIR_TESTDATA . '/images/waffles.jpg';
+        $contents = file_get_contents( $filename );
+
+        $upload    = wp_upload_bits( wp_basename( $filename ), null, $contents );
+        $thumbnail = $this->_make_attachment( $upload );
+
+        // Set up a default request.
+        $_POST['thumbnail_id'] = $thumbnail;
+        $_POST['urls']         = array( wp_get_attachment_url( $attachment ) );
+
+        // Make the request.
+        try {
+            $this->_handleAjax( 'set-attachment-thumbnail' );
+        } catch ( WPAjaxDieContinueException $e ) {
+            unset( $e );
+        }
+
+        // Get the response.
+        $response = json_decode( $this->_last_response, true );
+
+        // Check that success is false without sending nonce.
+        $this->assertFalse( $response['success'] );
+    }
 }