malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: early terminate processing of invalid library path

Browse Source
This commit is contained in:
John Paul E. Balandan, CPA 2024-03-29 23:16:09 +08:00
parent 3503b4d461
commit 2c7d445fff
No known key found for this signature in database
GPG Key ID: 697D84680E3738DA
3 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpstan-baseline.php
View File

@ -7723,7 +7723,7 @@ $ignoreErrors[] = [
];
$ignoreErrors[] = [
'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
'count' => 9,
'count' => 8,
'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php',
];
$ignoreErrors[] = [

27
system/Images/Handlers/ImageMagickHandler.php
View File

@ -32,8 +32,6 @@ class ImageMagickHandler extends BaseHandler
protected $resource;
/**
* Constructor.
*
* @param Images $config
*
* @throws ImageException
@ -45,6 +43,22 @@ class ImageMagickHandler extends BaseHandler
if (! (extension_loaded('imagick') || class_exists(Imagick::class))) {
throw ImageException::forMissingExtension('IMAGICK'); // @codeCoverageIgnore
}
$cmd = $this->config->libraryPath;
if ($cmd === '') {
throw ImageException::forInvalidImageLibraryPath($cmd);
}
if (preg_match('/convert$/i', $cmd) !== 1) {
$cmd = rtrim($cmd, '\/') . '/convert';
$this->config->libraryPath = $cmd;
}
if (! is_file($cmd)) {
throw ImageException::forInvalidImageLibraryPath($cmd);
}
}
/**
@ -184,19 +198,10 @@ class ImageMagickHandler extends BaseHandler
*/
protected function process(string $action, int $quality = 100): array
{
// Do we have a vaild library path?
if (empty($this->config->libraryPath)) {
throw ImageException::forInvalidImageLibraryPath($this->config->libraryPath);
}
if ($action !== '-version') {
$this->supportedFormatCheck();
}
if (! preg_match('/convert$/i', $this->config->libraryPath)) {
$this->config->libraryPath = rtrim($this->config->libraryPath, '/') . '/convert';
}
$cmd = $this->config->libraryPath;
$cmd .= $action === '-version' ? ' ' . $action : ' -quality ' . $quality . ' ' . $action;

28
tests/system/Images/ImageMagickHandlerTest.php
View File

@ -14,6 +14,7 @@ namespace CodeIgniter\Images;
use CodeIgniter\Config\Services;
use CodeIgniter\Images\Exceptions\ImageException;
use CodeIgniter\Images\Handlers\BaseHandler;
use CodeIgniter\Images\Handlers\ImageMagickHandler;
use CodeIgniter\Test\CIUnitTestCase;
use Config\Images;
use Imagick;
@ -77,6 +78,33 @@ final class ImageMagickHandlerTest extends CIUnitTestCase
$this->handler = Services::image('imagick', $config, false);
}
/**
* @dataProvider provideNonexistentLibraryPathTerminatesProcessing
*/
public function testNonexistentLibraryPathTerminatesProcessing(string $path, string $invalidPath): void
{
$this->expectException(ImageException::class);
$this->expectExceptionMessage(lang('Images.libPathInvalid', [$invalidPath]));
$config = new Images();
$config->libraryPath = $path;
new ImageMagickHandler($config);
}
/**
* @return iterable<string, list<string>>
*/
public static function provideNonexistentLibraryPathTerminatesProcessing(): iterable
{
yield 'empty string' => ['', ''];
yield 'invalid file' => ['/var/log/convert', '/var/log/convert'];
yield 'nonexistent file' => ['/var/www/file', '/var/www/file/convert'];
}
public function testGetVersion(): void
{
$version = $this->handler->getVersion();