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

Merge pull request #5601 from BookStackApp/file_permissions 

Images: Changed how new image permissions are set
This commit is contained in:
Dan Brown 2025-05-05 12:54:40 +01:00 committed by GitHub
parent 4f36cdd757 1262083fcf
commit 642ba668b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Config/filesystems.php
View File

@ -32,7 +32,6 @@ return [
'local' => [ 'local' => [
'driver' => 'local', 'driver' => 'local',
'root' => public_path(), 'root' => public_path(),
'visibility' => 'public',
'serve' => false, 'serve' => false,
'throw' => true, 'throw' => true,
], ],
@ -47,7 +46,6 @@ return [
'local_secure_images' => [ 'local_secure_images' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('uploads/images/'), 'root' => storage_path('uploads/images/'),
'visibility' => 'public',
'serve' => false, 'serve' => false,
'throw' => true, 'throw' => true,
], ],

19
app/Uploads/ImageStorageDisk.php
View File

@ -5,6 +5,8 @@ namespace BookStack\Uploads;
use BookStack\Util\FilePathNormalizer; use BookStack\Util\FilePathNormalizer;
use Illuminate\Contracts\Filesystem\Filesystem; use Illuminate\Contracts\Filesystem\Filesystem;
use Illuminate\Filesystem\FilesystemAdapter; use Illuminate\Filesystem\FilesystemAdapter;
use Illuminate\Support\Facades\Log;
use League\Flysystem\UnableToSetVisibility;
use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpFoundation\StreamedResponse;
class ImageStorageDisk class ImageStorageDisk
@ -74,12 +76,19 @@ class ImageStorageDisk
$path = $this->adjustPathForDisk($path); $path = $this->adjustPathForDisk($path);
$this->filesystem->put($path, $data); $this->filesystem->put($path, $data);
// Set visibility when a non-AWS-s3, s3-like storage option is in use. // Set public visibility to ensure public access on S3, or that the file is accessible
// Done since this call can break s3-like services but desired for other image stores. // to other processes (like web-servers) for local file storage options.
// Attempting to set ACL during above put request requires different permissions // We avoid attempting this for (non-AWS) s3-like systems (even in a try-catch) as
// hence would technically be a breaking change for actual s3 usage. // we've always avoided setting permissions for s3-like due to potential issues,
// with docs advising setting pre-configured permissions instead.
// We also don't do this as the default filesystem/driver level as that can technically
// require different ACLs for S3, and this provides us more logical control.
if ($makePublic && !$this->isS3Like()) { if ($makePublic && !$this->isS3Like()) {
$this->filesystem->setVisibility($path, 'public'); try {
$this->filesystem->setVisibility($path, 'public');
} catch (UnableToSetVisibility $e) {
Log::warning("Unable to set visibility for image upload with relative path: {$path}");
}
} }
} }