archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-06-21 07:24:05 +00:00
Code Activity

Make hardening work with all db/schema managers

Browse source 
Previously, hardening only worked with databases, not with schemas. Also test that hardening works with all relevant db managers.
This commit is contained in:
lukinovec 2026-06-10 13:17:17 +02:00
parent b743720c7c
commit 34d19e94e2
6 changed files with 76 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Bootstrappers/DatabaseTenancyBootstrapper.php
View file

@ -90,7 +90,9 @@ class DatabaseTenancyBootstrapper implements TenancyBootstrapper
protected function verifyTenantCanUseDatabase(Tenant $tenant): void
{
/** @var \Stancl\Tenancy\Database\Models\Tenant&TenantWithDatabase $tenant */
$tenantDbName = $tenant->database()->getName();
$tenantDbConfig = $tenant->database();
$tenantDbName = $tenantDbConfig->getName();
// Check that no other tenant uses this tenant's database
if ($tenant::where($tenant->getTenantKeyName(), '!=', $tenant->getTenantKey())
@ -99,13 +101,14 @@ class DatabaseTenancyBootstrapper implements TenancyBootstrapper
throw new RuntimeException('Tenant cannot use a database of another tenant.');
}
$centralDbName = DB::connection(
config('tenancy.database.central_connection', 'central')
)->getDatabaseName();
$manager = $tenantDbConfig->manager();
if (DB::getDatabaseName() === $centralDbName) {
// Throw if the current database is central.
// DB::getDatabaseName() is the current DB name, which should not be central at this point.
$centralConnection = DB::connection(config('tenancy.database.central_connection', 'central'));
$currentConnection = DB::connection();
// Throw if the current database/schema is central.
// At this point the connection should be the tenant's, so it should not match central.
if ($manager->getCurrentDatabaseName($currentConnection) === $manager->getCurrentDatabaseName($centralConnection)) {
throw new RuntimeException('Tenant cannot use the central database.');
}
}