An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(s3): allow uppercase letters in S3 bucket names
Andras Bacsaid24ee3582464
diff --git a/.ai/lessons.md b/.ai/lessons.mdindex 28df883d90..fa58e59485 100644--- a/.ai/lessons.md+++ b/.ai/lessons.md@@ -48,3 +48,7 @@## Compare routing identity, not complete domain URLs- Domain-conflict checks must treat `http://host` and `https://host` as the same routing identity.- Reproduce reports with the exact stored schemes before stating that duplicate detection works.++## Verify reported fixes against the running development app+- When a user asks for before-and-after verification, test the unchanged and fixed production code against the same Jean Run environment.+- Cover each requested interface, such as UI and API, and record the exact URL, response, persisted state, and relevant logs.diff --git a/app/Livewire/Project/Database/ImportForm.php b/app/Livewire/Project/Database/ImportForm.phpindex 5b8d90e2bb..2d58746554 100644--- a/app/Livewire/Project/Database/ImportForm.php+++ b/app/Livewire/Project/Database/ImportForm.php@@ -582,7 +582,7 @@ EOD;// Validate bucket name earlyif (! $this->validateBucketName($s3Storage->bucket)) {- $this->dispatch('error', 'Invalid S3 bucket name. Bucket name must contain only lowercase letters, numbers, dots, and dashes, and must follow S3 bucket naming rules.');+ $this->dispatch('error', 'Invalid S3 bucket name. Bucket name must contain only letters, numbers, dots, and dashes, and must follow S3 bucket naming rules.');return;}@@ -664,7 +664,7 @@ EOD;// Validate bucket name to prevent command injectionif (! $this->validateBucketName($bucket)) {- $this->dispatch('error', 'Invalid S3 bucket name. Bucket name must contain only lowercase letters, numbers, dots, and dashes, and must follow S3 bucket naming rules.');+ $this->dispatch('error', 'Invalid S3 bucket name. Bucket name must contain only letters, numbers, dots, and dashes, and must follow S3 bucket naming rules.');return true;}diff --git a/app/Rules/ValidS3BucketName.php b/app/Rules/ValidS3BucketName.phpindex bcfa430efe..cadddd3b6d 100644--- a/app/Rules/ValidS3BucketName.php+++ b/app/Rules/ValidS3BucketName.php@@ -17,7 +17,7 @@ class ValidS3BucketName implements ValidationRulepublic function validate(string $attribute, mixed $value, Closure $fail): void{if (! is_string($value) || ! ValidationPatterns::isValidS3BucketName($value)) {- $fail('The :attribute must be a valid S3 bucket name: 3-63 lowercase letters, numbers, dots, or hyphens; start and end with a letter or number; no consecutive dots, dot-hyphen pairs, or IP address format.');+ $fail('The :attribute must be a valid S3 bucket name: 3-63 letters, numbers, dots, or hyphens; start and end with a letter or number; no consecutive dots, dot-hyphen pairs, or IP address format.');}}}diff --git a/app/Support/ValidationPatterns.php b/app/Support/ValidationPatterns.phpindex 4656406fc4..442f892b26 100644--- a/app/Support/ValidationPatterns.php+++ b/app/Support/ValidationPatterns.php@@ -96,11 +96,11 @@ class ValidationPatterns/*** Pattern for S3 bucket names.*- * Bucket names must be 3-63 lowercase characters, start and end with a- * letter or digit, and contain only lowercase letters, digits, dots, and- * hyphens. Additional semantic checks live in isValidS3BucketName().+ * Bucket names must be 3-63 characters, start and end with a letter or+ * digit, and contain only letters, digits, dots, and hyphens. Uppercase+ * letters remain supported for legacy and S3-compatible buckets.*/- public const S3_BUCKET_NAME_PATTERN = '/\A(?=.{3,63}\z)[a-z0-9][a-z0-9.-]*[a-z0-9]\z/';+ public const S3_BUCKET_NAME_PATTERN = '/\A(?=.{3,63}\z)[A-Za-z0-9][A-Za-z0-9.-]*[A-Za-z0-9]\z/';/*** Pattern for Docker-compatible environment variable keys.diff --git a/tests/Feature/Api/S3StoragesApiTest.php b/tests/Feature/Api/S3StoragesApiTest.phpindex f2bd3d5b56..5b0f9d6da9 100644--- a/tests/Feature/Api/S3StoragesApiTest.php+++ b/tests/Feature/Api/S3StoragesApiTest.php@@ -4,6 +4,7 @@ use App\Models\InstanceSettings;use App\Models\S3Storage;use App\Models\Team;use App\Models\User;+use Illuminate\Filesystem\FilesystemAdapter;use Illuminate\Foundation\Testing\RefreshDatabase;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;@@ -463,7 +464,7 @@ describe('POST /api/v1/s3-storages/{uuid}/validate', function () {test('validates a working s3 storage connection', function () {$storage = createS3StorageForTeam($this->team);- $disk = Mockery::mock();+ $disk = Mockery::mock(FilesystemAdapter::class);$disk->expects('files')->once()->andReturn([]);Storage::expects('build')->once()->andReturn($disk);@@ -484,7 +485,7 @@ describe('POST /api/v1/s3-storages/{uuid}/validate', function () {test('detects an invalid s3 storage connection', function () {$storage = createS3StorageForTeam($this->team, ['is_usable' => true]);- $disk = Mockery::mock();+ $disk = Mockery::mock(FilesystemAdapter::class);$disk->expects('files')->once()->andThrow(new RuntimeException('Access Denied'));@@ -519,7 +520,7 @@ describe('POST /api/v1/s3-storages/{uuid}/validate', function () {test('writes an audit log entry when validating storage', function () {$storage = createS3StorageForTeam($this->team, ['name' => 'Audit Storage']);- $disk = Mockery::mock();+ $disk = Mockery::mock(FilesystemAdapter::class);$disk->expects('files')->once()->andReturn([]);Storage::expects('build')->once()->andReturn($disk);diff --git a/tests/Feature/S3StorageFormTest.php b/tests/Feature/S3StorageFormTest.phpindex f8c2f7bda7..c69cd293f1 100644--- a/tests/Feature/S3StorageFormTest.php+++ b/tests/Feature/S3StorageFormTest.php@@ -2,17 +2,15 @@use App\Livewire\Storage\Form;use App\Models\S3Storage;+use Illuminate\Filesystem\FilesystemAdapter;use Illuminate\Support\Facades\Storage;-use Tests\TestCase;--uses(TestCase::class);it('tests the S3 connection with the values currently entered in the form', function () {if (! defined('CURLOPT_RESOLVE')) {define('CURLOPT_RESOLVE', 10203);}- $disk = Mockery::mock();+ $disk = Mockery::mock(FilesystemAdapter::class);$disk->expects('files')->once()->andReturn([]);$testedConfig = null;diff --git a/tests/Unit/Project/Database/ImportCheckFileButtonTest.php b/tests/Unit/Project/Database/ImportCheckFileButtonTest.phpindex 2b816ff5e2..087a40a379 100644--- a/tests/Unit/Project/Database/ImportCheckFileButtonTest.php+++ b/tests/Unit/Project/Database/ImportCheckFileButtonTest.php@@ -39,6 +39,7 @@ test('validateBucketName accepts valid bucket names', function () {expect($method->invoke($component, 'my-bucket'))->toBeTrue();expect($method->invoke($component, 'mybucket123'))->toBeTrue();expect($method->invoke($component, 'my.bucket.name'))->toBeTrue();+ expect($method->invoke($component, 'Legacy-Bucket'))->toBeTrue();});test('validateBucketName rejects invalid bucket names', function () {@@ -54,7 +55,6 @@ test('validateBucketName rejects invalid bucket names', function () {expect($method->invoke($component, "bucket\nid"))->toBeFalse();expect($method->invoke($component, 'bucket name'))->toBeFalse(); // Space not allowed in bucketexpect($method->invoke($component, 'my_bucket'))->toBeFalse();- expect($method->invoke($component, 'Bucket-Name'))->toBeFalse();expect($method->invoke($component, '192.168.1.1'))->toBeFalse();});diff --git a/tests/Unit/S3StorageTest.php b/tests/Unit/S3StorageTest.phpindex ef7744b2a3..7a9d889ef3 100644--- a/tests/Unit/S3StorageTest.php+++ b/tests/Unit/S3StorageTest.php@@ -1,6 +1,7 @@<?phpuse App\Models\S3Storage;+use Illuminate\Filesystem\FilesystemAdapter;use Illuminate\Support\Facades\Storage;use Tests\TestCase;@@ -67,7 +68,7 @@ test('S3Storage model fillable attributes are configured correctly', function ()});test('S3Storage connection validation uses short s3 client timeouts', function () {- $disk = Mockery::mock();+ $disk = Mockery::mock(FilesystemAdapter::class);$disk->expects('files')->once()->andReturn([]);Storage::expects('build')@@ -87,7 +88,7 @@ test('S3Storage connection validation uses short s3 client timeouts', function ('region' => 'us-east-1','key' => null,'secret' => null,- 'bucket' => 'test-bucket',+ 'bucket' => 'Test-Bucket','endpoint' => 'https://s3.amazonaws.com',]);@@ -97,7 +98,7 @@ test('S3Storage connection validation uses short s3 client timeouts', function (});test('S3Storage connection validation returns friendly timeout error', function () {- $disk = Mockery::mock();+ $disk = Mockery::mock(FilesystemAdapter::class);$disk->expects('files')->once()->andThrow(new RuntimeException('cURL error 28: Operation timed out after 15000 milliseconds'));@@ -142,5 +143,4 @@ test('S3Storage testConnection rejects invalid bucket before building client', f'backticks' => ['lab`id`'],'newline' => ["lab\nid"],'underscore' => ['lab_bucket'],- 'uppercase' => ['LabBucket'],]);diff --git a/tests/Unit/ValidS3BucketNameTest.php b/tests/Unit/ValidS3BucketNameTest.phpindex 1a38c74c79..b2532a03e5 100644--- a/tests/Unit/ValidS3BucketNameTest.php+++ b/tests/Unit/ValidS3BucketNameTest.php@@ -18,6 +18,7 @@ it('accepts valid s3 bucket names', function (string $bucket) {})->with(['short' => ['abc'],'simple' => ['coolify-backups'],+ 'legacy uppercase' => ['CoolifyBackups'],'dots' => ['coolify.backups'],'digits' => ['backup-123'],'max length' => [str_repeat('a', 63)],@@ -28,7 +29,6 @@ it('rejects invalid s3 bucket names and injection payloads', function (string $b})->with(['too short' => ['ab'],'too long' => [str_repeat('a', 64)],- 'uppercase' => ['CoolifyBackups'],'underscore' => ['coolify_backups'],'leading hyphen' => ['-coolify-backups'],'trailing hyphen' => ['coolify-backups-'],