Ticket #43329: 43329.2.diff

src/wp-admin/includes/file.php

@@ -993 +993 @@
                 return $response;
         }
 
-        if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
+        $response_code = wp_remote_retrieve_response_code( $response );
+        if ( 200 != $response_code ) {
+                $data = array(
+                        'code' => $response_code,
+                );
+
+                /**
+                 * Retrieve a sample of the actual body for debug purposes.
+                 */
+                if ( is_resource( $tmpf = fopen( $tmpfname, 'rb' ) ) ) {
+                        $data['body'] = fread( $tmpf, apply_filters( 'download_url_error_max_body_response_size', KB_IN_BYTES ) );
+                        fclose( $tmpf );
+                }
+
                 unlink( $tmpfname );
-                return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+                return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ), $data );
         }
 
         $content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );

tests/phpunit/tests/admin/includesFile.php

@@ -31 +31 @@
                 update_option( 'siteurl', $siteurl );
                 $_SERVER['SCRIPT_FILENAME'] = $sfn;
         }
+
+        /**
+         * @ticket 43329
+         */
+        public function test_download_url_non_200() {
+                add_filter( 'pre_http_request', array( $this, 'fake_download_url_non_200' ), 10, 3 );
+
+                $error = download_url( 'test_download_url_non_200' );
+                $this->assertWPError( $error );
+                $this->assertEquals( $error->get_error_data(), array(
+                        'code' => 418,
+                        'body' => 'This is an unexpected error message from your favorite server',
+                ) );
+
+                add_filter( 'download_url_error_max_body_response_size', array( $this, '__return_5' ) );
+
+                $error = download_url( 'test_download_url_non_200' );
+                $this->assertWPError( $error );
+                $this->assertEquals( $error->get_error_data(), array(
+                        'code' => 418,
+                        'body' => 'This ',
+                ) );
+
+                remove_filter( 'download_url_error_max_body_response_size', array( $this, '__return_5' ) );
+                remove_filter( 'pre_http_request', array( $this, 'fake_download_url_non_200' ) );
+        }
+
+        public function fake_download_url_non_200( $response, $args, $url ) {
+                file_put_contents( $args['filename'], 'This is an unexpected error message from your favorite server' );
+                return array(
+                        'response'      => array(
+                                'code'    => 418,
+                                'message' => "I'm a teapot!",
+                        ),
+                );
+        }
+
+        public function __return_5() {
+                return 5;
+        }
 }