Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Amend path resolution handlers and outside root check conditional in FileSystemLoader #775

Merged
merged 1 commit into from
Aug 31, 2016
Merged

Amend path resolution handlers and outside root check conditional in FileSystemLoader #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ composer.lock
composer.phar
vendor/
Tests/Functional/app/web/media/cache
.idea/
15 changes: 11 additions & 4 deletions Binary/Loader/FileSystemLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Liip\ImagineBundle\Binary\Loader;

use Liip\ImagineBundle\Exception\InvalidArgumentException;
use Liip\ImagineBundle\Model\FileBinary;
use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesserInterface;
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
Expand Down Expand Up @@ -37,19 +38,25 @@ public function __construct(
$this->mimeTypeGuesser = $mimeTypeGuesser;
$this->extensionGuesser = $extensionGuesser;

$this->rootPath = rtrim($rootPath, '/');
if (!($realRootPath = realpath($rootPath))) {
throw new InvalidArgumentException(sprintf('Root image path not resolvable "%s"', $rootPath));
}

$this->rootPath = $realRootPath;
}

/**
* {@inheritdoc}
*/
public function find($path)
{
if (false !== strpos($path, '../')) {
throw new NotLoadableException(sprintf("Source image was searched with '%s' out side of the defined root path", $path));
if (!($absolutePath = realpath($this->rootPath.DIRECTORY_SEPARATOR.ltrim($path, DIRECTORY_SEPARATOR)))) {
throw new NotLoadableException(sprintf('Source image not resolvable "%s"', $path));
}

$absolutePath = $this->rootPath.'/'.ltrim($path, '/');
if (0 !== strpos($absolutePath, $this->rootPath)) {
throw new NotLoadableException(sprintf('Source image invalid "%s" as it is outside of the defined root path', $absolutePath));
}

if (false == file_exists($absolutePath)) {
throw new NotLoadableException(sprintf('Source image not found in "%s"', $absolutePath));
Expand Down
7 changes: 7 additions & 0 deletions Exception/InvalidArgumentException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace Liip\ImagineBundle\Exception;

class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
43 changes: 34 additions & 9 deletions Tests/Binary/Loader/FileSystemLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ public static function provideLoadCases()
array(__DIR__, $fileName),
array(__DIR__.'/', $fileName),
array(__DIR__, '/'.$fileName),
array(__DIR__.'/', '/'.$fileName),
array(__DIR__.'/../../Binary/Loader', '/'.$fileName),
array(realpath(__DIR__.'/..'), 'Loader/'.$fileName),
array(realpath(__DIR__.'/../'), '/Loader/'.$fileName),
array(__DIR__.'/../', '/Loader/../../Binary/Loader/'.$fileName),
);
}

Expand All @@ -41,7 +41,21 @@ public function testCouldBeConstructedWithExpectedArguments()
);
}

public function testThrowExceptionIfPathHasDoublePointSlashAtBegging()
public function testThrowExceptionIfRootPathDoesNotExist()
{
$this->setExpectedException(
'Liip\ImagineBundle\Exception\InvalidArgumentException',
'Root image path not resolvable'
);

new FileSystemLoader(
MimeTypeGuesser::getInstance(),
ExtensionGuesser::getInstance(),
'/a/bad/root/path'
);
}

public function testThrowExceptionIfRealPathIsOutsideRootPath1()
{
$loader = new FileSystemLoader(
MimeTypeGuesser::getInstance(),
Expand All @@ -51,13 +65,13 @@ public function testThrowExceptionIfPathHasDoublePointSlashAtBegging()

$this->setExpectedException(
'Liip\ImagineBundle\Exception\Binary\Loader\NotLoadableException',
'Source image was searched with'
'Source image invalid'
);

$loader->find('../foo/bar');
$loader->find('../Loader/../../Binary/Loader/../../../Resources/config/routing.xml');
}

public function testThrowExceptionIfPathHasDoublePointSlashInTheMiddle()
public function testThrowExceptionIfRealPathIsOutsideRootPath2()
{
$loader = new FileSystemLoader(
MimeTypeGuesser::getInstance(),
Expand All @@ -67,10 +81,21 @@ public function testThrowExceptionIfPathHasDoublePointSlashInTheMiddle()

$this->setExpectedException(
'Liip\ImagineBundle\Exception\Binary\Loader\NotLoadableException',
'Source image was searched with'
'Source image invalid'
);

$loader->find('../../Binary/');
}

public function testThrowExceptionIfPathHasDoublePointSlashInTheMiddle()
{
$loader = new FileSystemLoader(
MimeTypeGuesser::getInstance(),
ExtensionGuesser::getInstance(),
__DIR__
);

$loader->find('foo/../bar');
$loader->find('/../../Binary/Loader/'.pathinfo(__FILE__, PATHINFO_BASENAME));
}

public function testThrowExceptionIfFileNotExist()
Expand All @@ -83,7 +108,7 @@ public function testThrowExceptionIfFileNotExist()

$this->setExpectedException(
'Liip\ImagineBundle\Exception\Binary\Loader\NotLoadableException',
'Source image not found'
'Source image not resolvable'
);

$loader->find('fileNotExist');
Expand Down