Merge branch '1.9.x' into console-presence-signature-change

This commit is contained in:
ArnabChatterjee20k authored and GitHub committed 2026-05-27 12:28:20 +05:30
commit aa23e03b7a
7 files changed
+394 -569

No files matched your search

+51 -119
View File
@@ -1,5 +1,6 @@
<?php
use Appwrite\Database\Factory as DatabaseFactory;
use Appwrite\Event\Event;
use Appwrite\Event\Publisher\Audit as AuditPublisher;
use Appwrite\Event\Publisher\Build as BuildPublisher;
@@ -15,7 +16,6 @@ use Appwrite\Event\Publisher\Screenshot as ScreenshotPublisher;
use Appwrite\Event\Publisher\StatsResources as StatsResourcesPublisher;
use Appwrite\Event\Publisher\Usage as UsagePublisher;
use Appwrite\Platform\Modules\Storage\Config\StorageCacheControl;
use Appwrite\Utopia\Database\Documents\User;
use Executor\Executor;
use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
use Utopia\Cache\Adapter\Pool as CachePool;
@@ -23,8 +23,6 @@ use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache;
use Utopia\Config\Config;
use Utopia\Console;
use Utopia\Database\Adapter\Pool as DatabasePool;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Validator\Authorization;
use Utopia\DI\Container;
@@ -48,17 +46,29 @@ use Utopia\Telemetry\Adapter as Telemetry;
use Utopia\Telemetry\Adapter\None as NoTelemetry;
use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;
// Runtime Execution
global $register;
global $container;
$container = new Container();
$container->set('register', fn () => $register);
$container->set('logger', fn ($register) => $register->get('logger'), ['register']);
$container->set('hooks', fn ($register) => $register->get('hooks'), ['register']);
$container->set('console', fn () => new Document(Config::getParam('console')), []);
$container->set('platform', fn () => Config::getParam('platform', []), []);
$container->set('localeCodes', fn () => array_map(fn ($locale) => $locale['code'], Config::getParam('locale-codes', [])));
$container->set('executor', fn () => new Executor(), []);
$container->set('telemetry', fn () => new NoTelemetry(), []);
$container->set('authorization', fn () => new Authorization(), []);
$container->set('publisher', fn (Group $pools) => new BrokerPool(publisher: $pools->get('publisher')), ['pools']);
$container->set('publisherDatabases', fn (Publisher $publisher) => $publisher, ['publisher']);
@@ -140,85 +150,36 @@ $container->set('publisherForMessaging', fn (Publisher $publisher) => new Messag
new Queue(System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME))
), ['publisher']);
$container->set('logger', function ($register) {
return $register->get('logger');
}, ['register']);
$container->set('databaseFactory', fn (Group $pools, Cache $cache, Authorization $authorization) => new DatabaseFactory(
$pools,
$cache,
$authorization
), ['pools', 'cache', 'authorization']);
$container->set('hooks', function ($register) {
return $register->get('hooks');
}, ['register']);
$container->set('dbForPlatform', fn (DatabaseFactory $databaseFactory) => $databaseFactory->platform(
APP_DATABASE_TIMEOUT_MILLISECONDS_API,
APP_DATABASE_QUERY_MAX_VALUES,
['host' => \gethostname(), 'project' => 'console']
), ['databaseFactory']);
$container->set('register', fn () => $register);
$container->set('localeCodes', function () {
return array_map(fn ($locale) => $locale['code'], Config::getParam('locale-codes', []));
});
/**
* Platform configuration
*/
$container->set('platform', function () {
return Config::getParam('platform', []);
}, []);
$container->set('authorization', function () {
return new Authorization();
}, []);
$container->set('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
$adapter = new DatabasePool($pools->get('console'));
$database = new Database($adapter, $cache);
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setNamespace('_console')
->setMetadata('host', \gethostname())
->setMetadata('project', 'console')
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
$database->setDocumentType('users', User::class);
return $database;
}, ['pools', 'cache', 'authorization']);
$container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
$container->set('getLogsDB', function (DatabaseFactory $databaseFactory) {
$database = null;
return function (?Document $project = null) use ($pools, $cache, $authorization, &$database) {
return function (?Document $project = null) use ($databaseFactory, &$database) {
if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
$database->setTenant($project->getSequence());
return $database;
}
$adapter = new DatabasePool($pools->get('logs'));
$database = new Database($adapter, $cache);
/** @var array $collections */
$collections = Config::getParam('collections', []);
$logsCollections = $collections['logs'] ?? [];
$logsCollections = array_keys($logsCollections);
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setSharedTables(true)
->setGlobalCollections($logsCollections)
->setNamespace('logsV1')
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
// set tenant
if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
$database->setTenant($project->getSequence());
}
$database = $databaseFactory->logs(
$project,
APP_DATABASE_TIMEOUT_MILLISECONDS_API,
APP_DATABASE_QUERY_MAX_VALUES
);
return $database;
};
}, ['pools', 'cache', 'authorization']);
}, ['databaseFactory']);
$container->set('cache', function (Group $pools, Telemetry $telemetry) {
$list = Config::getParam('pools-cache', []);
@@ -234,9 +195,7 @@ $container->set('cache', function (Group $pools, Telemetry $telemetry) {
return $cache;
}, ['pools', 'telemetry']);
$container->set('cacheControlForStorage', fn () => function (StorageCacheControl $config): string {
return \sprintf('private, max-age=%d', $config->maxAge);
});
$container->set('cacheControlForStorage', fn () => fn (StorageCacheControl $config): string => \sprintf('private, max-age=%d', $config->maxAge));
$container->set('redis', function () {
$host = System::getEnv('_APP_REDIS_HOST', 'localhost');
@@ -253,25 +212,14 @@ $container->set('redis', function () {
return $redis;
});
$container->set('locks', function (Group $pools) {
return function (string $key, int $ttl, callable $callback, float $timeout = 0.0) use ($pools): mixed {
return $pools->get('lock')->use(function (\Redis $redis) use ($key, $ttl, $callback, $timeout) {
$lock = new Distributed($redis, $key, ttl: $ttl);
$container->set('locks', fn (Group $pools) => fn (string $key, int $ttl, callable $callback, float $timeout = 0.0): mixed => $pools->get('lock')->use(
fn (\Redis $redis) => (new Distributed($redis, $key, ttl: $ttl))->withLock($callback, timeout: $timeout)
), ['pools']);
return $lock->withLock($callback, timeout: $timeout);
});
};
}, ['pools']);
$container->set('timelimit', fn (\Redis $redis) => fn (string $key, int $limit, int $time) => new TimeLimitRedis($key, $limit, $time, $redis), ['redis']);
$container->set('timelimit', function (\Redis $redis) {
return function (string $key, int $limit, int $time) use ($redis) {
return new TimeLimitRedis($key, $limit, $time, $redis);
};
}, ['redis']);
$container->set('deviceForLocal', fn (Telemetry $telemetry) => new Device\Telemetry($telemetry, new Local()), ['telemetry']);
$container->set('deviceForLocal', function (Telemetry $telemetry) {
return new Device\Telemetry($telemetry, new Local());
}, ['telemetry']);
function getDevice(string $root, string $connection = ''): Device
{
$connection = ! empty($connection) ? $connection : System::getEnv('_APP_CONNECTIONS_STORAGE', '');
@@ -299,14 +247,14 @@ function getDevice(string $root, string $connection = ''): Device
switch ($device) {
case Storage::DEVICE_S3:
if (! empty($url)) {
$bucketRoot = (! empty($bucket) ? $bucket . '/' : '') . \ltrim($root, '/');
$bucketRoot = (! empty($bucket) ? "{$bucket}/" : '') . \ltrim($root, '/');
return new S3($bucketRoot, $accessKey, $accessSecret, $url, $region, $acl);
} else {
return new AWS($root, $accessKey, $accessSecret, $bucket, $region, $acl);
}
// no break
case STORAGE::DEVICE_DO_SPACES:
case Storage::DEVICE_DO_SPACES:
$device = new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
$device->setHttpVersion(S3::HTTP_VERSION_1_1);
@@ -323,9 +271,6 @@ function getDevice(string $root, string $connection = ''): Device
}
} else {
switch (strtolower(System::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL))) {
case Storage::DEVICE_LOCAL:
default:
return new Local($root);
case Storage::DEVICE_S3:
$s3AccessKey = System::getEnv('_APP_STORAGE_S3_ACCESS_KEY', '');
$s3SecretKey = System::getEnv('_APP_STORAGE_S3_SECRET', '');
@@ -334,7 +279,7 @@ function getDevice(string $root, string $connection = ''): Device
$s3Acl = 'private';
$s3EndpointUrl = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
if (! empty($s3EndpointUrl)) {
$bucketRoot = (! empty($s3Bucket) ? $s3Bucket . '/' : '') . \ltrim($root, '/');
$bucketRoot = (! empty($s3Bucket) ? "{$s3Bucket}/" : '') . \ltrim($root, '/');
return new S3($bucketRoot, $s3AccessKey, $s3SecretKey, $s3EndpointUrl, $s3Region, $s3Acl);
} else {
@@ -375,46 +320,33 @@ function getDevice(string $root, string $connection = ''): Device
$wasabiAcl = 'private';
return new Wasabi($root, $wasabiAccessKey, $wasabiSecretKey, $wasabiBucket, $wasabiRegion, $wasabiAcl);
case Storage::DEVICE_LOCAL:
default:
return new Local($root);
}
}
}
$container->set('geodb', function ($register) {
/** @var Utopia\Registry\Registry $register */
return $register->get('geodb');
}, ['register']);
$container->set('geodb', fn ($register) => $register->get('geodb'), ['register']);
$container->set('passwordsDictionary', function ($register) {
/** @var Utopia\Registry\Registry $register */
return $register->get('passwordsDictionary');
}, ['register']);
$container->set('passwordsDictionary', fn ($register) => $register->get('passwordsDictionary'), ['register']);
$container->set('servers', function () {
$platforms = Config::getParam('sdks');
$server = $platforms[APP_SDK_PLATFORM_SERVER];
$languages = array_map(function ($language) {
return strtolower($language['name']);
}, $server['sdks']);
$languages = array_map(fn ($language) => strtolower($language['name']), $server['sdks']);
return $languages;
});
$container->set('promiseAdapter', function ($register) {
return $register->get('promiseAdapter');
}, ['register']);
$container->set('promiseAdapter', fn ($register) => $register->get('promiseAdapter'), ['register']);
$container->set('gitHub', function (Cache $cache) {
return new VcsGitHub($cache);
}, ['cache']);
$container->set('gitHub', fn (Cache $cache) => new VcsGitHub($cache), ['cache']);
$container->set('plan', function () {
return [];
});
$container->set('plan', fn () => []);
$container->set('smsRates', function () {
return [];
});
$container->set('smsRates', fn () => []);
$container->set(
'isResourceBlocked',
+46 -203
View File
@@ -3,6 +3,7 @@
use Ahc\Jwt\JWT;
use Ahc\Jwt\JWTException;
use Appwrite\Auth\Key;
use Appwrite\Database\Factory as DatabaseFactory;
use Appwrite\Databases\TransactionState;
use Appwrite\Event\Context\Audit as AuditContext;
use Appwrite\Event\Event;
@@ -33,7 +34,6 @@ use Utopia\Auth\Proofs\Token;
use Utopia\Auth\Store;
use Utopia\Cache\Cache;
use Utopia\Config\Config;
use Utopia\Database\Adapter\Pool as DatabasePool;
use Utopia\Database\Database;
use Utopia\Database\DateTime as DatabaseDateTime;
use Utopia\Database\Document;
@@ -41,7 +41,6 @@ use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\DI\Container;
use Utopia\Domains\Domain;
use Utopia\DSN\DSN;
use Utopia\Http\Http;
use Utopia\Locale\Locale;
use Utopia\Logger\Log;
@@ -116,28 +115,21 @@ return function (Container $context): void {
new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL)
), ['publisher']);
$context->set('eventProcessor', fn () => new EventProcessor(), []);
$context->set('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
$adapter = new DatabasePool($pools->get('console'));
$database = new Database($adapter, $cache);
$context->set('databaseFactory', fn (Group $pools, Cache $cache, Authorization $authorization) => new DatabaseFactory(
$pools,
$cache,
$authorization
), ['pools', 'cache', 'authorization']);
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setNamespace('_console')
->setMetadata('host', \gethostname())
->setMetadata('project', 'console')
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
$context->set('dbForPlatform', fn (DatabaseFactory $databaseFactory) => $databaseFactory->platform(
APP_DATABASE_TIMEOUT_MILLISECONDS_API,
APP_DATABASE_QUERY_MAX_VALUES,
['host' => \gethostname(), 'project' => 'console']
), ['databaseFactory']);
$database->setDocumentType('users', User::class);
$context->set('getProjectDB', function (DatabaseFactory $databaseFactory, Database $dbForPlatform) {
return $database;
}, ['pools', 'cache', 'authorization']);
$context->set('getProjectDB', function (Group $pools, Database $dbForPlatform, Cache $cache, Authorization $authorization) {
$adapters = [];
return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$adapters) {
return function (Document $project) use ($databaseFactory, $dbForPlatform) {
if ($project->isEmpty() || $project->getId() === 'console') {
return $dbForPlatform;
}
@@ -147,78 +139,25 @@ return function (Container $context): void {
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Project database is not configured');
}
try {
$dsn = new DSN($database);
} catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://' . $database);
}
$adapter = $adapters[$dsn->getHost()] ??= new DatabasePool($pools->get($dsn->getHost()));
$database = new Database($adapter, $cache);
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setMetadata('host', \gethostname())
->setMetadata('project', $project->getId())
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES)
->setDocumentType('users', User::class);
$sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
if (\in_array($dsn->getHost(), $sharedTables)) {
/** @var array $collections */
$collections = Config::getParam('collections', []);
$projectCollections = $collections['projects'] ?? [];
$projectsGlobalCollections = array_keys($projectCollections);
$projectsGlobalCollections[] = 'audit';
$database
->setSharedTables(true)
->setTenant($project->getSequence())
->setGlobalCollections($projectsGlobalCollections)
->setNamespace($dsn->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
return $database;
return $databaseFactory->project(
$project,
APP_DATABASE_TIMEOUT_MILLISECONDS_API,
APP_DATABASE_QUERY_MAX_VALUES,
['host' => \gethostname(), 'project' => $project->getId()]
);
};
}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
}, ['databaseFactory', 'dbForPlatform']);
$context->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
$adapter = null;
$context->set('getLogsDB', function (DatabaseFactory $databaseFactory) {
return function (?Document $project = null) use ($pools, $cache, $authorization, &$adapter) {
/** @var array $collections */
$collections = Config::getParam('collections', []);
$logsCollections = $collections['logs'] ?? [];
$logsCollections = array_keys($logsCollections);
$adapter ??= new DatabasePool($pools->get('logs'));
$database = new Database($adapter, $cache);
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setSharedTables(true)
->setGlobalCollections($logsCollections)
->setNamespace('logsV1')
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
$database->setTenant($project->getSequence());
}
return $database;
return function (?Document $project = null) use ($databaseFactory) {
return $databaseFactory->logs(
$project,
APP_DATABASE_TIMEOUT_MILLISECONDS_API,
APP_DATABASE_QUERY_MAX_VALUES
);
};
}, ['pools', 'cache', 'authorization']);
}, ['databaseFactory']);
/**
* List of allowed request hostnames for the request.
@@ -636,7 +575,7 @@ return function (Container $context): void {
return;
}, ['user', 'store', 'proofForToken']);
$context->set('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, FunctionPublisher $publisherForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, UsageContext $usage, Authorization $authorization, Request $request) {
$context->set('dbForProject', function (DatabaseFactory $databaseFactory, Database $dbForPlatform, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, FunctionPublisher $publisherForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, UsageContext $usage, Request $request) {
if ($project->isEmpty() || $project->getId() === 'console') {
return $dbForPlatform;
}
@@ -646,45 +585,12 @@ return function (Container $context): void {
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Project database is not configured');
}
try {
$dsn = new DSN($database);
} catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://' . $database);
}
$adapter = new DatabasePool($pools->get($dsn->getHost()));
$database = new Database($adapter, $cache);
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setMetadata('host', \gethostname())
->setMetadata('project', $project->getId())
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
$database->setDocumentType('users', User::class);
$sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
if (\in_array($dsn->getHost(), $sharedTables)) {
/** @var array $collections */
$collections = Config::getParam('collections', []);
$projectCollections = $collections['projects'] ?? [];
$projectsGlobalCollections = array_keys($projectCollections);
$projectsGlobalCollections[] = 'audit';
$database
->setSharedTables(true)
->setGlobalCollections($projectsGlobalCollections)
->setTenant($project->getSequence())
->setNamespace($dsn->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
$database = $databaseFactory->project(
$project,
APP_DATABASE_TIMEOUT_MILLISECONDS_API,
APP_DATABASE_QUERY_MAX_VALUES,
['host' => \gethostname(), 'project' => $project->getId()]
);
/**
* This isolated event handling for `users.*.create` which is based on a `Database::EVENT_DOCUMENT_CREATE` listener may look odd, but it is **intentional**.
@@ -915,7 +821,7 @@ return function (Container $context): void {
->on(Database::EVENT_DOCUMENT_DELETE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database));
return $database;
}, ['pools', 'dbForPlatform', 'cache', 'project', 'response', 'publisher', 'publisherFunctions', 'publisherWebhooks', 'queueForEvents', 'publisherForFunctions', 'queueForWebhooks', 'queueForRealtime', 'usage', 'authorization', 'request']);
}, ['databaseFactory', 'dbForPlatform', 'project', 'response', 'publisher', 'publisherFunctions', 'publisherWebhooks', 'queueForEvents', 'publisherForFunctions', 'queueForWebhooks', 'queueForRealtime', 'usage', 'request']);
$context->set('schema', function ($utopia, $dbForProject, $authorization) {
@@ -1251,82 +1157,19 @@ return function (Container $context): void {
return new Document([]);
}, ['project', 'dbForProject', 'request', 'authorization']);
$context->set('getDatabasesDB', function (Group $pools, Cache $cache, Document $project, Request $request, UsageContext $usage, Authorization $authorization) {
$context->set('getDatabasesDB', function (DatabaseFactory $databaseFactory, Document $project, Request $request, UsageContext $usage) {
return function (Document $database) use ($pools, $cache, $project, $request, $usage, $authorization): Database {
$databaseDSN = $database->getAttribute('database') ?: $project->getAttribute('database', '');
return function (Document $database) use ($databaseFactory, $project, $request, $usage): Database {
$databaseType = $database->getAttribute('type', '');
try {
$databaseDSN = new DSN($databaseDSN);
} catch (\InvalidArgumentException) {
// for old databases migrated through patch script
// databaseDSN determines the adapter
$databaseDSN = new DSN('mysql://' . $databaseDSN);
}
try {
$dsn = new DSN($project->getAttribute('database'));
} catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://' . $project->getAttribute('database'));
}
$database = $databaseFactory->tenant(
$database,
$project,
APP_DATABASE_TIMEOUT_MILLISECONDS_API,
APP_DATABASE_QUERY_MAX_VALUES,
['host' => \gethostname(), 'project' => $project->getId()]
);
$databaseHost = $databaseDSN->getHost();
$pool = $pools->get($databaseHost);
$adapter = new DatabasePool($pool);
$database = new Database($adapter, $cache);
$sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));
/** @var array $collections */
$collections = Config::getParam('collections', []);
$projectCollections = $collections['projects'] ?? [];
$projectsGlobalCollections = array_keys($projectCollections);
$projectsGlobalCollections[] = 'audit';
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setMetadata('host', \gethostname())
->setMetadata('project', $project->getId())
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
// inside pools authorization needs to be set first
$database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
// For separate pools (documentsdb/vectorsdb), check their own shared tables config.
// If not configured, use dedicated mode to avoid cross-engine tenant type mismatches.
if ($databaseHost !== $dsn->getHost()) {
$dbTypeSharedTables = match ($databaseType) {
DOCUMENTSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''))),
VECTORSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''))),
default => [],
};
if (\in_array($databaseHost, $dbTypeSharedTables)) {
$database
->setSharedTables(true)
->setGlobalCollections($projectsGlobalCollections)
->setTenant($project->getSequence())
->setNamespace($databaseDSN->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
} elseif (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setGlobalCollections($projectsGlobalCollections)
->setTenant($project->getSequence())
->setNamespace($dsn->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
$timeout = \intval($request->getHeader('x-appwrite-timeout'));
if (!empty($timeout) && Http::isDevelopment()) {
$database->setTimeout($timeout);
@@ -1411,7 +1254,7 @@ return function (Container $context): void {
return $database;
};
}, ['pools', 'cache', 'project', 'request', 'usage', 'authorization']);
}, ['databaseFactory', 'project', 'request', 'usage']);
$context->set(
'transactionState',
+39 -231
View File
@@ -1,22 +1,19 @@
<?php
use Appwrite\Database\Factory as DatabaseFactory;
use Appwrite\Event\Event;
use Appwrite\Event\Realtime;
use Appwrite\Event\Webhook;
use Appwrite\Usage\Context;
use Appwrite\Utopia\Database\Documents\User;
use Utopia\Audit\Adapter\Database as AdapterDatabase;
use Utopia\Audit\Audit as UtopiaAudit;
use Utopia\Cache\Cache;
use Utopia\Config\Config;
use Utopia\Console;
use Utopia\Database\Adapter\Pool as DatabasePool;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Validator\Authorization;
use Utopia\DI\Container;
use Utopia\DSN\DSN;
use Utopia\Logger\Log;
use Utopia\Pools\Group;
use Utopia\Queue\Publisher;
@@ -42,18 +39,13 @@ return function (Container $container): void {
return $authorization;
}, []);
$container->set('dbForPlatform', function (Cache $cache, Group $pools, Authorization $authorization) {
$adapter = new DatabasePool($pools->get('console'));
$dbForPlatform = new Database($adapter, $cache);
$container->set('databaseFactory', fn (Group $pools, Cache $cache, Authorization $authorization) => new DatabaseFactory(
$pools,
$cache,
$authorization
), ['pools', 'cache', 'authorization']);
$dbForPlatform
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setNamespace('_console')
->setDocumentType('users', User::class);
return $dbForPlatform;
}, ['cache', 'pools', 'authorization']);
$container->set('dbForPlatform', fn (DatabaseFactory $databaseFactory) => $databaseFactory->platform(), ['databaseFactory']);
$container->set('project', function ($message, Database $dbForPlatform) {
$payload = $message->getPayload() ?? [];
@@ -66,247 +58,63 @@ return function (Container $container): void {
return $dbForPlatform->getDocument('projects', $project->getId());
}, ['message', 'dbForPlatform']);
$container->set('dbForProject', function (Cache $cache, Group $pools, Document $project, Database $dbForPlatform, Authorization $authorization) {
if ($project->isEmpty() || $project->getId() === 'console') {
return $dbForPlatform;
}
$container->set('dbForProject', fn (DatabaseFactory $databaseFactory, Document $project, Database $dbForPlatform) => $project->isEmpty() || $project->getId() === 'console'
? $dbForPlatform
: $databaseFactory->project(
$project,
APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER,
), ['databaseFactory', 'project', 'dbForPlatform']);
try {
$dsn = new DSN($project->getAttribute('database'));
} catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://' . $project->getAttribute('database'));
}
$adapter = new DatabasePool($pools->get($dsn->getHost()));
$database = new Database($adapter, $cache);
$database->setDocumentType('users', User::class);
$sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
if (\in_array($dsn->getHost(), $sharedTables)) {
/** @var array $collections */
$collections = Config::getParam('collections', []);
$projectCollections = $collections['projects'] ?? [];
$projectsGlobalCollections = array_keys($projectCollections);
$projectsGlobalCollections[] = 'audit';
$database
->setSharedTables(true)
->setGlobalCollections($projectsGlobalCollections)
->setTenant($project->getSequence())
->setNamespace($dsn->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
return $database;
}, ['cache', 'pools', 'project', 'dbForPlatform', 'authorization']);
$container->set('getProjectDB', function (Group $pools, Database $dbForPlatform, Cache $cache, Authorization $authorization) {
$databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases): Database {
$container->set('getProjectDB', function (DatabaseFactory $databaseFactory, Database $dbForPlatform) {
return function (Document $project) use ($databaseFactory, $dbForPlatform): Database {
if ($project->isEmpty() || $project->getId() === 'console') {
return $dbForPlatform;
}
try {
$dsn = new DSN($project->getAttribute('database'));
} catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://' . $project->getAttribute('database'));
}
if (isset($databases[$dsn->getHost()])) {
$database = $databases[$dsn->getHost()];
$database->setAuthorization($authorization);
$sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
if (\in_array($dsn->getHost(), $sharedTables)) {
/** @var array $collections */
$collections = Config::getParam('collections', []);
$projectCollections = $collections['projects'] ?? [];
$projectsGlobalCollections = array_keys($projectCollections);
$projectsGlobalCollections[] = 'audit';
$database
->setSharedTables(true)
->setGlobalCollections($projectsGlobalCollections)
->setTenant($project->getSequence())
->setNamespace($dsn->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
return $database;
}
$adapter = new DatabasePool($pools->get($dsn->getHost()));
$database = new Database($adapter, $cache);
$databases[$dsn->getHost()] = $database;
$sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
if (\in_array($dsn->getHost(), $sharedTables)) {
/** @var array $collections */
$collections = Config::getParam('collections', []);
$projectCollections = $collections['projects'] ?? [];
$projectsGlobalCollections = array_keys($projectCollections);
$projectsGlobalCollections[] = 'audit';
$database
->setSharedTables(true)
->setGlobalCollections($projectsGlobalCollections)
->setTenant($project->getSequence())
->setNamespace($dsn->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
return $database;
return $databaseFactory->project(
$project,
APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER
);
};
}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
}, ['databaseFactory', 'dbForPlatform']);
$container->set('getDatabasesDB', function (Cache $cache, Registry $register, Document $project, Authorization $authorization) {
return function (Document $database, ?Document $projectDocument = null) use ($cache, $register, $project, $authorization): Database {
$container->set('getDatabasesDB', function (DatabaseFactory $databaseFactory, Document $project) {
return function (Document $database, ?Document $projectDocument = null) use ($databaseFactory, $project): Database {
$projectDocument ??= $project;
$databaseDSN = $database->getAttribute('database', $project->getAttribute('database', ''));
$databaseType = $database->getAttribute('type', '');
// Backwards-compatibility: older or seeded legacy databases may not have a DSN stored
// in the "database" attribute. In that case, fall back to the project's database DSN.
if ($databaseDSN === '') {
$databaseDSN = $projectDocument->getAttribute('database', '');
}
$databaseConfig = $database->getAttribute('database', '') === ''
? new Document(\array_merge($database->getArrayCopy(), ['database' => $projectDocument->getAttribute('database', '')]))
: $database;
try {
$databaseDSN = new DSN($databaseDSN);
} catch (\InvalidArgumentException) {
$databaseDSN = new DSN('mysql://' . $databaseDSN);
}
try {
$dsn = new DSN($projectDocument->getAttribute('database'));
} catch (\InvalidArgumentException) {
// Temporary fallback until all projects use shared tables
$dsn = new DSN('mysql://' . $projectDocument->getAttribute('database'));
}
$pools = $register->get('pools');
$databaseHost = $databaseDSN->getHost();
$pool = $pools->get($databaseHost);
$adapter = new DatabasePool($pool);
$database = new Database($adapter, $cache);
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization);
$database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
$sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));
/** @var array $collections */
$collections = Config::getParam('collections', []);
$projectCollections = $collections['projects'] ?? [];
$projectsGlobalCollections = array_keys($projectCollections);
$projectsGlobalCollections[] = 'audit';
$database->setGlobalCollections($projectsGlobalCollections);
// For separate pools (documentsdb/vectorsdb), check their own shared tables config.
// If not configured, use dedicated mode to avoid cross-engine tenant type mismatches.
if ($databaseHost !== $dsn->getHost()) {
$dbTypeSharedTables = match ($databaseType) {
DOCUMENTSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''))),
VECTORSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''))),
default => [],
};
if (\in_array($databaseHost, $dbTypeSharedTables)) {
$database
->setSharedTables(true)
->setGlobalCollections($projectsGlobalCollections)
->setTenant($projectDocument->getSequence())
->setNamespace($databaseDSN->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $projectDocument->getSequence());
}
} elseif (\in_array($dsn->getHost(), $sharedTables, true)) {
$database
->setSharedTables(true)
->setGlobalCollections($projectsGlobalCollections)
->setTenant($projectDocument->getSequence())
->setNamespace($dsn->getParam('namespace'));
} else {
$database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $projectDocument->getSequence());
}
$database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
return $database;
return $databaseFactory->tenant(
$databaseConfig,
$projectDocument,
APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER,
);
};
}, ['cache', 'register', 'project', 'authorization']);
}, ['databaseFactory', 'project']);
$container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
$container->set('getLogsDB', function (DatabaseFactory $databaseFactory) {
$database = null;
return function (?Document $project = null) use ($pools, $cache, $authorization, &$database) {
return function (?Document $project = null) use ($databaseFactory, &$database) {
if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
$database->setTenant($project->getSequence());
return $database;
}
/** @var array $collections */
$collections = Config::getParam('collections', []);
$logsCollections = $collections['logs'] ?? [];
$logsCollections = array_keys($logsCollections);
$adapter = new DatabasePool($pools->get('logs'));
$database = new Database($adapter, $cache);
$database
->setDatabase(APP_DATABASE)
->setAuthorization($authorization)
->setSharedTables(true)
->setGlobalCollections($logsCollections)
->setNamespace('logsV1')
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
$database->setTenant($project->getSequence());
}
$database = $databaseFactory->logs(
$project,
APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER,
APP_DATABASE_QUERY_MAX_VALUES_WORKER
);
return $database;
};
}, ['pools', 'cache', 'authorization']);
}, ['databaseFactory']);
$container->set('abuseRetention', function () {
return \time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
+232
View File
@@ -0,0 +1,232 @@
<?php
namespace Appwrite\Database;
use Appwrite\Utopia\Database\Documents\User;
use Utopia\Cache\Cache;
use Utopia\Config\Config;
use Utopia\Database\Adapter;
use Utopia\Database\Adapter\Pool as DatabasePool;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Validator\Authorization;
use Utopia\DSN\DSN;
use Utopia\Pools\Group;
use Utopia\System\System;
class Factory
{
public function __construct(
protected Group $pools,
protected Cache $cache,
protected Authorization $authorization,
protected string $database = APP_DATABASE,
protected string $platformNamespace = '_console',
) {
}
public function platform(
int $timeout = 0,
int $maxQueryValues = 0,
array $metadata = [],
): Database {
$database = $this->newDatabase($this->adapter('console'));
$database
->setDatabase($this->database)
->setAuthorization($this->authorization)
->setNamespace($this->platformNamespace);
$this->configureDocumentTypes($database);
$this->configureOptions($database, $timeout, $maxQueryValues, $metadata);
return $database;
}
public function project(
Document $project,
int $timeout = 0,
int $maxQueryValues = 0,
array $metadata = [],
): Database {
$dsn = $this->dsn($project->getAttribute('database'));
$database = $this->newDatabase(
$this->adapter($dsn->getHost()),
$this->destinationFor($dsn)
);
$database
->setDatabase($this->database)
->setAuthorization($this->authorization);
$this->configureDocumentTypes($database);
$this->configureOptions($database, $timeout, $maxQueryValues, $metadata);
return $this->configureProject($database, $project, $dsn);
}
public function logs(
?Document $project = null,
int $timeout = 0,
int $maxQueryValues = 0,
array $metadata = [],
): Database {
/** @var array $collections */
$collections = Config::getParam('collections', []);
$logsCollections = \array_keys($collections['logs'] ?? []);
$database = $this->newDatabase($this->adapter('logs'));
$database
->setDatabase($this->database)
->setAuthorization($this->authorization)
->setSharedTables(true)
->setGlobalCollections($logsCollections)
->setNamespace('logsV1');
if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
$database->setTenant($project->getSequence());
}
$this->configureOptions($database, $timeout, $maxQueryValues, $metadata);
return $database;
}
public function tenant(
Document $databaseDocument,
Document $project,
int $timeout = 0,
int $maxQueryValues = 0,
array $metadata = [],
bool $preserveDates = false,
): Database {
$databaseDsn = $this->dsn($databaseDocument->getAttribute('database') ?: $project->getAttribute('database', ''));
$projectDsn = $this->dsn($project->getAttribute('database'));
$databaseType = $databaseDocument->getAttribute('type', '');
$database = $this->newDatabase($this->adapter($databaseDsn->getHost()));
$database
->setDatabase($this->database)
->setAuthorization($this->authorization);
$database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
if ($preserveDates) {
$database->setPreserveDates(true);
}
$this->configureOptions($database, $timeout, $maxQueryValues, $metadata);
$sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));
$globalCollections = $this->projectGlobalCollections();
$databaseHost = $databaseDsn->getHost();
if ($databaseHost !== $projectDsn->getHost()) {
$dbTypeSharedTables = match ($databaseType) {
DOCUMENTSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''))),
VECTORSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''))),
default => [],
};
if (\in_array($databaseHost, $dbTypeSharedTables, true)) {
return $database
->setSharedTables(true)
->setGlobalCollections($globalCollections)
->setTenant($project->getSequence())
->setNamespace($databaseDsn->getParam('namespace'));
}
return $database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
if (\in_array($projectDsn->getHost(), $sharedTables, true)) {
return $database
->setSharedTables(true)
->setGlobalCollections($globalCollections)
->setTenant($project->getSequence())
->setNamespace($projectDsn->getParam('namespace'));
}
return $database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
protected function newDatabase(Adapter $adapter, ?Database $destination = null): Database
{
return new Database($adapter, $this->cache);
}
protected function adapter(string $name): DatabasePool
{
return new DatabasePool($this->pools->get($name));
}
protected function configureDocumentTypes(Database $database): Database
{
return $database->setDocumentType('users', User::class);
}
protected function destinationFor(DSN $dsn): ?Database
{
return null;
}
protected function configureProject(Database $database, Document $project, DSN $dsn): Database
{
$sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
if (\in_array($dsn->getHost(), $sharedTables, true)) {
return $database
->setSharedTables(true)
->setGlobalCollections($this->projectGlobalCollections())
->setTenant($project->getSequence())
->setNamespace($dsn->getParam('namespace'));
}
return $database
->setSharedTables(false)
->setTenant(null)
->setNamespace('_' . $project->getSequence());
}
private function configureOptions(Database $database, int $timeout, int $maxQueryValues, array $metadata): void
{
foreach ($metadata as $key => $value) {
$database->setMetadata($key, $value);
}
if ($timeout > 0) {
$database->setTimeout($timeout);
}
if ($maxQueryValues > 0) {
$database->setMaxQueryValues($maxQueryValues);
}
}
private function dsn(?string $value): DSN
{
try {
return new DSN($value ?? '');
} catch (\InvalidArgumentException) {
return new DSN('mysql://' . $value);
}
}
private function projectGlobalCollections(): array
{
/** @var array $collections */
$collections = Config::getParam('collections', []);
$globalCollections = \array_keys($collections['projects'] ?? []);
$globalCollections[] = 'audit';
return $globalCollections;
}
}
@@ -76,8 +76,13 @@ class XList extends Action
$actions = Base::getProviderActions();
$documents = [];
foreach ($actions as $providerId => $updateClass) {
if (!($providers[$providerId]['enabled'] ?? false)) {
foreach ($providers as $providerId => $config) {
$updateClass = $actions[$providerId] ?? null;
if ($updateClass === null) {
continue;
}
if (!($config['enabled'] ?? false)) {
// Disabled by Appwrite configuration, exclude from response
continue;
}
@@ -611,19 +611,15 @@ class Swagger2 extends Format
}
$enumKeys = [];
if (!empty($enum->map)) {
foreach ($enumValues as $enumValue) {
$enumKeys[] = $enum->map[$enumValue] ?? $enumValue;
}
foreach ($enumValues as $enumValue) {
$enumKeys[] = $enum->map[$enumValue] ?? $enumValue;
}
$node['items']['enum'] = $enumValues;
if (!empty($enum->name)) {
$node['items']['x-enum-name'] = $enum->name;
}
if (!empty($enumKeys)) {
$node['items']['x-enum-keys'] = $enumKeys;
}
$node['items']['x-enum-keys'] = $enumKeys;
}
}
if ($validator->getType() === 'integer') {
@@ -652,19 +648,15 @@ class Swagger2 extends Format
}
$enumKeys = [];
if (!empty($enum->map)) {
foreach ($enumValues as $enumValue) {
$enumKeys[] = $enum->map[$enumValue] ?? $enumValue;
}
foreach ($enumValues as $enumValue) {
$enumKeys[] = $enum->map[$enumValue] ?? $enumValue;
}
$node['enum'] = $enumValues;
if (!empty($enum->name)) {
$node['x-enum-name'] = $enum->name;
}
if (!empty($enumKeys)) {
$node['x-enum-keys'] = $enumKeys;
}
$node['x-enum-keys'] = $enumKeys;
}
}
if ($validator->getType() === 'integer') {
+13
View File
@@ -81,6 +81,19 @@ trait OAuth2Base
}
}
public function testListOAuth2ProvidersSortedAlphabetically(): void
{
$response = $this->listOAuth2Providers();
$this->assertSame(200, $response['headers']['status-code']);
$ids = \array_column($response['body']['providers'], '$id');
$sorted = $ids;
\sort($sorted);
$this->assertSame($sorted, $ids);
}
/**
* Pin the exact set of registered providers — adding or removing a
* provider must be a deliberate change to this assertion. Catches