Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/database-backups.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* s3 disks, and a key prefix.
*/
'disk' => env('DB_BACKUP_DISK', 's3'),
'bucket' => env('DB_BACKUP_BUCKET', 'fleetbase-db-backups'),
'bucket' => env('DB_BACKUP_BUCKET'),
'path' => env('DB_BACKUP_PATH', ''),

/*
Expand Down
10 changes: 5 additions & 5 deletions tests/Unit/DatabaseBackupsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ function database_backups_fixture(array $config = []): array
$sqlite = ['driver' => 'sqlite', 'database' => ':memory:', 'prefix' => ''];
$disks = [
'backups' => ['driver' => 'local', 'root' => $root . '/disk'],
's3' => ['driver' => 's3', 'bucket' => 'fleetbase-media', 'region' => 'ap-southeast-1'],
's3' => ['driver' => 's3', 'bucket' => 'example-media', 'region' => 'ap-southeast-1'],
];

$container = bind_test_container(array_merge([
Expand Down Expand Up @@ -620,12 +620,12 @@ function database_backups_command(DatabaseBackupService $service, array $input =
$service->diskOverride = DatabaseBackupsDiskFake::at(database_backups_root() . '/disk');
$settings = DatabaseBackupSettings::settings();

$service->disk(array_merge($settings, ['disk' => 's3', 'bucket' => 'fleetbase-db-backups']));
$service->disk(array_merge($settings, ['disk' => 's3', 'bucket' => 'example-db-backups']));
$service->disk(array_merge($settings, ['disk' => 's3', 'bucket' => null]));
$service->disk(array_merge($settings, ['bucket' => 'ignored']));

expect($service->diskConfigs[0]['bucket'])->toBe('fleetbase-db-backups')
->and($service->diskConfigs[1]['bucket'])->toBe('fleetbase-media')
expect($service->diskConfigs[0]['bucket'])->toBe('example-db-backups')
->and($service->diskConfigs[1]['bucket'])->toBe('example-media')
->and($service->diskConfigs[2])->not->toHaveKey('bucket')
->and($service->objectPath('', 'a.sql.gz'))->toBe('a.sql.gz')
->and($service->objectPath('/x/y/', 'a.sql.gz'))->toBe('x/y/a.sql.gz');
Expand Down Expand Up @@ -871,7 +871,7 @@ public function lock()
'time' => '01:15',
'day_of_week' => 1,
'disk' => 's3',
'bucket' => 'fleetbase-db-backups',
'bucket' => 'example-db-backups',
'path' => 'mysql',
'connections' => ['primary'],
'retention_days' => 14,
Expand Down
22 changes: 11 additions & 11 deletions tests/Unit/Models/FileModelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -345,36 +345,36 @@ function bind_file_model_filesystem(array $config = []): FileModelFilesystemFake

it('extracts object keys only from urls that point into the configured s3 bucket', function () {
bind_file_model_filesystem([
'filesystems.disks.s3.bucket' => 'fleetbase-production-media',
'filesystems.disks.s3.bucket' => 'example-media',
'filesystems.disks.s3.url' => 'https://media.example.test/assets',
]);

expect(File::s3KeyFromUrl('https://fleetbase-production-media.s3.amazonaws.com/uploads/a/photo.png'))->toBe('uploads/a/photo.png')
->and(File::s3KeyFromUrl('https://fleetbase-production-media.s3.ap-southeast-1.amazonaws.com/uploads/a/photo.png?X-Amz-Signature=old'))->toBe('uploads/a/photo.png')
->and(File::s3KeyFromUrl('https://fleetbase-production-media.s3-ap-southeast-1.amazonaws.com/custom-avatars/vehicles/c/My%20Van.png'))->toBe('custom-avatars/vehicles/c/My Van.png')
->and(File::s3KeyFromUrl('https://s3.ap-southeast-1.amazonaws.com/fleetbase-production-media/uploads/b/logo.png'))->toBe('uploads/b/logo.png')
expect(File::s3KeyFromUrl('https://example-media.s3.amazonaws.com/uploads/a/photo.png'))->toBe('uploads/a/photo.png')
->and(File::s3KeyFromUrl('https://example-media.s3.ap-southeast-1.amazonaws.com/uploads/a/photo.png?X-Amz-Signature=old'))->toBe('uploads/a/photo.png')
->and(File::s3KeyFromUrl('https://example-media.s3-ap-southeast-1.amazonaws.com/custom-avatars/vehicles/c/My%20Van.png'))->toBe('custom-avatars/vehicles/c/My Van.png')
->and(File::s3KeyFromUrl('https://s3.ap-southeast-1.amazonaws.com/example-media/uploads/b/logo.png'))->toBe('uploads/b/logo.png')
->and(File::s3KeyFromUrl('https://media.example.test/assets/uploads/c/doc.pdf'))->toBe('uploads/c/doc.pdf')
// other buckets, other hosts and non-urls are left alone
->and(File::s3KeyFromUrl('https://flb-assets.s3.ap-southeast-1.amazonaws.com/static/no-avatar.png'))->toBeNull()
->and(File::s3KeyFromUrl('https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'))->toBeNull()
->and(File::s3KeyFromUrl('https://evil.example.test/fleetbase-production-media.s3.amazonaws.com/x.png'))->toBeNull()
->and(File::s3KeyFromUrl('https://fleetbase-production-media.s3.amazonaws.com.evil.test/x.png'))->toBeNull()
->and(File::s3KeyFromUrl('https://fleetbase-production-media.s3.amazonaws.com/'))->toBeNull()
->and(File::s3KeyFromUrl('https://evil.example.test/example-media.s3.amazonaws.com/x.png'))->toBeNull()
->and(File::s3KeyFromUrl('https://example-media.s3.amazonaws.com.evil.test/x.png'))->toBeNull()
->and(File::s3KeyFromUrl('https://example-media.s3.amazonaws.com/'))->toBeNull()
->and(File::s3KeyFromUrl('5f1c2a10-0000-4000-8000-000000000000'))->toBeNull()
->and(File::s3KeyFromUrl(null))->toBeNull();

// config is shared across tests: drop the url override here as well
bind_file_model_filesystem(['filesystems.disks.s3.bucket' => null, 'filesystems.disks.s3.url' => null]);

expect(File::s3KeyFromUrl('https://fleetbase-production-media.s3.amazonaws.com/uploads/a/photo.png'))->toBeNull();
expect(File::s3KeyFromUrl('https://example-media.s3.amazonaws.com/uploads/a/photo.png'))->toBeNull();
});

it('re-signs stored bucket urls and leaves every other value unchanged', function () {
$filesystem = bind_file_model_filesystem([
'filesystems.disks.s3.bucket' => 'fleetbase-production-media',
'filesystems.disks.s3.bucket' => 'example-media',
]);

$stored = 'https://fleetbase-production-media.s3.ap-southeast-1.amazonaws.com/custom-avatars/vehicles/c/van.png?X-Amz-Expires=7200&X-Amz-Signature=expired';
$stored = 'https://example-media.s3.ap-southeast-1.amazonaws.com/custom-avatars/vehicles/c/van.png?X-Amz-Expires=7200&X-Amz-Signature=expired';

expect(File::signStoredUrl($stored))->toBe('https://s3.example.test/custom-avatars/vehicles/c/van.png?temporary=1')
->and($filesystem->disk('s3')->temporaryUrls)->toHaveKey('custom-avatars/vehicles/c/van.png')
Expand Down
Loading