starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-09-26 01:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve file storage metadata handling (#11983)

Browse Source
This commit is contained in:
Andras Bacsai
2026-09-24 12:31:26 +02:00
committed by GitHub
parent 7165df5123 4b8c50a546
commit abab823898
3 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/SslHelper.php
+9 -6
View File
@@ -191,35 +191,38 @@ class SslHelper
});
if ($isPemKeyFileRequired) {
$model->fileStorages()->create([
$fileStorage = $model->fileStorages()->make([
'fs_path' => $configurationDir.'/ssl/server.pem',
'mount_path' => $mountPath.'/server.pem',
'content' => $certificateStr."\n".$privateKeyStr,
'is_directory' => false,
'chmod' => '600',
'resource_type' => $resourceType,
'resource_id' => $resourceId,
]);
$fileStorage->chmod = '600';
$fileStorage->save();
} else {
$model->fileStorages()->create([
$fileStorage = $model->fileStorages()->make([
'fs_path' => $configurationDir.'/ssl/server.crt',
'mount_path' => $mountPath.'/server.crt',
'content' => $certificateStr,
'is_directory' => false,
'chmod' => '644',
'resource_type' => $resourceType,
'resource_id' => $resourceId,
]);
$fileStorage->chmod = '644';
$fileStorage->save();
$model->fileStorages()->create([
$fileStorage = $model->fileStorages()->make([
'fs_path' => $configurationDir.'/ssl/server.key',
'mount_path' => $mountPath.'/server.key',
'content' => $privateKeyStr,
'is_directory' => false,
'chmod' => '600',
'resource_type' => $resourceType,
'resource_id' => $resourceId,
]);
$fileStorage->chmod = '600';
$fileStorage->save();
}
}
app/Models/LocalFileVolume.php
+2 -4
View File
@@ -41,8 +41,6 @@ class LocalFileVolume extends BaseModel
'resource_id',
'is_directory',
'is_host_file',
'chown',
'chmod',
'is_based_on_git',
'is_preview_suffix_enabled',
];
@@ -318,10 +316,10 @@ class LocalFileVolume extends BaseModel
}
$commands->push("chmod +x {$escapedPath}");
if ($chown) {
$commands->push("chown $chown {$escapedPath}");
$commands->push('chown -- '.escapeshellarg($chown)." {$escapedPath}");
}
if ($chmod) {
$commands->push("chmod $chmod {$escapedPath}");
$commands->push('chmod -- '.escapeshellarg($chmod)." {$escapedPath}");
}
} elseif ($isDir === 'NOK' && $this->is_directory) {
$commands->push("mkdir -p {$escapedPath} > /dev/null 2>&1 || true");
tests/Unit/FileStorageSecurityTest.php
+30
View File
@@ -1,5 +1,7 @@
<?php
use App\Models\LocalFileVolume;
/**
* File Storage Security Tests
*
@@ -216,3 +218,31 @@ test('host file mounts are bind-only and skipped by server storage writes', func
->and($source)->toContain('return;')
->and($source)->toContain('tee {$escapedPath}');
});
test('file storage quotes owner and mode as single command arguments', function () {
$source = file_get_contents(__DIR__.'/../../app/Models/LocalFileVolume.php');
expect($source)
->toContain("'chown -- '.escapeshellarg(\$chown).\" {\$escapedPath}\"")
->toContain("'chmod -- '.escapeshellarg(\$chmod).\" {\$escapedPath}\"")
->not->toContain('"chown $chown {$escapedPath}"')
->not->toContain('"chmod $chmod {$escapedPath}"');
});
test('file storage permissions cannot be set by mass assignment', function () {
$volume = new LocalFileVolume;
$volume->fill(['chown' => 'root', 'chmod' => '777']);
expect($volume->chown)->toBeNull()
->and($volume->chmod)->toBeNull();
});
test('internal SSL files retain their private and public modes', function () {
$source = file_get_contents(__DIR__.'/../../app/Helpers/SslHelper.php');
expect($source)
->toContain("\$fileStorage->chmod = '600';")
->toContain("\$fileStorage->chmod = '644';")
->toContain('$fileStorage->save();')
->not->toContain("'chmod' =>");
});