Changeset 45943 for branches/4.9

Timestamp:

09/04/2019 04:28:49 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Escape the output in wp_ajax_upload_attachment().

Merges [45936] to the 4.9 branch.
Props whyisjake, sstoqnov.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/async-upload.php (modified) (1 diff)
• src/wp-admin/includes/ajax-actions.php (modified) (4 diffs)

branches/4.9/src/wp-admin/async-upload.php

@@ -23 +23 @@
 require_once( ABSPATH . 'wp-admin/admin.php' );
 
-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+header( 'Content-Type: text/plain; charset=' . get_option( 'blog_charset' ) );
 
 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {

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

@@ -2071 +2071 @@
                         'data'    => array(
                                 'message'  => __( 'Sorry, you are not allowed to upload files.' ),
-                                'filename' => $_FILES['async-upload']['name'],
+                                'filename' => esc_html( $_FILES['async-upload']['name'] ),
                         )
                 ) );
@@ -2085 +2085 @@
                                 'data'    => array(
                                         'message'  => __( 'Sorry, you are not allowed to attach files to this post.' ),
-                                        'filename' => $_FILES['async-upload']['name'],
+                                        'filename' => esc_html( $_FILES['async-upload']['name'] ),
                                 )
                         ) );
@@ -2109 +2109 @@
                                 'data'    => array(
                                         'message'  => __( 'The uploaded file is not a valid image. Please try again.' ),
-                                        'filename' => $_FILES['async-upload']['name'],
+                                        'filename' => esc_html( $_FILES['async-upload']['name'] ),
                                 )
                         ) );
@@ -2124 +2124 @@
                         'data'    => array(
                                 'message'  => $attachment_id->get_error_message(),
-                                'filename' => $_FILES['async-upload']['name'],
+                                'filename' => esc_html( $_FILES['async-upload']['name'] ),
                         )
                 ) );