archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-09-20 14:34:03 +00:00
Code Activity

Make the disk used for serving tenant assets configurable

Browse source 
TenantAssetController::$publicDisk is null by default, which keeps serving the
assets from app/public inside the tenant's storage directory. Setting it to a disk
name serves the assets from that disk's root instead.

A disk with no root path throws instead of resolving to an empty path. realpath('')
returns the current working directory, so the controller would end up treating the
whole app directory as the allowed root.
This commit is contained in:
lukinovec 2026-08-18 14:19:40 +02:00 • committed by Samuel Stancl
parent 11fec0345d
commit b771fd13a9
2 changed files with 64 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/Controllers/TenantAssetController.php
View file

@ -29,6 +29,13 @@ class TenantAssetController implements HasMiddleware
*/
public static array $middleware = [];
/**
* Disk the assets are served from.
*
* When null, the assets are served from app/public inside the tenant's storage directory.
*/
public static string|null $publicDisk = null;
public static function middleware()
{
return array_map(
@ -59,13 +66,25 @@ class TenantAssetController implements HasMiddleware
}
/**
* Assets are served from app/public inside the tenant's storage directory.
* Directory the assets are served from -- the root of the $publicDisk,
* or app/public inside the tenant's storage directory when no disk is configured.
*
* The directory is resolved using the FilesystemTenancyBootstrapper (rather than storage_path(),
* so that it's tenant-scoped regardless of the suffix_storage_path config).
* The storage directory is resolved using the FilesystemTenancyBootstrapper (rather than
* storage_path(), so that it's tenant-scoped regardless of the suffix_storage_path config).
*/
protected function assetRoot(): string
{
if (static::$publicDisk) {
$diskRoot = config('filesystems.disks.' . static::$publicDisk . '.root');
if (! is_string($diskRoot)) {
// A disk with no root path would let the controller serve any file in the app
throw new Exception('Disk [' . static::$publicDisk . '] has no root path configured.');
}
return rtrim($diskRoot, '/');
}
if ($tenant = tenant()) {
return FilesystemTenancyBootstrapper::getBoundTenantStoragePath($tenant) . '/app/public';
}