Changeset 55772

Timestamp:

05/16/2023 03:17:59 PM (17 months ago)

Author:

SergeyBiryukov

Message:

Grouped backports to the 4.1 branch.

• Media: Prevent CSRF setting attachment thumbnails.

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

Location:

branches/4.1

Files:

• package-lock.json (modified) (1 diff)
• package.json (modified) (1 diff)
• src/wp-admin/about.php (modified) (1 diff)
• src/wp-admin/includes/ajax-actions.php (modified) (1 diff)
• src/wp-includes/js/media-audiovideo.js (modified) (1 diff)
• src/wp-includes/media.php (modified) (1 diff)
• src/wp-includes/version.php (modified) (1 diff)

branches/4.1/package-lock.json

@@ -1 +1 @@
 {
     "name": "WordPress",
-    "version": "4.1.37",
+    "version": "4.1.38",
     "lockfileVersion": 1,
     "requires": true,

branches/4.1/package.json

@@ -1 +1 @@
 {
     "name": "WordPress",
-    "version": "4.1.37",
+    "version": "4.1.38",
     "description": "WordPress is web software you can use to create a beautiful website or blog.",
     "repository": {

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

@@ -43 +43 @@
 
 <div class="changelog point-releases">
-    <h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 37 ); ?></h3>
+    <h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 38 ); ?></h3>
+    <p>
+        <?php
+        printf(
+            /* translators: %s: WordPress version number */
+            __( '<strong>Version %s</strong> addressed one security issue.' ),
+            '4.1.38'
+        );
+        ?>
+        <?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( '4.1.38' )
+            )
+        );
+        ?>
+    </p>
     <p>
         <?php

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

@@ -2012 +2012 @@
     }
 
+    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/4.1/src/wp-includes/js/media-audiovideo.js

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

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

@@ -2863 +2863 @@
         '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/4.1/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '4.1.37-src';
+$wp_version = '4.1.38-src';
 
 /**