archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-06-20 22:54:05 +00:00
Code Activity

Improve hardening

Browse source 
Make hardening work correctly even for named SQLite DBs, also make the related test test named SQLite DBs instead of just MySQL (the SQLite dataset fails when the DatabaseTenancyBootstrapper changes get reverted).
This commit is contained in:
lukinovec 2026-06-09 09:53:26 +02:00
parent 7972da5475
commit 540e3635e2
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Bootstrappers/DatabaseTenancyBootstrapper.php
View file

@ -90,11 +90,11 @@ class DatabaseTenancyBootstrapper implements TenancyBootstrapper
protected function verifyTenantCanUseDatabase(Tenant $tenant): void
{
/** @var \Stancl\Tenancy\Database\Models\Tenant $tenant */
$dbName = DB::getDatabaseName();
$tenantDbName = $tenant->database()->getName();
// Check if any other tenant uses this tenant's database
if ($tenant::where($tenant->getTenantKeyName(), '!=', $tenant->getTenantKey())
->where($tenant::getDataColumn() . '->' . $tenant->internalPrefix() . 'db_name', $dbName)
->where($tenant::getDataColumn() . '->' . $tenant->internalPrefix() . 'db_name', $tenantDbName)
->exists()) {
throw new RuntimeException('Tenant cannot use a database of another tenant.');
}
@ -104,7 +104,7 @@ class DatabaseTenancyBootstrapper implements TenancyBootstrapper
config('tenancy.database.central_connection', 'central')
)->getDatabaseName();
if ($dbName === $centralDbName) {
if (DB::getDatabaseName() === $centralDbName) {
throw new RuntimeException('Tenant cannot use the central database.');
}
}

17
tests/Bootstrappers/DatabaseTenancyBootstrapperTest.php
View file

@ -63,7 +63,7 @@ test('harden prevents tenants from using the central database', function ($harde
'hardening disabled' => false,
]);
test('harden prevents tenants from using a database of another tenant', function ($harden) {
test('harden prevents tenants from using a database of another tenant', function (bool $harden, string $connection) {
config([
'tenancy.bootstrappers' => [DatabaseTenancyBootstrapper::class],
]);
@ -74,15 +74,13 @@ test('harden prevents tenants from using a database of another tenant', function
return $event->tenant;
})->toListener());
$tenant = Tenant::create();
$tenant = Tenant::create(['tenancy_db_connection' => $connection]);
Tenant::create([
'tenancy_db_name' => $tenantDbName = 'foo' . Str::random(8),
]);
$dbName = Str::random(8) . ($connection === 'sqlite' ? '.sqlite' : '');
$tenant->update([
'tenancy_db_name' => $tenantDbName, // Database of another tenant
]);
Tenant::create(['tenancy_db_name' => $dbName, 'tenancy_db_connection' => $connection]);
$tenant->update(['tenancy_db_name' => $dbName]);
if ($harden) {
// Harden blocks initialization for tenants that use a database of another tenant
@ -99,6 +97,9 @@ test('harden prevents tenants from using a database of another tenant', function
})->with([
'hardening enabled' => true,
'hardening disabled' => false,
])->with([
'mysql' => 'mysql',
'named sqlite' => 'sqlite',
]);
test('database tenancy bootstrapper throws an exception if DATABASE_URL is set', function (string|null $databaseUrl) {