Skip to content

fix(tests): align thumbnail cache test with image allowlist in assets… #2540

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

Merged
elcreator merged 1 commit into from
Nov 2, 2026
Merged

fix(tests): align thumbnail cache test with image allowlist in assets… #2540

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
26 changes: 20 additions & 6 deletions core/tests/Unit/PhpThumbCacheImagesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,26 @@ function phpThumbRepoFile(string $relative): string
expect($passes)->toBe($served);
})->with('phpthumb cache paths');

it('keeps the rest of assets/cache closed in the per-directory file', function () {
expect(phpThumbRepoFile('assets/cache/.htaccess'))
->toContain('Require all denied')
->not->toContain('FilesMatch')
->not->toContain('granted');
});
it('keeps non-image cache files closed in both Apache authorization dialects', function (string $name, bool $served) {
$htaccess = phpThumbRepoFile('assets/cache/.htaccess');
expect($htaccess)->toContain('Require all denied')->toContain('Deny from all');
preg_match_all('/<FilesMatch "([^"]+)">\s*(.*?)\s*<\/FilesMatch>/s', $htaccess, $rules, PREG_SET_ORDER);

expect($rules)->toHaveCount(2);
foreach ($rules as $rule) {
expect(preg_match('~' . $rule[1] . '~', $name))->toBe($served ? 1 : 0);
}
})->with([
'JPEG image' => ['thumbnail.jpg', true],
'PNG image' => ['thumbnail.PNG', true],
'WebP image' => ['thumbnail.jpg.webp', true],
'site cache' => ['siteCache.idx.php', false],
'PHP with image prefix' => ['thumbnail.jpg.php', false],
'JSON cache' => ['settings.json', false],
'HTML' => ['page.html', false],
'SVG' => ['image.svg', false],
'server configuration' => ['.htaccess', false],
]);

it('writes the same two-dialect .htaccess into the thumbnail folder as the one shipped there', function () {
expect(HelperProcessor::CACHE_FOLDER_HTACCESS)
Expand Down
Loading