Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Disallow injecting platform DB as project DB"

Browse Source 
This reverts commit 09c132414f.

# Conflicts:
#	src/Appwrite/Platform/Workers/Deletes.php
This commit is contained in:
Jake Barnby
2025-01-20 17:55:48 +13:00
parent 62c0226e1b
commit 099235c69f
4 changed files with 80 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/cli.php
+5 -5
View File
@@ -97,12 +97,12 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
return $dbForPlatform;
}, ['pools', 'cache']);
CLI::setResource('getProjectDB', function (Group $pools, Cache $cache) {
$databases = [];
CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
$databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
return function (Document $project) use ($pools, $cache, &$databases) {
return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
if ($project->isEmpty() || $project->getId() === 'console') {
throw new \Exception('Trying to inject project database using console project. Use "dbForPlatform" instead');
return $dbForPlatform;
}
try {
@@ -158,7 +158,7 @@ CLI::setResource('getProjectDB', function (Group $pools, Cache $cache) {
return $database;
};
}, ['pools', 'cache']);
}, ['pools', 'dbForPlatform', 'cache']);
CLI::setResource('queue', function (Group $pools) {
return $pools->get('queue')->pop()->getResource();
app/init.php
+10 -8
View File
@@ -1429,7 +1429,9 @@ App::setResource('console', function () {
App::setResource('connectionForProject', function (Group $pools, Document $project) {
if ($project->isEmpty() || $project->getId() === 'console') {
throw new \Exception('Trying to inject project database using console project. Use "dbForPlatform" instead');
return $pools
->get('console')
->pop();
}
try {
@@ -1444,9 +1446,9 @@ App::setResource('connectionForProject', function (Group $pools, Document $proje
->pop();
}, ['pools', 'project']);
App::setResource('dbForProject', function (Group $pools, PoolConnection $connectionForProject, Cache $cache, Document $project) {
App::setResource('dbForProject', function (Group $pools, PoolConnection $connectionForProject, Database $dbForPlatform, Cache $cache, Document $project) {
if ($project->isEmpty() || $project->getId() === 'console') {
throw new \Exception('Trying to inject project database using console project. Use "dbForPlatform" instead');
return $dbForPlatform;
}
try {
@@ -1479,7 +1481,7 @@ App::setResource('dbForProject', function (Group $pools, PoolConnection $connect
}
return $database;
}, ['pools', 'connectionForProject', 'cache', 'project']);
}, ['pools', 'connectionForProject', 'dbForPlatform', 'cache', 'project']);
App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
$dbAdapter = $pools
@@ -1499,12 +1501,12 @@ App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
return $database;
}, ['pools', 'cache']);
App::setResource('getProjectDB', function (Group $pools, PoolConnection $connectionForProject, Cache $cache) {
$databases = [];
App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
$databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
return function (Document $project) use ($pools, $cache, &$databases) {
return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
if ($project->isEmpty() || $project->getId() === 'console') {
throw new \Exception('Trying to inject project database using console project. Use "dbForPlatform" instead');
return $dbForPlatform;
}
try {
app/worker.php
+7 -7
View File
@@ -88,9 +88,9 @@ Server::setResource('connectionForProject', function (Group $pools, Document $pr
->pop();
}, ['pools', 'project']);
Server::setResource('dbForProject', function (PoolConnection $connectionForProject, Cache $cache, Registry $register, Message $message, Document $project) {
Server::setResource('dbForProject', function (PoolConnection $connectionForProject, Cache $cache, Registry $register, Message $message, Document $project, Database $dbForPlatform) {
if ($project->isEmpty() || $project->getId() === 'console') {
throw new \Exception('Trying to inject project database using console project. Use "dbForPlatform" instead');
return $dbForPlatform;
}
$database = new Database($connectionForProject->getResource(), $cache);
@@ -117,14 +117,14 @@ Server::setResource('dbForProject', function (PoolConnection $connectionForProje
}
return $database;
}, ['connectionForProject', 'cache', 'register', 'message', 'project']);
}, ['connectionForProject', 'cache', 'register', 'message', 'project', 'dbForPlatform']);
Server::setResource('getProjectDB', function (Group $pools, PoolConnection $connectionForProject, $cache) {
Server::setResource('getProjectDB', function (Group $pools, PoolConnection $connectionForProject, Database $dbForPlatform, $cache) {
$databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
return function (Document $project) use ($pools, $connectionForProject, $cache, &$databases): Database {
return function (Document $project) use ($pools, $connectionForProject, $dbForPlatform, $cache, &$databases): Database {
if ($project->isEmpty() || $project->getId() === 'console') {
throw new \Exception('Trying to inject project database using console project. Use "dbForPlatform" instead');
return $dbForPlatform;
}
try {
@@ -174,7 +174,7 @@ Server::setResource('getProjectDB', function (Group $pools, PoolConnection $conn
return $database;
};
}, ['pools', 'connectionForProject', 'cache']);
}, ['pools', 'connectionForProject', 'dbForPlatform', 'cache']);
Server::setResource('abuseRetention', function () {
return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400);
src/Appwrite/Platform/Workers/Deletes.php
+58 -126
View File
@@ -36,7 +36,7 @@ class Deletes extends Action
}
/**
* @throws \Exception
* @throws Exception
*/
public function __construct()
{
@@ -96,7 +96,7 @@ class Deletes extends Action
$this->deleteDeployment($getProjectDB, $deviceForFunctions, $deviceForBuilds, $document, $project);
break;
case DELETE_TYPE_USERS:
$this->deleteUser($dbForPlatform, $getProjectDB, $document, $project);
$this->deleteUser($getProjectDB, $document, $project);
break;
case DELETE_TYPE_BUCKETS:
$this->deleteBucket($getProjectDB, $deviceForFiles, $document, $project);
@@ -120,7 +120,7 @@ class Deletes extends Action
break;
case DELETE_TYPE_AUDIT:
if (!$project->isEmpty()) {
$this->deleteAuditLogs($project, $dbForPlatform, $getProjectDB, $auditRetention);
$this->deleteAuditLogs($project, $getProjectDB, $auditRetention);
}
break;
case DELETE_TYPE_REALTIME:
@@ -130,13 +130,13 @@ class Deletes extends Action
$this->deleteExpiredSessions($project, $getProjectDB);
break;
case DELETE_TYPE_USAGE:
$this->deleteUsageStats($project, $dbForPlatform, $getProjectDB, $hourlyUsageRetentionDatetime);
$this->deleteUsageStats($project, $getProjectDB, $hourlyUsageRetentionDatetime);
break;
case DELETE_TYPE_CACHE_BY_RESOURCE:
$this->deleteCacheByResource($project, $dbForPlatform, $getProjectDB, $resource, $resourceType);
$this->deleteCacheByResource($project, $getProjectDB, $resource, $resourceType);
break;
case DELETE_TYPE_CACHE_BY_TIMESTAMP:
$this->deleteCacheByDate($project, $dbForPlatform, $getProjectDB, $datetime);
$this->deleteCacheByDate($project, $getProjectDB, $datetime);
break;
case DELETE_TYPE_SCHEDULES:
$this->deleteSchedules($dbForPlatform, $getProjectDB, $datetime);
@@ -156,12 +156,12 @@ class Deletes extends Action
case DELETE_TYPE_MAINTENANCE:
$this->deleteExpiredTargets($project, $getProjectDB);
$this->deleteExecutionLogs($project, $getProjectDB, $executionRetention);
$this->deleteAuditLogs($project, $dbForPlatform, $getProjectDB, $auditRetention);
$this->deleteUsageStats($project, $dbForPlatform, $getProjectDB, $hourlyUsageRetentionDatetime);
$this->deleteAuditLogs($project, $getProjectDB, $auditRetention);
$this->deleteUsageStats($project, $getProjectDB, $hourlyUsageRetentionDatetime);
$this->deleteExpiredSessions($project, $getProjectDB);
break;
default:
throw new \Exception('No delete operation for type: ' . $type);
throw new \Exception('No delete operation for type: ' . \strval($type));
}
}
@@ -169,12 +169,13 @@ class Deletes extends Action
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param string $datetime
* @param Document|null $document
* @return void
* @throws Authorization
* @throws Conflict
* @throws DatabaseException
* @throws Exception
* @throws Restricted
* @throws Structure
* @throws DatabaseException
*/
private function deleteSchedules(Database $dbForPlatform, callable $getProjectDB, string $datetime): void
{
@@ -227,7 +228,7 @@ class Deletes extends Action
* @param Document $topic
* @throws Exception
*/
private function deleteTopic(Document $project, callable $getProjectDB, Document $topic): void
private function deleteTopic(Document $project, callable $getProjectDB, Document $topic)
{
if ($topic->isEmpty()) {
Console::error('Failed to delete subscribers. Topic not found');
@@ -251,7 +252,7 @@ class Deletes extends Action
*/
private function deleteTargetSubscribers(Document $project, callable $getProjectDB, Document $target): void
{
/** @var Database $dbForProject */
/** @var Database */
$dbForProject = $getProjectDB($project);
// Delete subscribers and decrement topic counts
@@ -320,22 +321,17 @@ class Deletes extends Action
/**
* @param Document $project
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param string $resource
* @param string|null $resourceType
* @return void
* @throws Authorization
* @param string|null $resourceType
* @throws Exception
*/
private function deleteCacheByResource(Document $project, Database $dbForPlatform, callable $getProjectDB, string $resource, string $resourceType = null): void
private function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource, string $resourceType = null): void
{
$projectId = $project->getId();
if (empty($projectId) || $projectId === 'console') {
$database = $dbForPlatform;
} else {
$database = $getProjectDB($project);
}
$dbForProject = $getProjectDB($project);
$cache = new Cache(
new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $projectId)
@@ -349,7 +345,7 @@ class Deletes extends Action
$this->deleteByGroup(
'cache',
$query,
$database,
$dbForProject,
function (Document $document) use ($cache, $projectId) {
$path = APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $projectId . DIRECTORY_SEPARATOR . $document->getId();
@@ -365,21 +361,15 @@ class Deletes extends Action
/**
* Document $project
* @param Document $project
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param string $datetime
* @return void
* @throws Exception
*/
private function deleteCacheByDate(Document $project, Database $dbForPlatform, callable $getProjectDB, string $datetime): void
private function deleteCacheByDate(Document $project, callable $getProjectDB, string $datetime): void
{
$projectId = $project->getId();
if (empty($projectId) || $projectId === 'console') {
$database = $dbForPlatform;
} else {
$database = $getProjectDB($project);
}
$dbForProject = $getProjectDB($project);
$cache = new Cache(
new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $projectId)
@@ -392,7 +382,7 @@ class Deletes extends Action
$this->deleteByGroup(
'cache',
$query,
$database,
$dbForProject,
function (Document $document) use ($cache, $projectId) {
$path = APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $projectId . DIRECTORY_SEPARATOR . $document->getId();
@@ -406,48 +396,32 @@ class Deletes extends Action
}
/**
* @param Document $project
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param string $hourlyUsageRetentionDatetime
* @return void
* @throws Exception
*/
private function deleteUsageStats(Document $project, Database $dbForPlatform, callable $getProjectDB, string $hourlyUsageRetentionDatetime): void
private function deleteUsageStats(Document $project, callable $getProjectDB, string $hourlyUsageRetentionDatetime): void
{
$projectId = $project->getId();
if (empty($projectId) || $projectId === 'console') {
$database = $dbForPlatform;
} else {
$database = $getProjectDB($project);
}
$dbForProject = $getProjectDB($project);
// Delete Usage stats
$this->deleteByGroup('stats', [
Query::lessThan('time', $hourlyUsageRetentionDatetime),
Query::equal('period', ['1h']),
], $database);
], $dbForProject);
}
/**
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param Document $document teams document
* @param Document $project
* @return void
* @throws Exception
*/
public function deleteMemberships(Database $dbForPlatform, callable $getProjectDB, Document $document, Document $project): void
public function deleteMemberships(callable $getProjectDB, Document $document, Document $project): void
{
$projectId = $project->getId();
if (empty($projectId) || $projectId === 'console') {
$database = $dbForPlatform;
} else {
$database = $getProjectDB($project);
}
$dbForProject = $getProjectDB($project);
$teamInternalId = $document->getInternalId();
// Delete Memberships
@@ -456,27 +430,24 @@ class Deletes extends Action
[
Query::equal('teamInternalId', [$teamInternalId])
],
$database,
function (Document $membership) use ($database) {
$dbForProject,
function (Document $membership) use ($dbForProject) {
$userId = $membership->getAttribute('userId');
$database->purgeCachedDocument('users', $userId);
$dbForProject->purgeCachedDocument('users', $userId);
}
);
}
/**
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param CertificatesAdapter $certificates
* @param Document $document
* @return void
* @throws Authorization
* @throws Conflict
* @throws DatabaseException
* @throws DatabaseException\Query
* @throws Exception
* @throws Conflict
* @throws Restricted
* @throws Timeout
* @throws Structure
* @throws Exception
*/
private function deleteProjectsByTeam(Database $dbForPlatform, callable $getProjectDB, CertificatesAdapter $certificates, Document $document): void
{
@@ -503,10 +474,11 @@ class Deletes extends Action
* @param Device $deviceForFunctions
* @param Device $deviceForBuilds
* @param Device $deviceForCache
* @param CertificatesAdapter $certificates
* @param Document $document
* @return void
* @throws Exception
* @throws Authorization
* @throws DatabaseException
*/
private function deleteProject(Database $dbForPlatform, callable $getProjectDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, Document $document): void
{
@@ -627,42 +599,34 @@ class Deletes extends Action
}
/**
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param Document $document user document
* @param Document $project
* @return void
* @throws Exception
*/
private function deleteUser(Database $dbForPlatform, callable $getProjectDB, Document $document, Document $project): void
private function deleteUser(callable $getProjectDB, Document $document, Document $project): void
{
$projectId = $project->getId();
if (empty($projectId) || $projectId === 'console') {
$dbForProject = $dbForPlatform;
} else {
$database = $getProjectDB($project);
}
$userId = $document->getId();
$userInternalId = $document->getInternalId();
$dbForProject = $getProjectDB($project);
// Delete all sessions of this user from the sessions table and update the sessions field of the user record
$this->deleteByGroup('sessions', [
Query::equal('userInternalId', [$userInternalId])
], $database);
], $dbForProject);
$database->purgeCachedDocument('users', $userId);
$dbForProject->purgeCachedDocument('users', $userId);
// Delete Memberships and decrement team membership counts
$this->deleteByGroup('memberships', [
Query::equal('userInternalId', [$userInternalId])
], $database, function (Document $document) use ($database) {
], $dbForProject, function (Document $document) use ($dbForProject) {
if ($document->getAttribute('confirm')) { // Count only confirmed members
$teamId = $document->getAttribute('teamId');
$team = $database->getDocument('teams', $teamId);
$team = $dbForProject->getDocument('teams', $teamId);
if (!$team->isEmpty()) {
$database->decreaseDocumentAttribute('teams', $teamId, 'total', 1, 0);
$dbForProject->decreaseDocumentAttribute('teams', $teamId, 'total', 1, 0);
}
}
});
@@ -670,12 +634,12 @@ class Deletes extends Action
// Delete tokens
$this->deleteByGroup('tokens', [
Query::equal('userInternalId', [$userInternalId])
], $database);
], $dbForProject);
// Delete identities
$this->deleteByGroup('identities', [
Query::equal('userInternalId', [$userInternalId])
], $database);
], $dbForProject);
// Delete targets
$this->deleteByGroup(
@@ -683,7 +647,7 @@ class Deletes extends Action
[
Query::equal('userInternalId', [$userInternalId])
],
$database,
$dbForProject,
function (Document $target) use ($getProjectDB, $project) {
$this->deleteTargetSubscribers($project, $getProjectDB, $target);
}
@@ -691,7 +655,7 @@ class Deletes extends Action
}
/**
* @param Document $project
* @param database $dbForPlatform
* @param callable $getProjectDB
* @param string $datetime
* @return void
@@ -739,24 +703,17 @@ class Deletes extends Action
}
/**
* @param Document $project
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param string $auditRetention
* @param string $datetime
* @return void
* @throws \Exception
* @throws Exception
*/
private function deleteAuditLogs(Document $project, Database $dbForPlatform, callable $getProjectDB, string $auditRetention): void
private function deleteAuditLogs(Document $project, callable $getProjectDB, string $auditRetention): void
{
$projectId = $project->getId();
if (empty($projectId) || $projectId === 'console') {
$database = $dbForPlatform;
} else {
$database = $getProjectDB($project);
}
$audit = new Audit($database);
$dbForProject = $getProjectDB($project);
$audit = new Audit($dbForProject);
try {
$audit->cleanup($auditRetention);
@@ -766,11 +723,9 @@ class Deletes extends Action
}
/**
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param Device $deviceForFunctions
* @param Device $deviceForBuilds
* @param CertificatesAdapter $certificates
* @param Document $document function document
* @param Document $project
* @return void
@@ -778,6 +733,7 @@ class Deletes extends Action
*/
private function deleteFunction(Database $dbForPlatform, callable $getProjectDB, Device $deviceForFunctions, Device $deviceForBuilds, CertificatesAdapter $certificates, Document $document, Document $project): void
{
$projectId = $project->getId();
$dbForProject = $getProjectDB($project);
$functionId = $document->getId();
$functionInternalId = $document->getInternalId();
@@ -890,7 +846,6 @@ class Deletes extends Action
Console::error('[Error] Message: ' . $th->getMessage());
Console::error('[Error] File: ' . $th->getFile());
Console::error('[Error] Line: ' . $th->getLine());
Console::error('[Error] Trace: ' . $th->getTraceAsString());
}
}
@@ -935,6 +890,7 @@ class Deletes extends Action
*/
private function deleteDeployment(callable $getProjectDB, Device $deviceForFunctions, Device $deviceForBuilds, Document $document, Document $project): void
{
$projectId = $project->getId();
$dbForProject = $getProjectDB($project);
$deploymentId = $document->getId();
$deploymentInternalId = $document->getInternalId();
@@ -967,10 +923,6 @@ class Deletes extends Action
* @param Database $database to delete it from
* @param callable|null $callback to perform after document is deleted
* @return void
* @throws Authorization
* @throws Conflict
* @throws DatabaseException
* @throws Restricted
*/
private function deleteById(Document $document, Database $database, callable $callback = null): void
{
@@ -991,7 +943,7 @@ class Deletes extends Action
* @param Database $database
* @param callable|null $callback
* @return void
* @throws \Exception
* @throws Exception
*/
protected function deleteByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
{
@@ -1033,9 +985,7 @@ class Deletes extends Action
* @param Database $database
* @param callable|null $callback
* @return void
* @throws DatabaseException
* @throws DatabaseException\Query
* @throws Timeout
* @throws Exception
*/
protected function listByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
{
@@ -1081,12 +1031,7 @@ class Deletes extends Action
/**
* @param Database $dbForPlatform
* @param Document $document rule document
* @param CertificatesAdapter $certificates
* @return void
* @throws Authorization
* @throws Conflict
* @throws DatabaseException
* @throws Restricted
*/
private function deleteRule(Database $dbForPlatform, Document $document, CertificatesAdapter $certificates): void
{
@@ -1100,25 +1045,17 @@ class Deletes extends Action
}
/**
* @param Database $dbForPlatform
* @param callable $getProjectDB
* @param Device $deviceForFiles
* @param Document $document
* @param Document $project
* @return void
* @throws DatabaseException
*/
private function deleteBucket(Database $dbForPlatform, callable $getProjectDB, Device $deviceForFiles, Document $document, Document $project): void
private function deleteBucket(callable $getProjectDB, Device $deviceForFiles, Document $document, Document $project): void
{
$projectId = $project->getId();
$dbForProject = $getProjectDB($project);
if (empty($projectId) || $projectId === 'console') {
$database = $dbForPlatform;
} else {
$database = $getProjectDB($project);
}
$database->deleteCollection('bucket_' . $document->getInternalId());
$dbForProject->deleteCollection('bucket_' . $document->getInternalId());
$deviceForFiles->deletePath($document->getId());
}
@@ -1129,11 +1066,7 @@ class Deletes extends Action
* @param Document $document
* @param Document $project
* @return void
* @throws Authorization
* @throws Conflict
* @throws DatabaseException
* @throws Exception
* @throws Restricted
*/
private function deleteInstallation(Database $dbForPlatform, callable $getProjectDB, Document $document, Document $project): void
{
@@ -1188,7 +1121,6 @@ class Deletes extends Action
Console::error('[Error] Message: ' . $th->getMessage());
Console::error('[Error] File: ' . $th->getFile());
Console::error('[Error] Line: ' . $th->getLine());
Console::error('[Error] Trace: ' . $th->getTraceAsString());
}
}
);