Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2096855 by zero2one: Fixed FilterHtmlImageSecure does not support images with spaces in the filename.

8.0.x
webchick 2013-10-02 09:50:45 -07:00
parent 1cdfe372c8
commit 83cbb3412c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/modules/filter/filter.module
View File

@ -1391,6 +1391,7 @@ function _filter_html_image_secure_process($text) {
// Ensure the path refers to an actual image by prefixing the image source // Ensure the path refers to an actual image by prefixing the image source
// with the Drupal root and running getimagesize() on it. // with the Drupal root and running getimagesize() on it.
$local_image_path = $local_dir . drupal_substr($src, $base_path_length); $local_image_path = $local_dir . drupal_substr($src, $base_path_length);
$local_image_path = rawurldecode($local_image_path);
if (@getimagesize($local_image_path)) { if (@getimagesize($local_image_path)) {
// The image has the right path. Erroneous images are dealt with below. // The image has the right path. Erroneous images are dealt with below.
continue; continue;

8
core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php
View File

@ -94,6 +94,12 @@ class FilterHtmlImageSecureTest extends WebTestBase {
$test_images = $this->drupalGetTestFiles('image'); $test_images = $this->drupalGetTestFiles('image');
$test_image = $test_images[0]->filename; $test_image = $test_images[0]->filename;
// Put a test image in the files directory with special filename.
$special_filename = 'tést fïle nàme.png';
$special_image = rawurlencode($special_filename);
$special_uri = str_replace($test_images[0]->filename, $special_filename, $test_images[0]->uri);
file_unmanaged_copy($test_images[0]->uri, $special_uri);
// Create a list of test image sources. // Create a list of test image sources.
// The keys become the value of the IMG 'src' attribute, the values are the // The keys become the value of the IMG 'src' attribute, the values are the
// expected filter conversions. // expected filter conversions.
@ -111,6 +117,8 @@ class FilterHtmlImageSecureTest extends WebTestBase {
$files_path . '/' . $test_image => $files_path . '/' . $test_image, $files_path . '/' . $test_image => $files_path . '/' . $test_image,
$http_base_url . '/' . $public_files_path . '/' . $test_image => $files_path . '/' . $test_image, $http_base_url . '/' . $public_files_path . '/' . $test_image => $files_path . '/' . $test_image,
$https_base_url . '/' . $public_files_path . '/' . $test_image => $files_path . '/' . $test_image, $https_base_url . '/' . $public_files_path . '/' . $test_image => $files_path . '/' . $test_image,
$http_base_url . '/' . $public_files_path . '/' . $special_image => $files_path . '/' . $special_image,
$https_base_url . '/' . $public_files_path . '/' . $special_image => $files_path . '/' . $special_image,
$files_path . '/example.png' => $red_x_image, $files_path . '/example.png' => $red_x_image,
'http://example.com/' . $druplicon => $red_x_image, 'http://example.com/' . $druplicon => $red_x_image,
'https://example.com/' . $druplicon => $red_x_image, 'https://example.com/' . $druplicon => $red_x_image,