mirror of
https://github.com/archtechx/tenancy.git
synced 2026-06-20 22:54:05 +00:00
Make hardening work with all db/schema managers
Previously, hardening only worked with databases, not with schemas. Also test that hardening works with all relevant db managers.
This commit is contained in:
parent
b743720c7c
commit
34d19e94e2
6 changed files with 76 additions and 20 deletions
|
|
@ -90,7 +90,9 @@ class DatabaseTenancyBootstrapper implements TenancyBootstrapper
|
||||||
protected function verifyTenantCanUseDatabase(Tenant $tenant): void
|
protected function verifyTenantCanUseDatabase(Tenant $tenant): void
|
||||||
{
|
{
|
||||||
/** @var \Stancl\Tenancy\Database\Models\Tenant&TenantWithDatabase $tenant */
|
/** @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
|
// Check that no other tenant uses this tenant's database
|
||||||
if ($tenant::where($tenant->getTenantKeyName(), '!=', $tenant->getTenantKey())
|
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.');
|
throw new RuntimeException('Tenant cannot use a database of another tenant.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$centralDbName = DB::connection(
|
$manager = $tenantDbConfig->manager();
|
||||||
config('tenancy.database.central_connection', 'central')
|
|
||||||
)->getDatabaseName();
|
|
||||||
|
|
||||||
if (DB::getDatabaseName() === $centralDbName) {
|
$centralConnection = DB::connection(config('tenancy.database.central_connection', 'central'));
|
||||||
// Throw if the current database is central.
|
$currentConnection = DB::connection();
|
||||||
// DB::getDatabaseName() is the current DB name, which should not be central at this point.
|
|
||||||
|
// 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.');
|
throw new RuntimeException('Tenant cannot use the central database.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Stancl\Tenancy\Database\Contracts;
|
namespace Stancl\Tenancy\Database\Contracts;
|
||||||
|
|
||||||
|
use Illuminate\Database\Connection;
|
||||||
|
|
||||||
interface TenantDatabaseManager
|
interface TenantDatabaseManager
|
||||||
{
|
{
|
||||||
/** Create a database. */
|
/** Create a database. */
|
||||||
|
|
@ -17,4 +19,12 @@ interface TenantDatabaseManager
|
||||||
|
|
||||||
/** Construct a DB connection config array. */
|
/** Construct a DB connection config array. */
|
||||||
public function makeConnectionConfig(array $baseConfig, string $databaseName): array;
|
public function makeConnectionConfig(array $baseConfig, string $databaseName): array;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the schema/database name that the given connection points to.
|
||||||
|
*
|
||||||
|
* In database managers, this should return the *database* name of the passed connection,
|
||||||
|
* while in schema managers, this should return the *schema* name of the passed connection.
|
||||||
|
*/
|
||||||
|
public function getCurrentDatabaseName(Connection $connection): string;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Stancl\Tenancy\Database\TenantDatabaseManagers;
|
namespace Stancl\Tenancy\Database\TenantDatabaseManagers;
|
||||||
|
|
||||||
|
use Illuminate\Database\Connection;
|
||||||
use Stancl\Tenancy\Database\Contracts\TenantWithDatabase;
|
use Stancl\Tenancy\Database\Contracts\TenantWithDatabase;
|
||||||
|
|
||||||
class PostgreSQLSchemaManager extends TenantDatabaseManager
|
class PostgreSQLSchemaManager extends TenantDatabaseManager
|
||||||
|
|
@ -37,4 +38,10 @@ class PostgreSQLSchemaManager extends TenantDatabaseManager
|
||||||
|
|
||||||
return $baseConfig;
|
return $baseConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getCurrentDatabaseName(Connection $connection): string
|
||||||
|
{
|
||||||
|
// Get the *schema* name (not the database name)
|
||||||
|
return $connection->selectOne('SELECT current_schema() AS schema')->schema;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ declare(strict_types=1);
|
||||||
namespace Stancl\Tenancy\Database\TenantDatabaseManagers;
|
namespace Stancl\Tenancy\Database\TenantDatabaseManagers;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
|
use Illuminate\Database\Connection;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use PDO;
|
use PDO;
|
||||||
|
|
@ -149,6 +150,11 @@ class SQLiteDatabaseManager implements TenantDatabaseManager
|
||||||
return $baseConfig;
|
return $baseConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getCurrentDatabaseName(Connection $connection): string
|
||||||
|
{
|
||||||
|
return $connection->getDatabaseName();
|
||||||
|
}
|
||||||
|
|
||||||
public function getPath(string $name): string
|
public function getPath(string $name): string
|
||||||
{
|
{
|
||||||
$this->validateDatabaseName($name);
|
$this->validateDatabaseName($name);
|
||||||
|
|
|
||||||
|
|
@ -37,4 +37,9 @@ abstract class TenantDatabaseManager implements StatefulTenantDatabaseManager
|
||||||
|
|
||||||
return $baseConfig;
|
return $baseConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getCurrentDatabaseName(Connection $connection): string
|
||||||
|
{
|
||||||
|
return $connection->getDatabaseName();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,10 @@ use Stancl\Tenancy\Tests\Etc\Tenant;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Database\QueryException;
|
use Illuminate\Database\QueryException;
|
||||||
|
use Stancl\Tenancy\Database\TenantDatabaseManagers\MySQLDatabaseManager;
|
||||||
|
use Stancl\Tenancy\Database\TenantDatabaseManagers\SQLiteDatabaseManager;
|
||||||
|
use Stancl\Tenancy\Database\TenantDatabaseManagers\PostgreSQLDatabaseManager;
|
||||||
|
use Stancl\Tenancy\Database\TenantDatabaseManagers\PostgreSQLSchemaManager;
|
||||||
|
|
||||||
use function Stancl\Tenancy\Tests\pest;
|
use function Stancl\Tenancy\Tests\pest;
|
||||||
|
|
||||||
|
|
@ -29,9 +33,21 @@ beforeEach(function () use ($cleanup) {
|
||||||
|
|
||||||
afterEach($cleanup);
|
afterEach($cleanup);
|
||||||
|
|
||||||
test('harden prevents tenants from using the central database', function ($harden) {
|
test('harden prevents tenants from using the central database', function (bool $harden, string $connection, string $manager) {
|
||||||
config([
|
config([
|
||||||
'tenancy.bootstrappers' => [DatabaseTenancyBootstrapper::class],
|
'tenancy.bootstrappers' => [DatabaseTenancyBootstrapper::class],
|
||||||
|
"tenancy.database.managers.{$connection}" => $manager,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Set up and migrate the central database
|
||||||
|
$centralConnection = config('tenancy.database.central_connection');
|
||||||
|
DB::purge($centralConnection);
|
||||||
|
config(["database.connections.{$centralConnection}" => config("database.connections.{$connection}")]);
|
||||||
|
|
||||||
|
pest()->artisan('migrate:fresh', [
|
||||||
|
'--force' => true,
|
||||||
|
'--path' => __DIR__ . '/../../assets/migrations',
|
||||||
|
'--realpath' => true,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
DatabaseTenancyBootstrapper::$harden = $harden;
|
DatabaseTenancyBootstrapper::$harden = $harden;
|
||||||
|
|
@ -40,20 +56,20 @@ test('harden prevents tenants from using the central database', function ($harde
|
||||||
return $event->tenant;
|
return $event->tenant;
|
||||||
})->toListener());
|
})->toListener());
|
||||||
|
|
||||||
$tenant = Tenant::create();
|
// Create the tenant with its own database, then repoint it at the central database/schema.
|
||||||
|
$tenant = Tenant::create(['tenancy_db_connection' => $connection]);
|
||||||
$tenant->update([
|
$tenant->update([
|
||||||
'tenancy_db_name' => config('database.connections.central.database'), // Central database name
|
'tenancy_db_name' => $tenant->database()->manager()->getCurrentDatabaseName(DB::connection($centralConnection)),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($harden) {
|
if ($harden) {
|
||||||
// Harden blocks initialization for tenants that use central database
|
// Harden blocks initialization for tenants that use the central database
|
||||||
expect(fn () => tenancy()->initialize($tenant))->toThrow(RuntimeException::class);
|
expect(fn () => tenancy()->initialize($tenant))->toThrow(RuntimeException::class);
|
||||||
|
|
||||||
// Connection should be reverted back to central
|
// Connection should be reverted back to central
|
||||||
expect(DB::connection()->getName())->toBe('central');
|
expect(DB::connection()->getName())->toBe($centralConnection);
|
||||||
} else {
|
} else {
|
||||||
expect(fn() => tenancy()->initialize($tenant))->not()->toThrow(Throwable::class);
|
expect(fn () => tenancy()->initialize($tenant))->not()->toThrow(Throwable::class);
|
||||||
|
|
||||||
// Connection not reverted to central
|
// Connection not reverted to central
|
||||||
expect(DB::connection()->getName())->toBe('tenant');
|
expect(DB::connection()->getName())->toBe('tenant');
|
||||||
|
|
@ -61,11 +77,12 @@ test('harden prevents tenants from using the central database', function ($harde
|
||||||
})->with([
|
})->with([
|
||||||
'hardening enabled' => true,
|
'hardening enabled' => true,
|
||||||
'hardening disabled' => false,
|
'hardening disabled' => false,
|
||||||
]);
|
])->with('db_managers');
|
||||||
|
|
||||||
test('harden prevents tenants from using a database of another tenant', function (bool $harden, string $connection) {
|
test('harden prevents tenants from using a database of another tenant', function (bool $harden, string $connection, string $manager) {
|
||||||
config([
|
config([
|
||||||
'tenancy.bootstrappers' => [DatabaseTenancyBootstrapper::class],
|
'tenancy.bootstrappers' => [DatabaseTenancyBootstrapper::class],
|
||||||
|
"tenancy.database.managers.{$connection}" => $manager,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
DatabaseTenancyBootstrapper::$harden = $harden;
|
DatabaseTenancyBootstrapper::$harden = $harden;
|
||||||
|
|
@ -97,10 +114,7 @@ test('harden prevents tenants from using a database of another tenant', function
|
||||||
})->with([
|
})->with([
|
||||||
'hardening enabled' => true,
|
'hardening enabled' => true,
|
||||||
'hardening disabled' => false,
|
'hardening disabled' => false,
|
||||||
])->with([
|
])->with('db_managers');
|
||||||
'mysql' => 'mysql',
|
|
||||||
'named sqlite' => 'sqlite',
|
|
||||||
]);
|
|
||||||
|
|
||||||
test('database tenancy bootstrapper throws an exception if DATABASE_URL is set', function (string|null $databaseUrl) {
|
test('database tenancy bootstrapper throws an exception if DATABASE_URL is set', function (string|null $databaseUrl) {
|
||||||
config(['database.connections.central.url' => $databaseUrl]);
|
config(['database.connections.central.url' => $databaseUrl]);
|
||||||
|
|
@ -123,3 +137,14 @@ test('database tenancy bootstrapper throws an exception if DATABASE_URL is set',
|
||||||
})->not()->toThrow(Throwable::class);
|
})->not()->toThrow(Throwable::class);
|
||||||
}
|
}
|
||||||
})->with(['abc.us-east-1.rds.amazonaws.com', null]);
|
})->with(['abc.us-east-1.rds.amazonaws.com', null]);
|
||||||
|
|
||||||
|
// Database managers to test with hardening.
|
||||||
|
// Permission controlled managers omitted as they inherit the non-perm controlled managers (= they share the same code paths),
|
||||||
|
// each important code path is covered by testing the non-permission controlled manager, so adding permission controlled managers
|
||||||
|
// would add unnecessary complexity to the tests.
|
||||||
|
dataset('db_managers', [
|
||||||
|
'mysql' => ['mysql', MySQLDatabaseManager::class],
|
||||||
|
'pgsql (database)' => ['pgsql', PostgreSQLDatabaseManager::class],
|
||||||
|
'pgsql (schema)' => ['pgsql', PostgreSQLSchemaManager::class],
|
||||||
|
'sqlite' => ['sqlite', SQLiteDatabaseManager::class],
|
||||||
|
]);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue