diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch vicb/uploadedfile2.0 (PR #4358)

Browse Source 
Commits
-------

8223632 [HttpFoundation] Fix the UploadedFilename name sanitization (fix #2577)

Discussion
----------

[HttpFoundation] Fix the UploadedFilename name sanitization (fix #2577)

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/vicb/symfony.png?branch=uploadedfile2.0)](http://travis-ci.org/vicb/symfony)
Fixes the following tickets: #2577

---------------------------------------------------------------------------

by travisbot at 2012-05-21T14:00:22Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1389203) (merged 82236324 into 87bb3661).
This commit is contained in:
Fabien Potencier 2012-05-21 16:09:03 +02:00
commit b206519671
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/HttpFoundation/File/UploadedFile.php
View File

@ -94,7 +94,9 @@ class UploadedFile extends File
throw new FileException(sprintf('Unable to create UploadedFile because "file_uploads" is disabled in your php.ini file (%s)', get_cfg_var('cfg_file_path'))); throw new FileException(sprintf('Unable to create UploadedFile because "file_uploads" is disabled in your php.ini file (%s)', get_cfg_var('cfg_file_path')));
} }
$this->originalName = basename($originalName); $originalName = str_replace('\\', '/', $originalName);
$pos = strrpos($originalName, '/');
$this->originalName = false === $pos ? $originalName : substr($originalName, $pos + 1);
$this->mimeType = $mimeType ?: 'application/octet-stream'; $this->mimeType = $mimeType ?: 'application/octet-stream';
$this->size = $size; $this->size = $size;
$this->error = $error ?: UPLOAD_ERR_OK; $this->error = $error ?: UPLOAD_ERR_OK;

35
tests/Symfony/Tests/Component/HttpFoundation/File/UploadedFileTest.php
View File

@ -76,19 +76,6 @@ class UploadedFileTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(UPLOAD_ERR_OK, $file->getError()); $this->assertEquals(UPLOAD_ERR_OK, $file->getError());
} }
public function testGetClientOriginalName()
{
$file = new UploadedFile(
__DIR__.'/Fixtures/test.gif',
'original.gif',
'image/gif',
filesize(__DIR__.'/Fixtures/test.gif'),
null
);
$this->assertEquals('original.gif', $file->getClientOriginalName());
}
/** /**
* @expectedException Symfony\Component\HttpFoundation\File\Exception\FileException * @expectedException Symfony\Component\HttpFoundation\File\Exception\FileException
*/ */
@ -132,18 +119,32 @@ class UploadedFileTest extends \PHPUnit_Framework_TestCase
@unlink($targetPath); @unlink($targetPath);
} }
/**
public function testGetClientOriginalNameSanitizeFilename() * @dataProvider getClientFilenameFixtures
*/
public function testGetClientOriginalNameSanitizeFilename($filename, $sanitizedFilename)
{ {
$file = new UploadedFile( $file = new UploadedFile(
__DIR__.'/Fixtures/test.gif', __DIR__.'/Fixtures/test.gif',
'../../original.gif', $filename,
'image/gif', 'image/gif',
filesize(__DIR__.'/Fixtures/test.gif'), filesize(__DIR__.'/Fixtures/test.gif'),
null null
); );
$this->assertEquals('original.gif', $file->getClientOriginalName()); $this->assertEquals($sanitizedFilename, $file->getClientOriginalName());
}
public function getClientFilenameFixtures()
{
return array(
array('original.gif', 'original.gif'),
array('..\\..\\original.gif', 'original.gif'),
array('../../original.gif', 'original.gif'),
array('файлfile.gif', 'файлfile.gif'),
array('..\\..\\файлfile.gif', 'файлfile.gif'),
array('../../файлfile.gif', 'файлfile.gif'),
);
} }
public function testGetSize() public function testGetSize()