Upload beautify
This commit is contained in:
168
tests/Unit/Uploads/ArchiveInspectorServiceTest.php
Normal file
168
tests/Unit/Uploads/ArchiveInspectorServiceTest.php
Normal file
@@ -0,0 +1,168 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Unit\Uploads;
|
||||
|
||||
use App\Uploads\Services\ArchiveInspectorService;
|
||||
use App\Uploads\Services\InspectionResult;
|
||||
use Tests\TestCase;
|
||||
use ZipArchive;
|
||||
|
||||
class ArchiveInspectorServiceTest extends TestCase
|
||||
{
|
||||
/** @var array<int, string> */
|
||||
private array $tempFiles = [];
|
||||
|
||||
protected function tearDown(): void
|
||||
{
|
||||
foreach ($this->tempFiles as $file) {
|
||||
if (is_file($file)) {
|
||||
@unlink($file);
|
||||
}
|
||||
}
|
||||
|
||||
parent::tearDown();
|
||||
}
|
||||
|
||||
public function test_rejects_zip_slip_path(): void
|
||||
{
|
||||
$archive = $this->makeZip([
|
||||
'../evil.txt' => 'x',
|
||||
]);
|
||||
|
||||
$result = app(ArchiveInspectorService::class)->inspect($archive);
|
||||
|
||||
$this->assertFalse($result->valid);
|
||||
$this->assertStringContainsString('path traversal', (string) $result->reason);
|
||||
}
|
||||
|
||||
public function test_rejects_symlink_entries(): void
|
||||
{
|
||||
$archive = $this->makeZipWithCallback([
|
||||
'safe/file.txt' => 'ok',
|
||||
'safe/link' => 'target',
|
||||
], function (ZipArchive $zip, string $entryName): void {
|
||||
if ($entryName === 'safe/link') {
|
||||
$zip->setExternalAttributesName($entryName, ZipArchive::OPSYS_UNIX, 0120777 << 16);
|
||||
}
|
||||
});
|
||||
|
||||
$result = app(ArchiveInspectorService::class)->inspect($archive);
|
||||
|
||||
$this->assertFalse($result->valid);
|
||||
$this->assertStringContainsString('symlink', strtolower((string) $result->reason));
|
||||
}
|
||||
|
||||
public function test_rejects_deep_nesting(): void
|
||||
{
|
||||
$archive = $this->makeZip([
|
||||
'a/b/c/d/e/f/file.txt' => 'too deep',
|
||||
]);
|
||||
|
||||
$result = app(ArchiveInspectorService::class)->inspect($archive);
|
||||
|
||||
$this->assertFalse($result->valid);
|
||||
$this->assertStringContainsString('depth', strtolower((string) $result->reason));
|
||||
}
|
||||
|
||||
public function test_rejects_too_many_files(): void
|
||||
{
|
||||
$entries = [];
|
||||
for ($index = 0; $index < 5001; $index++) {
|
||||
$entries['f' . $index . '.txt'] = 'x';
|
||||
}
|
||||
|
||||
$archive = $this->makeZip($entries);
|
||||
|
||||
$result = app(ArchiveInspectorService::class)->inspect($archive);
|
||||
|
||||
$this->assertFalse($result->valid);
|
||||
$this->assertStringContainsString('5000', (string) $result->reason);
|
||||
}
|
||||
|
||||
public function test_rejects_executable_extensions(): void
|
||||
{
|
||||
$archive = $this->makeZip([
|
||||
'skins/readme.txt' => 'ok',
|
||||
'skins/run.exe' => 'MZ',
|
||||
]);
|
||||
|
||||
$result = app(ArchiveInspectorService::class)->inspect($archive);
|
||||
|
||||
$this->assertFalse($result->valid);
|
||||
$this->assertStringContainsString('blocked', strtolower((string) $result->reason));
|
||||
}
|
||||
|
||||
public function test_rejects_zip_bomb_ratio(): void
|
||||
{
|
||||
$archive = $this->makeZip([
|
||||
'payload.txt' => str_repeat('A', 6 * 1024 * 1024),
|
||||
]);
|
||||
|
||||
$result = app(ArchiveInspectorService::class)->inspect($archive);
|
||||
|
||||
$this->assertFalse($result->valid);
|
||||
$this->assertStringContainsString('ratio', strtolower((string) $result->reason));
|
||||
}
|
||||
|
||||
public function test_valid_archive_passes(): void
|
||||
{
|
||||
$archive = $this->makeZip([
|
||||
'skins/theme/readme.txt' => 'safe',
|
||||
'skins/theme/colors.ini' => 'accent=blue',
|
||||
]);
|
||||
|
||||
$result = app(ArchiveInspectorService::class)->inspect($archive);
|
||||
|
||||
$this->assertInstanceOf(InspectionResult::class, $result);
|
||||
$this->assertTrue($result->valid);
|
||||
$this->assertNull($result->reason);
|
||||
$this->assertIsArray($result->stats);
|
||||
$this->assertArrayHasKey('files', $result->stats);
|
||||
$this->assertArrayHasKey('depth', $result->stats);
|
||||
$this->assertArrayHasKey('size', $result->stats);
|
||||
$this->assertArrayHasKey('ratio', $result->stats);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, string> $entries
|
||||
*/
|
||||
private function makeZip(array $entries): string
|
||||
{
|
||||
return $this->makeZipWithCallback($entries, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, string> $entries
|
||||
* @param (callable(ZipArchive,string):void)|null $entryCallback
|
||||
*/
|
||||
private function makeZipWithCallback(array $entries, ?callable $entryCallback): string
|
||||
{
|
||||
if (! class_exists(ZipArchive::class)) {
|
||||
$this->markTestSkipped('ZipArchive extension is required.');
|
||||
}
|
||||
|
||||
$path = tempnam(sys_get_temp_dir(), 'sb_zip_');
|
||||
if ($path === false) {
|
||||
throw new \RuntimeException('Unable to create temporary zip path.');
|
||||
}
|
||||
|
||||
$this->tempFiles[] = $path;
|
||||
|
||||
$zip = new ZipArchive();
|
||||
if ($zip->open($path, ZipArchive::OVERWRITE | ZipArchive::CREATE) !== true) {
|
||||
throw new \RuntimeException('Unable to open temporary zip for writing.');
|
||||
}
|
||||
|
||||
foreach ($entries as $name => $content) {
|
||||
$zip->addFromString($name, $content);
|
||||
|
||||
if ($entryCallback !== null) {
|
||||
$entryCallback($zip, $name);
|
||||
}
|
||||
}
|
||||
|
||||
$zip->close();
|
||||
|
||||
return $path;
|
||||
}
|
||||
}
|
||||
139
tests/Unit/Uploads/CleanupServiceTest.php
Normal file
139
tests/Unit/Uploads/CleanupServiceTest.php
Normal file
@@ -0,0 +1,139 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Unit\Uploads;
|
||||
|
||||
use App\Models\User;
|
||||
use App\Uploads\Services\CleanupService;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Str;
|
||||
use Tests\TestCase;
|
||||
|
||||
class CleanupServiceTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
private function insertUploadRow(array $overrides = []): string
|
||||
{
|
||||
$id = (string) Str::uuid();
|
||||
|
||||
$defaults = [
|
||||
'id' => $id,
|
||||
'user_id' => User::factory()->create()->id,
|
||||
'type' => 'image',
|
||||
'status' => 'draft',
|
||||
'title' => null,
|
||||
'slug' => null,
|
||||
'category_id' => null,
|
||||
'description' => null,
|
||||
'tags' => null,
|
||||
'license' => null,
|
||||
'nsfw' => false,
|
||||
'is_scanned' => false,
|
||||
'has_tags' => false,
|
||||
'preview_path' => null,
|
||||
'published_at' => null,
|
||||
'final_path' => null,
|
||||
'expires_at' => null,
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
];
|
||||
|
||||
DB::table('uploads')->insert(array_merge($defaults, $overrides));
|
||||
|
||||
return $id;
|
||||
}
|
||||
|
||||
public function test_deletes_expired_draft_uploads_and_returns_count(): void
|
||||
{
|
||||
Storage::fake('local');
|
||||
|
||||
$uploadId = $this->insertUploadRow([
|
||||
'status' => 'draft',
|
||||
'expires_at' => now()->subMinute(),
|
||||
]);
|
||||
|
||||
Storage::disk('local')->put("tmp/drafts/{$uploadId}/meta.json", '{}');
|
||||
|
||||
$deleted = app(CleanupService::class)->cleanupStaleDrafts();
|
||||
|
||||
$this->assertSame(1, $deleted);
|
||||
$this->assertFalse(DB::table('uploads')->where('id', $uploadId)->exists());
|
||||
}
|
||||
|
||||
public function test_keeps_active_drafts_untouched(): void
|
||||
{
|
||||
Storage::fake('local');
|
||||
|
||||
$uploadId = $this->insertUploadRow([
|
||||
'status' => 'draft',
|
||||
'expires_at' => now()->addDay(),
|
||||
'updated_at' => now()->subHours(2),
|
||||
]);
|
||||
|
||||
Storage::disk('local')->put("tmp/drafts/{$uploadId}/meta.json", '{}');
|
||||
|
||||
$deleted = app(CleanupService::class)->cleanupStaleDrafts();
|
||||
|
||||
$this->assertSame(0, $deleted);
|
||||
$this->assertTrue(DB::table('uploads')->where('id', $uploadId)->exists());
|
||||
$this->assertTrue(Storage::disk('local')->exists("tmp/drafts/{$uploadId}/meta.json"));
|
||||
}
|
||||
|
||||
public function test_removes_temp_folder_when_deleting_stale_drafts(): void
|
||||
{
|
||||
Storage::fake('local');
|
||||
|
||||
$uploadId = $this->insertUploadRow([
|
||||
'status' => 'draft',
|
||||
'updated_at' => now()->subHours(25),
|
||||
]);
|
||||
|
||||
Storage::disk('local')->put("tmp/drafts/{$uploadId}/main/file.bin", 'x');
|
||||
$this->assertTrue(Storage::disk('local')->exists("tmp/drafts/{$uploadId}/main/file.bin"));
|
||||
|
||||
$deleted = app(CleanupService::class)->cleanupStaleDrafts();
|
||||
|
||||
$this->assertSame(1, $deleted);
|
||||
$this->assertFalse(Storage::disk('local')->exists("tmp/drafts/{$uploadId}/main/file.bin"));
|
||||
}
|
||||
|
||||
public function test_enforces_hard_cleanup_limit_of_100_per_run(): void
|
||||
{
|
||||
Storage::fake('local');
|
||||
|
||||
for ($index = 0; $index < 120; $index++) {
|
||||
$uploadId = $this->insertUploadRow([
|
||||
'status' => 'draft',
|
||||
'updated_at' => now()->subHours(30),
|
||||
]);
|
||||
|
||||
Storage::disk('local')->put("tmp/drafts/{$uploadId}/meta.json", '{}');
|
||||
}
|
||||
|
||||
$deleted = app(CleanupService::class)->cleanupStaleDrafts(999);
|
||||
|
||||
$this->assertSame(100, $deleted);
|
||||
$this->assertSame(20, DB::table('uploads')->count());
|
||||
}
|
||||
|
||||
public function test_never_deletes_published_uploads(): void
|
||||
{
|
||||
Storage::fake('local');
|
||||
|
||||
$uploadId = $this->insertUploadRow([
|
||||
'status' => 'published',
|
||||
'updated_at' => now()->subDays(5),
|
||||
'published_at' => now()->subDays(4),
|
||||
]);
|
||||
|
||||
Storage::disk('local')->put("tmp/drafts/{$uploadId}/meta.json", '{}');
|
||||
|
||||
$deleted = app(CleanupService::class)->cleanupStaleDrafts();
|
||||
|
||||
$this->assertSame(0, $deleted);
|
||||
$this->assertTrue(DB::table('uploads')->where('id', $uploadId)->where('status', 'published')->exists());
|
||||
$this->assertTrue(Storage::disk('local')->exists("tmp/drafts/{$uploadId}/meta.json"));
|
||||
}
|
||||
}
|
||||
102
tests/Unit/Uploads/PublishServiceTest.php
Normal file
102
tests/Unit/Uploads/PublishServiceTest.php
Normal file
@@ -0,0 +1,102 @@
|
||||
<?php
|
||||
|
||||
use App\Models\User;
|
||||
use App\Uploads\Services\PublishService;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Str;
|
||||
use Tests\TestCase;
|
||||
|
||||
uses(TestCase::class, RefreshDatabase::class);
|
||||
|
||||
function createCategoryForPublishTests(): int
|
||||
{
|
||||
$contentTypeId = DB::table('content_types')->insertGetId([
|
||||
'name' => 'Skins',
|
||||
'slug' => 'skins-' . Str::lower(Str::random(6)),
|
||||
'description' => null,
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
|
||||
return DB::table('categories')->insertGetId([
|
||||
'content_type_id' => $contentTypeId,
|
||||
'parent_id' => null,
|
||||
'name' => 'Winamp',
|
||||
'slug' => 'winamp-' . Str::lower(Str::random(6)),
|
||||
'description' => null,
|
||||
'image' => null,
|
||||
'is_active' => true,
|
||||
'sort_order' => 0,
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
}
|
||||
|
||||
it('rejects publish when user is not owner', function () {
|
||||
Storage::fake('local');
|
||||
|
||||
$owner = User::factory()->create();
|
||||
$other = User::factory()->create();
|
||||
$categoryId = createCategoryForPublishTests();
|
||||
$uploadId = (string) Str::uuid();
|
||||
|
||||
DB::table('uploads')->insert([
|
||||
'id' => $uploadId,
|
||||
'user_id' => $owner->id,
|
||||
'type' => 'image',
|
||||
'status' => 'draft',
|
||||
'moderation_status' => 'approved',
|
||||
'title' => 'City Lights',
|
||||
'category_id' => $categoryId,
|
||||
'is_scanned' => true,
|
||||
'has_tags' => true,
|
||||
'preview_path' => "tmp/drafts/{$uploadId}/preview.webp",
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
|
||||
$service = app(PublishService::class);
|
||||
|
||||
expect(fn () => $service->publish($uploadId, $other))
|
||||
->toThrow(RuntimeException::class, 'You do not own this upload.');
|
||||
});
|
||||
|
||||
it('rejects archive publish without screenshots', function () {
|
||||
Storage::fake('local');
|
||||
|
||||
$owner = User::factory()->create();
|
||||
$categoryId = createCategoryForPublishTests();
|
||||
$uploadId = (string) Str::uuid();
|
||||
|
||||
DB::table('uploads')->insert([
|
||||
'id' => $uploadId,
|
||||
'user_id' => $owner->id,
|
||||
'type' => 'archive',
|
||||
'status' => 'draft',
|
||||
'moderation_status' => 'approved',
|
||||
'title' => 'Skin Pack',
|
||||
'category_id' => $categoryId,
|
||||
'is_scanned' => true,
|
||||
'has_tags' => true,
|
||||
'preview_path' => "tmp/drafts/{$uploadId}/preview.webp",
|
||||
'created_at' => now(),
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
|
||||
DB::table('upload_files')->insert([
|
||||
'upload_id' => $uploadId,
|
||||
'path' => "tmp/drafts/{$uploadId}/main/pack.zip",
|
||||
'type' => 'main',
|
||||
'hash' => 'aabbccddeeff0011',
|
||||
'size' => 1024,
|
||||
'mime' => 'application/zip',
|
||||
'created_at' => now(),
|
||||
]);
|
||||
|
||||
$service = app(PublishService::class);
|
||||
|
||||
expect(fn () => $service->publish($uploadId, $owner))
|
||||
->toThrow(RuntimeException::class, 'Archive uploads require at least one screenshot.');
|
||||
});
|
||||
130
tests/Unit/Uploads/UploadDraftServiceTest.php
Normal file
130
tests/Unit/Uploads/UploadDraftServiceTest.php
Normal file
@@ -0,0 +1,130 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Unit\Uploads;
|
||||
|
||||
use Tests\TestCase;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use App\Services\Upload\UploadDraftService;
|
||||
use Illuminate\Contracts\Filesystem\Filesystem as FilesystemContract;
|
||||
use Illuminate\Filesystem\FilesystemManager;
|
||||
use Carbon\Carbon;
|
||||
use App\Models\User;
|
||||
|
||||
class UploadDraftServiceTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
protected UploadDraftService $service;
|
||||
protected User $user;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
// Use fake storage so we don't touch the real filesystem
|
||||
Storage::fake('local');
|
||||
|
||||
$this->user = User::factory()->create();
|
||||
|
||||
// Provide a dummy clamav scanner binding so any scanning calls are mocked
|
||||
$this->app->instance('clamav', new class {
|
||||
public function scan(string $path): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
$filesystem = $this->app->make(FilesystemManager::class);
|
||||
$this->service = new UploadDraftService($filesystem, 'local');
|
||||
}
|
||||
|
||||
public function test_createDraft_creates_directory_and_writes_meta()
|
||||
{
|
||||
$result = $this->service->createDraft(['title' => 'Test Draft', 'user_id' => $this->user->id, 'type' => 'image']);
|
||||
|
||||
$this->assertArrayHasKey('id', $result);
|
||||
$id = $result['id'];
|
||||
|
||||
Storage::disk('local')->assertExists("tmp/drafts/{$id}");
|
||||
Storage::disk('local')->assertExists("tmp/drafts/{$id}/meta.json");
|
||||
|
||||
$meta = json_decode(Storage::disk('local')->get("tmp/drafts/{$id}/meta.json"), true);
|
||||
$this->assertSame('Test Draft', $meta['title']);
|
||||
$this->assertSame($id, $meta['id']);
|
||||
}
|
||||
|
||||
public function test_storeMainFile_saves_file_and_updates_meta()
|
||||
{
|
||||
$draft = $this->service->createDraft(['user_id' => $this->user->id, 'type' => 'image']);
|
||||
$id = $draft['id'];
|
||||
|
||||
$file = UploadedFile::fake()->create('song.mp3', 1500, 'audio/mpeg');
|
||||
|
||||
$info = $this->service->storeMainFile($id, $file);
|
||||
|
||||
$this->assertArrayHasKey('path', $info);
|
||||
Storage::disk('local')->assertExists($info['path']);
|
||||
|
||||
$meta = json_decode(Storage::disk('local')->get("tmp/drafts/{$id}/meta.json"), true);
|
||||
$this->assertArrayHasKey('main_file', $meta);
|
||||
$this->assertSame($info['hash'], $meta['main_file']['hash']);
|
||||
}
|
||||
|
||||
public function test_storeScreenshot_saves_file_and_appends_meta()
|
||||
{
|
||||
$draft = $this->service->createDraft(['user_id' => $this->user->id, 'type' => 'image']);
|
||||
$id = $draft['id'];
|
||||
|
||||
$img = UploadedFile::fake()->image('thumb.jpg', 640, 480);
|
||||
|
||||
$info = $this->service->storeScreenshot($id, $img);
|
||||
|
||||
$this->assertArrayHasKey('path', $info);
|
||||
Storage::disk('local')->assertExists($info['path']);
|
||||
|
||||
$meta = json_decode(Storage::disk('local')->get("tmp/drafts/{$id}/meta.json"), true);
|
||||
$this->assertArrayHasKey('screenshots', $meta);
|
||||
$this->assertCount(1, $meta['screenshots']);
|
||||
$this->assertSame($info['hash'], $meta['screenshots'][0]['hash']);
|
||||
}
|
||||
|
||||
public function test_calculateHash_for_local_file_and_storage_path()
|
||||
{
|
||||
$file = UploadedFile::fake()->create('doc.pdf', 10);
|
||||
$realPath = $file->getRealPath();
|
||||
|
||||
$expected = hash_file('sha256', $realPath);
|
||||
$this->assertSame($expected, $this->service->calculateHash($realPath));
|
||||
|
||||
// Store into drafts and calculate by storage path
|
||||
$draft = $this->service->createDraft(['user_id' => $this->user->id, 'type' => 'image']);
|
||||
$id = $draft['id'];
|
||||
$info = $this->service->storeMainFile($id, $file);
|
||||
|
||||
$storageHash = $this->service->calculateHash($info['path']);
|
||||
$storedContents = Storage::disk('local')->get($info['path']);
|
||||
$this->assertSame(hash('sha256', $storedContents), $storageHash);
|
||||
}
|
||||
|
||||
public function test_setExpiration_writes_expires_at_in_meta()
|
||||
{
|
||||
$draft = $this->service->createDraft(['user_id' => $this->user->id, 'type' => 'image']);
|
||||
$id = $draft['id'];
|
||||
|
||||
$when = Carbon::now()->addDays(3);
|
||||
$ok = $this->service->setExpiration($id, $when);
|
||||
$this->assertTrue($ok);
|
||||
|
||||
$meta = json_decode(Storage::disk('local')->get("tmp/drafts/{$id}/meta.json"), true);
|
||||
$this->assertArrayHasKey('expires_at', $meta);
|
||||
$this->assertSame($when->toISOString(), $meta['expires_at']);
|
||||
}
|
||||
|
||||
public function test_calculateHash_throws_for_missing_file()
|
||||
{
|
||||
$this->expectException(\RuntimeException::class);
|
||||
$this->service->calculateHash('this/path/does/not/exist');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user