colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5609 from BookStackApp/5605-folder-permissions 

Images: Updated local disk to have open dir perms
This commit is contained in:
Dan Brown 2025-05-17 11:49:44 +01:00 committed by GitHub
parent 752cfe2f67 5ab31a8191
commit 1dd1024eba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/filesystems.php
View File

@ -34,6 +34,7 @@ return [
'root' => public_path(),
'serve' => false,
'throw' => true,
'directory_visibility' => 'public',
],
'local_secure_attachments' => [

3
app/Uploads/ImageStorageDisk.php
View File

@ -7,6 +7,7 @@ use Illuminate\Contracts\Filesystem\Filesystem;
use Illuminate\Filesystem\FilesystemAdapter;
use Illuminate\Support\Facades\Log;
use League\Flysystem\UnableToSetVisibility;
use League\Flysystem\Visibility;
use Symfony\Component\HttpFoundation\StreamedResponse;
class ImageStorageDisk
@ -85,7 +86,7 @@ class ImageStorageDisk
// require different ACLs for S3, and this provides us more logical control.
if ($makePublic && !$this->isS3Like()) {
try {
$this->filesystem->setVisibility($path, 'public');
$this->filesystem->setVisibility($path, Visibility::PUBLIC);
} catch (UnableToSetVisibility $e) {
Log::warning("Unable to set visibility for image upload with relative path: {$path}");
}

30
tests/Uploads/ImageStorageTest.php Normal file
View File

@ -0,0 +1,30 @@
<?php
namespace Tests\Uploads;
use BookStack\Uploads\ImageStorage;
use Tests\TestCase;
class ImageStorageTest extends TestCase
{
public function test_local_image_storage_sets_755_directory_permissions()
{
if (PHP_OS_FAMILY !== 'Linux') {
$this->markTestSkipped('Test only works on Linux');
}
config()->set('filesystems.default', 'local');
$storage = $this->app->make(ImageStorage::class);
$dirToCheck = 'test-dir-perms-' . substr(md5(random_bytes(16)), 0, 6);
$disk = $storage->getDisk('gallery');
$disk->put("{$dirToCheck}/image.png", 'abc', true);
$expectedPath = public_path("uploads/images/{$dirToCheck}");
$permissionsApplied = substr(sprintf('%o', fileperms($expectedPath)), -4);
$this->assertEquals('0755', $permissionsApplied);
@unlink("{$expectedPath}/image.png");
@rmdir($expectedPath);
}
}