archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-06-21 01:54:03 +00:00
Code Activity

Convert allowlist methods into static properties

Browse source
This commit is contained in:
lukinovec 2026-06-09 10:03:44 +02:00
parent 93f77a5881
commit 1ae7d58fab
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Database/Concerns/ValidatesDatabaseParameters.php
View file

@ -27,10 +27,7 @@ trait ValidatesDatabaseParameters
* Since non-password parameters don't need to use as many special characters, we use * Since non-password parameters don't need to use as many special characters, we use
* a stricter allowlist here. * a stricter allowlist here.
*/ */
protected function allowedParameterCharacters(): string public static string $allowedParameterCharacters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-';
{
return 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-';
}
/** /**
* Characters allowed in database user passwords. * Characters allowed in database user passwords.
@ -38,10 +35,7 @@ trait ValidatesDatabaseParameters
* The allowlist for passwords is less strict than for other parameters * The allowlist for passwords is less strict than for other parameters
* because it's more common to use more special characters in passwords. * because it's more common to use more special characters in passwords.
*/ */
protected function allowedPasswordCharacters(): string public static string $allowedPasswordCharacters = ' !#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~';
{
return ' !#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~';
}
/** /**
* Ensure that parameters (database names, usernames, etc.) * Ensure that parameters (database names, usernames, etc.)
@ -58,7 +52,7 @@ trait ValidatesDatabaseParameters
throw new InvalidArgumentException('Parameter cannot be null.'); throw new InvalidArgumentException('Parameter cannot be null.');
} }
$allowedCharacters ??= $this->allowedParameterCharacters(); $allowedCharacters ??= static::$allowedParameterCharacters;
foreach (Arr::wrap($parameters) as $parameter) { foreach (Arr::wrap($parameters) as $parameter) {
if (is_null($parameter)) { if (is_null($parameter)) {
@ -93,6 +87,6 @@ trait ValidatesDatabaseParameters
*/ */
protected function validatePassword(string|null $password): void protected function validatePassword(string|null $password): void
{ {
$this->validateParameter($password, allowedCharacters: $this->allowedPasswordCharacters()); $this->validateParameter($password, allowedCharacters: static::$allowedPasswordCharacters);
} }
} }

7
src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php
View file

@ -66,10 +66,7 @@ class SQLiteDatabaseManager implements TenantDatabaseManager
* *
* Includes dots to support file extensions (e.g. '.sqlite'). * Includes dots to support file extensions (e.g. '.sqlite').
*/ */
protected static function allowedDatabaseNameCharacters(): string public static string $allowedDatabaseNameCharacters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-.';
{
return 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-.';
}
public function createDatabase(TenantWithDatabase $tenant): bool public function createDatabase(TenantWithDatabase $tenant): bool
{ {
@ -179,7 +176,7 @@ class SQLiteDatabaseManager implements TenantDatabaseManager
*/ */
protected function validateDatabaseName(string $name, string $extraAllowedCharacters = ''): void protected function validateDatabaseName(string $name, string $extraAllowedCharacters = ''): void
{ {
$this->validateParameter($name, $this->allowedDatabaseNameCharacters() . $extraAllowedCharacters); $this->validateParameter($name, static::$allowedDatabaseNameCharacters . $extraAllowedCharacters);
if ($name === '') { if ($name === '') {
throw new InvalidArgumentException('Database name cannot be empty.'); throw new InvalidArgumentException('Database name cannot be empty.');