CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-20 11:37:45 +12:00
Code Issues Projects Releases Wiki Activity

connection storage implementation

Browse source
This commit is contained in:
shimon 2024-08-07 19:29:36 +03:00
parent 5276024077
commit f1a518c018
2 changed files with 214 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

388
app/init.php
View file

@ -5,9 +5,11 @@
* *
* Initializes both Appwrite API entry point, queue workers, and CLI tasks. * Initializes both Appwrite API entry point, queue workers, and CLI tasks.
* Set configuration, framework resources & app constants * Set configuration, framework resources & app constants
*
*/ */
if (\file_exists(__DIR__.'/../vendor/autoload.php')) {
require_once __DIR__.'/../vendor/autoload.php'; if (\file_exists(__DIR__ . '/../vendor/autoload.php')) {
require_once __DIR__ . '/../vendor/autoload.php';
} }
\ini_set('memory_limit', '512M'); \ini_set('memory_limit', '512M');
@ -87,7 +89,7 @@ const APP_NAME = 'Appwrite';
const APP_DOMAIN = 'appwrite.io'; const APP_DOMAIN = 'appwrite.io';
const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address
const APP_EMAIL_SECURITY = ''; // Default security email address const APP_EMAIL_SECURITY = ''; // Default security email address
const APP_USERAGENT = APP_NAME.'-Server v%s. Please report abuse at %s'; const APP_USERAGENT = APP_NAME . '-Server v%s. Please report abuse at %s';
const APP_MODE_DEFAULT = 'default'; const APP_MODE_DEFAULT = 'default';
const APP_MODE_ADMIN = 'admin'; const APP_MODE_ADMIN = 'admin';
const APP_PAGING_LIMIT = 12; const APP_PAGING_LIMIT = 12;
@ -176,7 +178,7 @@ const DELETE_TYPE_INSTALLATIONS = 'installations';
const DELETE_TYPE_RULES = 'rules'; const DELETE_TYPE_RULES = 'rules';
const DELETE_TYPE_SESSIONS = 'sessions'; const DELETE_TYPE_SESSIONS = 'sessions';
const DELETE_TYPE_CACHE_BY_TIMESTAMP = 'cacheByTimeStamp'; const DELETE_TYPE_CACHE_BY_TIMESTAMP = 'cacheByTimeStamp';
const DELETE_TYPE_CACHE_BY_RESOURCE = 'cacheByResource'; const DELETE_TYPE_CACHE_BY_RESOURCE = 'cacheByResource';
const DELETE_TYPE_SCHEDULES = 'schedules'; const DELETE_TYPE_SCHEDULES = 'schedules';
const DELETE_TYPE_TOPIC = 'topic'; const DELETE_TYPE_TOPIC = 'topic';
const DELETE_TYPE_TARGET = 'target'; const DELETE_TYPE_TARGET = 'target';
@ -209,9 +211,9 @@ const MESSAGE_TYPE_PUSH = 'push';
// Usage metrics // Usage metrics
const METRIC_TEAMS = 'teams'; const METRIC_TEAMS = 'teams';
const METRIC_USERS = 'users'; const METRIC_USERS = 'users';
const METRIC_MESSAGES = 'messages'; const METRIC_MESSAGES = 'messages';
const METRIC_MESSAGES_COUNTRY_CODE = '{countryCode}.messages'; const METRIC_MESSAGES_COUNTRY_CODE = '{countryCode}.messages';
const METRIC_SESSIONS = 'sessions'; const METRIC_SESSIONS = 'sessions';
const METRIC_DATABASES = 'databases'; const METRIC_DATABASES = 'databases';
const METRIC_COLLECTIONS = 'collections'; const METRIC_COLLECTIONS = 'collections';
const METRIC_DATABASE_ID_COLLECTIONS = '{databaseInternalId}.collections'; const METRIC_DATABASE_ID_COLLECTIONS = '{databaseInternalId}.collections';
@ -219,38 +221,38 @@ const METRIC_DOCUMENTS = 'documents';
const METRIC_DATABASE_ID_DOCUMENTS = '{databaseInternalId}.documents'; const METRIC_DATABASE_ID_DOCUMENTS = '{databaseInternalId}.documents';
const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS = '{databaseInternalId}.{collectionInternalId}.documents'; const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS = '{databaseInternalId}.{collectionInternalId}.documents';
const METRIC_BUCKETS = 'buckets'; const METRIC_BUCKETS = 'buckets';
const METRIC_FILES = 'files'; const METRIC_FILES = 'files';
const METRIC_FILES_STORAGE = 'files.storage'; const METRIC_FILES_STORAGE = 'files.storage';
const METRIC_BUCKET_ID_FILES = '{bucketInternalId}.files'; const METRIC_BUCKET_ID_FILES = '{bucketInternalId}.files';
const METRIC_BUCKET_ID_FILES_STORAGE = '{bucketInternalId}.files.storage'; const METRIC_BUCKET_ID_FILES_STORAGE = '{bucketInternalId}.files.storage';
const METRIC_FUNCTIONS = 'functions'; const METRIC_FUNCTIONS = 'functions';
const METRIC_DEPLOYMENTS = 'deployments'; const METRIC_DEPLOYMENTS = 'deployments';
const METRIC_DEPLOYMENTS_STORAGE = 'deployments.storage'; const METRIC_DEPLOYMENTS_STORAGE = 'deployments.storage';
const METRIC_BUILDS = 'builds'; const METRIC_BUILDS = 'builds';
const METRIC_BUILDS_STORAGE = 'builds.storage'; const METRIC_BUILDS_STORAGE = 'builds.storage';
const METRIC_BUILDS_COMPUTE = 'builds.compute'; const METRIC_BUILDS_COMPUTE = 'builds.compute';
const METRIC_BUILDS_MB_SECONDS = 'builds.mbSeconds'; const METRIC_BUILDS_MB_SECONDS = 'builds.mbSeconds';
const METRIC_FUNCTION_ID_BUILDS = '{functionInternalId}.builds'; const METRIC_FUNCTION_ID_BUILDS = '{functionInternalId}.builds';
const METRIC_FUNCTION_ID_BUILDS_STORAGE = '{functionInternalId}.builds.storage'; const METRIC_FUNCTION_ID_BUILDS_STORAGE = '{functionInternalId}.builds.storage';
const METRIC_FUNCTION_ID_BUILDS_COMPUTE = '{functionInternalId}.builds.compute'; const METRIC_FUNCTION_ID_BUILDS_COMPUTE = '{functionInternalId}.builds.compute';
const METRIC_FUNCTION_ID_DEPLOYMENTS = '{resourceType}.{resourceInternalId}.deployments'; const METRIC_FUNCTION_ID_DEPLOYMENTS = '{resourceType}.{resourceInternalId}.deployments';
const METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE = '{resourceType}.{resourceInternalId}.deployments.storage'; const METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE = '{resourceType}.{resourceInternalId}.deployments.storage';
const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds'; const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
const METRIC_EXECUTIONS = 'executions'; const METRIC_EXECUTIONS = 'executions';
const METRIC_EXECUTIONS_COMPUTE = 'executions.compute'; const METRIC_EXECUTIONS_COMPUTE = 'executions.compute';
const METRIC_EXECUTIONS_MB_SECONDS = 'executions.mbSeconds'; const METRIC_EXECUTIONS_MB_SECONDS = 'executions.mbSeconds';
const METRIC_FUNCTION_ID_EXECUTIONS = '{functionInternalId}.executions'; const METRIC_FUNCTION_ID_EXECUTIONS = '{functionInternalId}.executions';
const METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE = '{functionInternalId}.executions.compute'; const METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE = '{functionInternalId}.executions.compute';
const METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS = '{functionInternalId}.executions.mbSeconds'; const METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS = '{functionInternalId}.executions.mbSeconds';
const METRIC_NETWORK_REQUESTS = 'network.requests'; const METRIC_NETWORK_REQUESTS = 'network.requests';
const METRIC_NETWORK_INBOUND = 'network.inbound'; const METRIC_NETWORK_INBOUND = 'network.inbound';
const METRIC_NETWORK_OUTBOUND = 'network.outbound'; const METRIC_NETWORK_OUTBOUND = 'network.outbound';
$register = new Registry(); $register = new Registry();
App::setMode(System::getEnv('_APP_ENV', App::MODE_TYPE_PRODUCTION)); App::setMode(System::getEnv('_APP_ENV', App::MODE_TYPE_PRODUCTION));
if (! App::isProduction()) { if (!App::isProduction()) {
// Allow specific domains to skip public domain validation in dev environment // Allow specific domains to skip public domain validation in dev environment
// Useful for existing tests involving webhooks // Useful for existing tests involving webhooks
PublicDomain::allow(['request-catcher']); PublicDomain::allow(['request-catcher']);
@ -259,36 +261,36 @@ if (! App::isProduction()) {
/* /*
* ENV vars * ENV vars
*/ */
Config::load('events', __DIR__.'/config/events.php'); Config::load('events', __DIR__ . '/config/events.php');
Config::load('auth', __DIR__.'/config/auth.php'); Config::load('auth', __DIR__ . '/config/auth.php');
Config::load('apis', __DIR__.'/config/apis.php'); // List of APIs Config::load('apis', __DIR__ . '/config/apis.php'); // List of APIs
Config::load('errors', __DIR__.'/config/errors.php'); Config::load('errors', __DIR__ . '/config/errors.php');
Config::load('oAuthProviders', __DIR__.'/config/oAuthProviders.php'); Config::load('oAuthProviders', __DIR__ . '/config/oAuthProviders.php');
Config::load('platforms', __DIR__.'/config/platforms.php'); Config::load('platforms', __DIR__ . '/config/platforms.php');
Config::load('collections', __DIR__.'/config/collections.php'); Config::load('collections', __DIR__ . '/config/collections.php');
Config::load('runtimes', __DIR__.'/config/runtimes.php'); Config::load('runtimes', __DIR__ . '/config/runtimes.php');
Config::load('runtimes-v2', __DIR__.'/config/runtimes-v2.php'); Config::load('runtimes-v2', __DIR__ . '/config/runtimes-v2.php');
Config::load('usage', __DIR__.'/config/usage.php'); Config::load('usage', __DIR__ . '/config/usage.php');
Config::load('roles', __DIR__.'/config/roles.php'); // User roles and scopes Config::load('roles', __DIR__ . '/config/roles.php'); // User roles and scopes
Config::load('scopes', __DIR__.'/config/scopes.php'); // User roles and scopes Config::load('scopes', __DIR__ . '/config/scopes.php'); // User roles and scopes
Config::load('services', __DIR__.'/config/services.php'); // List of services Config::load('services', __DIR__ . '/config/services.php'); // List of services
Config::load('variables', __DIR__.'/config/variables.php'); // List of env variables Config::load('variables', __DIR__ . '/config/variables.php'); // List of env variables
Config::load('regions', __DIR__.'/config/regions.php'); // List of available regions Config::load('regions', __DIR__ . '/config/regions.php'); // List of available regions
Config::load('avatar-browsers', __DIR__.'/config/avatars/browsers.php'); Config::load('avatar-browsers', __DIR__ . '/config/avatars/browsers.php');
Config::load('avatar-credit-cards', __DIR__.'/config/avatars/credit-cards.php'); Config::load('avatar-credit-cards', __DIR__ . '/config/avatars/credit-cards.php');
Config::load('avatar-flags', __DIR__.'/config/avatars/flags.php'); Config::load('avatar-flags', __DIR__ . '/config/avatars/flags.php');
Config::load('locale-codes', __DIR__.'/config/locale/codes.php'); Config::load('locale-codes', __DIR__ . '/config/locale/codes.php');
Config::load('locale-currencies', __DIR__.'/config/locale/currencies.php'); Config::load('locale-currencies', __DIR__ . '/config/locale/currencies.php');
Config::load('locale-eu', __DIR__.'/config/locale/eu.php'); Config::load('locale-eu', __DIR__ . '/config/locale/eu.php');
Config::load('locale-languages', __DIR__.'/config/locale/languages.php'); Config::load('locale-languages', __DIR__ . '/config/locale/languages.php');
Config::load('locale-phones', __DIR__.'/config/locale/phones.php'); Config::load('locale-phones', __DIR__ . '/config/locale/phones.php');
Config::load('locale-countries', __DIR__.'/config/locale/countries.php'); Config::load('locale-countries', __DIR__ . '/config/locale/countries.php');
Config::load('locale-continents', __DIR__.'/config/locale/continents.php'); Config::load('locale-continents', __DIR__ . '/config/locale/continents.php');
Config::load('locale-templates', __DIR__.'/config/locale/templates.php'); Config::load('locale-templates', __DIR__ . '/config/locale/templates.php');
Config::load('storage-logos', __DIR__.'/config/storage/logos.php'); Config::load('storage-logos', __DIR__ . '/config/storage/logos.php');
Config::load('storage-mimes', __DIR__.'/config/storage/mimes.php'); Config::load('storage-mimes', __DIR__ . '/config/storage/mimes.php');
Config::load('storage-inputs', __DIR__.'/config/storage/inputs.php'); Config::load('storage-inputs', __DIR__ . '/config/storage/inputs.php');
Config::load('storage-outputs', __DIR__.'/config/storage/outputs.php'); Config::load('storage-outputs', __DIR__ . '/config/storage/outputs.php');
/** /**
* New DB Filters * New DB Filters
@ -343,7 +345,8 @@ Database::addFilter(
if (isset($formatOptions['min']) || isset($formatOptions['max'])) { if (isset($formatOptions['min']) || isset($formatOptions['max'])) {
$attribute $attribute
->setAttribute('min', $formatOptions['min']) ->setAttribute('min', $formatOptions['min'])
->setAttribute('max', $formatOptions['max']); ->setAttribute('max', $formatOptions['max'])
;
} }
return $value; return $value;
@ -352,7 +355,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryAttributes', 'subQueryAttributes',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
$attributes = $database->find('attributes', [ $attributes = $database->find('attributes', [
Query::equal('collectionInternalId', [$document->getInternalId()]), Query::equal('collectionInternalId', [$document->getInternalId()]),
@ -376,7 +381,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryIndexes', 'subQueryIndexes',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return $database return $database
->find('indexes', [ ->find('indexes', [
@ -389,7 +396,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryPlatforms', 'subQueryPlatforms',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return $database return $database
->find('platforms', [ ->find('platforms', [
@ -401,7 +410,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryKeys', 'subQueryKeys',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return $database return $database
->find('keys', [ ->find('keys', [
@ -413,7 +424,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryWebhooks', 'subQueryWebhooks',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return $database return $database
->find('webhooks', [ ->find('webhooks', [
@ -425,7 +438,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQuerySessions', 'subQuerySessions',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return Authorization::skip(fn () => $database->find('sessions', [ return Authorization::skip(fn () => $database->find('sessions', [
Query::equal('userInternalId', [$document->getInternalId()]), Query::equal('userInternalId', [$document->getInternalId()]),
@ -436,7 +451,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryTokens', 'subQueryTokens',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return Authorization::skip(fn () => $database return Authorization::skip(fn () => $database
->find('tokens', [ ->find('tokens', [
@ -448,7 +465,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryChallenges', 'subQueryChallenges',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return Authorization::skip(fn () => $database return Authorization::skip(fn () => $database
->find('challenges', [ ->find('challenges', [
@ -460,7 +479,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryAuthenticators', 'subQueryAuthenticators',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return Authorization::skip(fn () => $database return Authorization::skip(fn () => $database
->find('authenticators', [ ->find('authenticators', [
@ -472,7 +493,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryMemberships', 'subQueryMemberships',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return Authorization::skip(fn () => $database return Authorization::skip(fn () => $database
->find('memberships', [ ->find('memberships', [
@ -484,7 +507,9 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryVariables', 'subQueryVariables',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return $database return $database
->find('variables', [ ->find('variables', [
@ -515,7 +540,7 @@ Database::addFilter(
return; return;
} }
$value = json_decode($value, true); $value = json_decode($value, true);
$key = System::getEnv('_APP_OPENSSL_KEY_V'.$value['version']); $key = System::getEnv('_APP_OPENSSL_KEY_V' . $value['version']);
return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag'])); return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
} }
@ -523,12 +548,14 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryProjectVariables', 'subQueryProjectVariables',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return $database return $database
->find('variables', [ ->find('variables', [
Query::equal('resourceType', ['project']), Query::equal('resourceType', ['project']),
Query::limit(APP_LIMIT_SUBQUERY), Query::limit(APP_LIMIT_SUBQUERY)
]); ]);
} }
); );
@ -540,11 +567,11 @@ Database::addFilter(
$user->getId(), $user->getId(),
$user->getAttribute('email', ''), $user->getAttribute('email', ''),
$user->getAttribute('name', ''), $user->getAttribute('name', ''),
$user->getAttribute('phone', ''), $user->getAttribute('phone', '')
]; ];
foreach ($user->getAttribute('labels', []) as $label) { foreach ($user->getAttribute('labels', []) as $label) {
$searchValues[] = 'label:'.$label; $searchValues[] = 'label:' . $label;
} }
$search = implode(' ', \array_filter($searchValues)); $search = implode(' ', \array_filter($searchValues));
@ -558,33 +585,36 @@ Database::addFilter(
Database::addFilter( Database::addFilter(
'subQueryTargets', 'subQueryTargets',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
return Authorization::skip(fn () => $database return Authorization::skip(fn () => $database
->find('targets', [ ->find('targets', [
Query::equal('userInternalId', [$document->getInternalId()]), Query::equal('userInternalId', [$document->getInternalId()]),
Query::limit(APP_LIMIT_SUBQUERY), Query::limit(APP_LIMIT_SUBQUERY)
])); ]));
} }
); );
Database::addFilter( Database::addFilter(
'subQueryTopicTargets', 'subQueryTopicTargets',
function (mixed $value) {}, function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) { function (mixed $value, Document $document, Database $database) {
$targetIds = Authorization::skip(fn () => \array_map( $targetIds = Authorization::skip(fn () => \array_map(
fn ($document) => $document->getAttribute('targetInternalId'), fn ($document) => $document->getAttribute('targetInternalId'),
$database->find('subscribers', [ $database->find('subscribers', [
Query::equal('topicInternalId', [$document->getInternalId()]), Query::equal('topicInternalId', [$document->getInternalId()]),
Query::limit(APP_LIMIT_SUBSCRIBERS_SUBQUERY), Query::limit(APP_LIMIT_SUBSCRIBERS_SUBQUERY)
]) ])
)); ));
if (\count($targetIds) > 0) { if (\count($targetIds) > 0) {
return $database->skipValidation(fn () => $database->find('targets', [ return $database->skipValidation(fn () => $database->find('targets', [
Query::equal('$internalId', $targetIds), Query::equal('$internalId', $targetIds)
])); ]));
} }
return []; return [];
} }
); );
@ -596,7 +626,7 @@ Database::addFilter(
$provider->getId(), $provider->getId(),
$provider->getAttribute('name', ''), $provider->getAttribute('name', ''),
$provider->getAttribute('provider', ''), $provider->getAttribute('provider', ''),
$provider->getAttribute('type', ''), $provider->getAttribute('type', '')
]; ];
$search = \implode(' ', \array_filter($searchValues)); $search = \implode(' ', \array_filter($searchValues));
@ -668,7 +698,6 @@ Structure::addFormat(APP_DATABASE_ATTRIBUTE_DATETIME, function () {
Structure::addFormat(APP_DATABASE_ATTRIBUTE_ENUM, function ($attribute) { Structure::addFormat(APP_DATABASE_ATTRIBUTE_ENUM, function ($attribute) {
$elements = $attribute['formatOptions']['elements']; $elements = $attribute['formatOptions']['elements'];
return new WhiteList($elements, true); return new WhiteList($elements, true);
}, Database::VAR_STRING); }, Database::VAR_STRING);
@ -683,14 +712,12 @@ Structure::addFormat(APP_DATABASE_ATTRIBUTE_URL, function () {
Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function ($attribute) { Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function ($attribute) {
$min = $attribute['formatOptions']['min'] ?? -INF; $min = $attribute['formatOptions']['min'] ?? -INF;
$max = $attribute['formatOptions']['max'] ?? INF; $max = $attribute['formatOptions']['max'] ?? INF;
return new Range($min, $max, Range::TYPE_INTEGER); return new Range($min, $max, Range::TYPE_INTEGER);
}, Database::VAR_INTEGER); }, Database::VAR_INTEGER);
Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) { Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
$min = $attribute['formatOptions']['min'] ?? -INF; $min = $attribute['formatOptions']['min'] ?? -INF;
$max = $attribute['formatOptions']['max'] ?? INF; $max = $attribute['formatOptions']['max'] ?? INF;
return new Range($min, $max, Range::TYPE_FLOAT); return new Range($min, $max, Range::TYPE_FLOAT);
}, Database::VAR_FLOAT); }, Database::VAR_FLOAT);
@ -706,43 +733,42 @@ $register->set('logger', function () {
return; return;
} }
if (! Logger::hasProvider($providerName)) { if (!Logger::hasProvider($providerName)) {
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Logging provider not supported. Logging is disabled'); throw new Exception(Exception::GENERAL_SERVER_ERROR, "Logging provider not supported. Logging is disabled");
} }
// Old Sentry Format conversion. Fallback until the old syntax is completely deprecated. // Old Sentry Format conversion. Fallback until the old syntax is completely deprecated.
if (str_contains($providerConfig, ';') && strtolower($providerName) == 'sentry') { if (str_contains($providerConfig, ';') && strtolower($providerName) == 'sentry') {
$configChunks = \explode(';', $providerConfig); $configChunks = \explode(";", $providerConfig);
$sentryKey = $configChunks[0]; $sentryKey = $configChunks[0];
$projectId = $configChunks[1]; $projectId = $configChunks[1];
$providerConfig = 'https://'.$sentryKey.'@sentry.io/'.$projectId; $providerConfig = 'https://' . $sentryKey . '@sentry.io/' . $projectId;
} }
$classname = '\\Utopia\\Logger\\Adapter\\'.\ucfirst($providerName); $classname = '\\Utopia\\Logger\\Adapter\\' . \ucfirst($providerName);
$adapter = new $classname($providerConfig); $adapter = new $classname($providerConfig);
return new Logger($adapter); return new Logger($adapter);
}); });
$register->set('pools', function () { $register->set('pools', function () {
$group = new Group(); $group = new Group();
$fallbackForDB = 'db_main='.AppwriteURL::unparse([ $fallbackForDB = 'db_main=' . AppwriteURL::unparse([
'scheme' => 'mariadb', 'scheme' => 'mariadb',
'host' => System::getEnv('_APP_DB_HOST', 'mariadb'), 'host' => System::getEnv('_APP_DB_HOST', 'mariadb'),
'port' => System::getEnv('_APP_DB_PORT', '3306'), 'port' => System::getEnv('_APP_DB_PORT', '3306'),
'user' => System::getEnv('_APP_DB_USER', ''), 'user' => System::getEnv('_APP_DB_USER', ''),
'pass' => System::getEnv('_APP_DB_PASS', ''), 'pass' => System::getEnv('_APP_DB_PASS', ''),
'path' => System::getEnv('_APP_DB_SCHEMA', ''), 'path' => System::getEnv('_APP_DB_SCHEMA', ''),
]); ]);
$fallbackForRedis = 'redis_main='.AppwriteURL::unparse([ $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([
'scheme' => 'redis', 'scheme' => 'redis',
'host' => System::getEnv('_APP_REDIS_HOST', 'redis'), 'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
'port' => System::getEnv('_APP_REDIS_PORT', '6379'), 'port' => System::getEnv('_APP_REDIS_PORT', '6379'),
'user' => System::getEnv('_APP_REDIS_USER', ''), 'user' => System::getEnv('_APP_REDIS_USER', ''),
'pass' => System::getEnv('_APP_REDIS_PASS', ''), 'pass' => System::getEnv('_APP_REDIS_PASS', ''),
]); ]);
$connections = [ $connections = [
'console' => [ 'console' => [
@ -792,7 +818,7 @@ $register->set('pools', function () {
throw new \Exception('Pool size is too small. Increase the number of allowed database connections or decrease the number of workers.', 500); throw new \Exception('Pool size is too small. Increase the number of allowed database connections or decrease the number of workers.', 500);
} }
$poolSize = (int) ($instanceConnections / $workerCount); $poolSize = (int)($instanceConnections / $workerCount);
foreach ($connections as $key => $connection) { foreach ($connections as $key => $connection) {
$type = $connection['type'] ?? ''; $type = $connection['type'] ?? '';
@ -802,7 +828,7 @@ $register->set('pools', function () {
$dsns = explode(',', $connection['dsns'] ?? ''); $dsns = explode(',', $connection['dsns'] ?? '');
foreach ($dsns as &$dsn) { foreach ($dsns as &$dsn) {
$dsn = explode('=', $dsn); $dsn = explode('=', $dsn);
$name = ($multiple) ? $key.'_'.$dsn[0] : $key; $name = ($multiple) ? $key . '_' . $dsn[0] : $key;
$dsn = $dsn[1] ?? ''; $dsn = $dsn[1] ?? '';
$config[] = $name; $config[] = $name;
if (empty($dsn)) { if (empty($dsn)) {
@ -818,8 +844,8 @@ $register->set('pools', function () {
$dsnScheme = $dsn->getScheme(); $dsnScheme = $dsn->getScheme();
$dsnDatabase = $dsn->getPath(); $dsnDatabase = $dsn->getPath();
if (! in_array($dsnScheme, $schemes)) { if (!in_array($dsnScheme, $schemes)) {
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Invalid console database scheme'); throw new Exception(Exception::GENERAL_SERVER_ERROR, "Invalid console database scheme");
} }
/** /**
@ -833,18 +859,18 @@ $register->set('pools', function () {
'mysql', 'mysql',
'mariadb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) { 'mariadb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) { return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
return new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};charset=utf8mb4", $dsnUser, $dsnPass, [ return new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};charset=utf8mb4", $dsnUser, $dsnPass, array(
PDO::ATTR_TIMEOUT => 3, // Seconds PDO::ATTR_TIMEOUT => 3, // Seconds
PDO::ATTR_PERSISTENT => true, PDO::ATTR_PERSISTENT => true,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
PDO::ATTR_EMULATE_PREPARES => true, PDO::ATTR_EMULATE_PREPARES => true,
PDO::ATTR_STRINGIFY_FETCHES => true, PDO::ATTR_STRINGIFY_FETCHES => true
]); ));
}); });
}, },
'redis' => function () use ($dsnHost, $dsnPort, $dsnPass) { 'redis' => function () use ($dsnHost, $dsnPort, $dsnPass) {
$redis = new Redis(); $redis = new Redis();
@$redis->pconnect($dsnHost, (int) $dsnPort); @$redis->pconnect($dsnHost, (int)$dsnPort);
if ($dsnPass) { if ($dsnPass) {
$redis->auth($dsnPass); $redis->auth($dsnPass);
} }
@ -884,7 +910,7 @@ $register->set('pools', function () {
break; break;
default: default:
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Server error: Missing adapter implementation.'); throw new Exception(Exception::GENERAL_SERVER_ERROR, "Server error: Missing adapter implementation.");
} }
return $adapter; return $adapter;
@ -893,7 +919,7 @@ $register->set('pools', function () {
$group->add($pool); $group->add($pool);
} }
Config::setParam('pools-'.$key, $config); Config::setParam('pools-' . $key, $config);
} }
return $group; return $group;
@ -926,14 +952,14 @@ $register->set('smtp', function () {
$mail->XMailer = 'Appwrite Mailer'; $mail->XMailer = 'Appwrite Mailer';
$mail->Host = System::getEnv('_APP_SMTP_HOST', 'smtp'); $mail->Host = System::getEnv('_APP_SMTP_HOST', 'smtp');
$mail->Port = System::getEnv('_APP_SMTP_PORT', 25); $mail->Port = System::getEnv('_APP_SMTP_PORT', 25);
$mail->SMTPAuth = ! empty($username) && ! empty($password); $mail->SMTPAuth = !empty($username) && !empty($password);
$mail->Username = $username; $mail->Username = $username;
$mail->Password = $password; $mail->Password = $password;
$mail->SMTPSecure = System::getEnv('_APP_SMTP_SECURE', ''); $mail->SMTPSecure = System::getEnv('_APP_SMTP_SECURE', '');
$mail->SMTPAutoTLS = false; $mail->SMTPAutoTLS = false;
$mail->CharSet = 'UTF-8'; $mail->CharSet = 'UTF-8';
$from = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server')); $from = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
$email = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM); $email = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
$mail->setFrom($email, $from); $mail->setFrom($email, $from);
@ -944,13 +970,12 @@ $register->set('smtp', function () {
return $mail; return $mail;
}); });
$register->set('geodb', function () { $register->set('geodb', function () {
return new Reader(__DIR__.'/assets/dbip/dbip-country-lite-2024-02.mmdb'); return new Reader(__DIR__ . '/assets/dbip/dbip-country-lite-2024-02.mmdb');
}); });
$register->set('passwordsDictionary', function () { $register->set('passwordsDictionary', function () {
$content = \file_get_contents(__DIR__.'/assets/security/10k-common-passwords'); $content = \file_get_contents(__DIR__ . '/assets/security/10k-common-passwords');
$content = explode("\n", $content); $content = explode("\n", $content);
$content = array_flip($content); $content = array_flip($content);
return $content; return $content;
}); });
$register->set('promiseAdapter', function () { $register->set('promiseAdapter', function () {
@ -969,12 +994,12 @@ $locales = Config::getParam('locale-codes', []);
foreach ($locales as $locale) { foreach ($locales as $locale) {
$code = $locale['code']; $code = $locale['code'];
$path = __DIR__.'/config/locale/translations/'.$code.'.json'; $path = __DIR__ . '/config/locale/translations/' . $code . '.json';
if (! \file_exists($path)) { if (!\file_exists($path)) {
$path = __DIR__.'/config/locale/translations/'.\substr($code, 0, 2).'.json'; // if `ar-ae` doesn't exist, look for `ar` $path = __DIR__ . '/config/locale/translations/' . \substr($code, 0, 2) . '.json'; // if `ar-ae` doesn't exist, look for `ar`
if (! \file_exists($path)) { if (!\file_exists($path)) {
$path = __DIR__.'/config/locale/translations/en.json'; // if none translation exists, use default from `en.json` $path = __DIR__ . '/config/locale/translations/en.json'; // if none translation exists, use default from `en.json`
} }
} }
@ -1059,7 +1084,7 @@ App::setResource('clients', function ($request, $console, $project) {
$validator = new Hostname(); $validator = new Hostname();
foreach ($hostnames as $hostname) { foreach ($hostnames as $hostname) {
$hostname = trim($hostname); $hostname = trim($hostname);
if (! $validator->isValid($hostname)) { if (!$validator->isValid($hostname)) {
continue; continue;
} }
$console->setAttribute('platforms', [ $console->setAttribute('platforms', [
@ -1078,7 +1103,7 @@ App::setResource('clients', function ($request, $console, $project) {
fn ($node) => $node['hostname'], fn ($node) => $node['hostname'],
\array_filter( \array_filter(
$console->getAttribute('platforms', []), $console->getAttribute('platforms', []),
fn ($node) => (isset($node['type']) && ($node['type'] === Origin::CLIENT_TYPE_WEB) && ! empty($node['hostname'])) fn ($node) => (isset($node['type']) && ($node['type'] === Origin::CLIENT_TYPE_WEB) && !empty($node['hostname']))
) )
); );
@ -1089,8 +1114,8 @@ App::setResource('clients', function ($request, $console, $project) {
if ( if (
isset($node['type']) && isset($node['type']) &&
($node['type'] === Origin::CLIENT_TYPE_WEB || ($node['type'] === Origin::CLIENT_TYPE_WEB ||
$node['type'] === Origin::CLIENT_TYPE_FLUTTER_WEB) && $node['type'] === Origin::CLIENT_TYPE_FLUTTER_WEB) &&
! empty($node['hostname']) !empty($node['hostname'])
) { ) {
$clients[] = $node['hostname']; $clients[] = $node['hostname'];
} }
@ -1106,18 +1131,19 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
/** @var Utopia\Database\Database $dbForProject */ /** @var Utopia\Database\Database $dbForProject */
/** @var Utopia\Database\Database $dbForConsole */ /** @var Utopia\Database\Database $dbForConsole */
/** @var string $mode */ /** @var string $mode */
Authorization::setDefaultStatus(true); Authorization::setDefaultStatus(true);
Auth::setCookieName('a_session_'.$project->getId()); Auth::setCookieName('a_session_' . $project->getId());
if ($mode === APP_MODE_ADMIN) { if (APP_MODE_ADMIN === $mode) {
Auth::setCookieName('a_session_'.$console->getId()); Auth::setCookieName('a_session_' . $console->getId());
} }
$session = Auth::decodeSession( $session = Auth::decodeSession(
$request->getCookie( $request->getCookie(
Auth::$cookieName, // Get sessions Auth::$cookieName, // Get sessions
$request->getCookie(Auth::$cookieName.'_legacy', '') $request->getCookie(Auth::$cookieName . '_legacy', '')
) )
); );
@ -1125,7 +1151,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
if (empty($session['id']) && empty($session['secret'])) { if (empty($session['id']) && empty($session['secret'])) {
$sessionHeader = $request->getHeader('x-appwrite-session', ''); $sessionHeader = $request->getHeader('x-appwrite-session', '');
if (! empty($sessionHeader)) { if (!empty($sessionHeader)) {
$session = Auth::decodeSession($sessionHeader); $session = Auth::decodeSession($sessionHeader);
} }
} }
@ -1147,7 +1173,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
Auth::$unique = $session['id'] ?? ''; Auth::$unique = $session['id'] ?? '';
Auth::$secret = $session['secret'] ?? ''; Auth::$secret = $session['secret'] ?? '';
if ($mode !== APP_MODE_ADMIN) { if (APP_MODE_ADMIN !== $mode) {
if ($project->isEmpty()) { if ($project->isEmpty()) {
$user = new Document([]); $user = new Document([]);
} else { } else {
@ -1163,12 +1189,12 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
if ( if (
$user->isEmpty() // Check a document has been found in the DB $user->isEmpty() // Check a document has been found in the DB
|| ! Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret) || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret)
) { // Validate user has valid login token ) { // Validate user has valid login token
$user = new Document([]); $user = new Document([]);
} }
if ($mode === APP_MODE_ADMIN) { if (APP_MODE_ADMIN === $mode) {
if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) { if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users. Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users.
} else { } else {
@ -1178,13 +1204,13 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
$authJWT = $request->getHeader('x-appwrite-jwt', ''); $authJWT = $request->getHeader('x-appwrite-jwt', '');
if (! empty($authJWT) && ! $project->isEmpty()) { // JWT authentication if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
$jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway. $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
try { try {
$payload = $jwt->decode($authJWT); $payload = $jwt->decode($authJWT);
} catch (JWTException $error) { } catch (JWTException $error) {
throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. '.$error->getMessage()); throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
} }
$jwtUserId = $payload['userId'] ?? ''; $jwtUserId = $payload['userId'] ?? '';
@ -1209,6 +1235,7 @@ App::setResource('project', function ($dbForConsole, $request, $console) {
/** @var Appwrite\Utopia\Request $request */ /** @var Appwrite\Utopia\Request $request */
/** @var Utopia\Database\Database $dbForConsole */ /** @var Utopia\Database\Database $dbForConsole */
/** @var Utopia\Database\Document $console */ /** @var Utopia\Database\Document $console */
$projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', '')); $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
if (empty($projectId) || $projectId === 'console') { if (empty($projectId) || $projectId === 'console') {
@ -1228,7 +1255,7 @@ App::setResource('session', function (Document $user) {
$sessions = $user->getAttribute('sessions', []); $sessions = $user->getAttribute('sessions', []);
$sessionId = Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret); $sessionId = Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret);
if (! $sessionId) { if (!$sessionId) {
return; return;
} }
@ -1238,6 +1265,7 @@ App::setResource('session', function (Document $user) {
} }
} }
return;
}, ['user']); }, ['user']);
App::setResource('console', function () { App::setResource('console', function () {
@ -1270,12 +1298,12 @@ App::setResource('console', function () {
'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user 'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds 'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
], ],
'authWhitelistEmails' => (! empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [], 'authWhitelistEmails' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
'authWhitelistIPs' => (! empty(System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null)) : [], 'authWhitelistIPs' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null)) : [],
'oAuthProviders' => [ 'oAuthProviders' => [
'githubEnabled' => true, 'githubEnabled' => true,
'githubSecret' => System::getEnv('_APP_CONSOLE_GITHUB_SECRET', ''), 'githubSecret' => System::getEnv('_APP_CONSOLE_GITHUB_SECRET', ''),
'githubAppid' => System::getEnv('_APP_CONSOLE_GITHUB_APP_ID', ''), 'githubAppid' => System::getEnv('_APP_CONSOLE_GITHUB_APP_ID', '')
], ],
]); ]);
}, []); }, []);
@ -1289,7 +1317,7 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
$dsn = new DSN($project->getAttribute('database')); $dsn = new DSN($project->getAttribute('database'));
} catch (\InvalidArgumentException) { } catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables // TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://'.$project->getAttribute('database')); $dsn = new DSN('mysql://' . $project->getAttribute('database'));
} }
$dbAdapter = $pools $dbAdapter = $pools
@ -1308,7 +1336,7 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
$dsn = new DSN($project->getAttribute('database')); $dsn = new DSN($project->getAttribute('database'));
} catch (\InvalidArgumentException) { } catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables // TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://'.$project->getAttribute('database')); $dsn = new DSN('mysql://' . $project->getAttribute('database'));
} }
$sharedTablesKeys = explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')); $sharedTablesKeys = explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
@ -1321,7 +1349,7 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
$database $database
->setSharedTables(false) ->setSharedTables(false)
->setTenant(null) ->setTenant(null)
->setNamespace('_'.$project->getInternalId()); ->setNamespace('_' . $project->getInternalId());
} }
return $database; return $database;
@ -1356,7 +1384,7 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$dsn = new DSN($project->getAttribute('database')); $dsn = new DSN($project->getAttribute('database'));
} catch (\InvalidArgumentException) { } catch (\InvalidArgumentException) {
// TODO: Temporary until all projects are using shared tables // TODO: Temporary until all projects are using shared tables
$dsn = new DSN('mysql://'.$project->getAttribute('database')); $dsn = new DSN('mysql://' . $project->getAttribute('database'));
} }
$configure = (function (Database $database) use ($project, $dsn) { $configure = (function (Database $database) use ($project, $dsn) {
@ -1365,12 +1393,6 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
->setMetadata('project', $project->getId()) ->setMetadata('project', $project->getId())
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS); ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
var_dump([
'location' => 'Init::getProjectDB',
'_APP_DATABASE_SHARED_TABLES' => System::getEnv('_APP_DATABASE_SHARED_TABLES', ''),
'dsn' => $dsn,
]);
$sharedTablesKeys = explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')); $sharedTablesKeys = explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
if (in_array($dsn->getHost(), $sharedTablesKeys)) { if (in_array($dsn->getHost(), $sharedTablesKeys)) {
$database $database
@ -1381,14 +1403,13 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$database $database
->setSharedTables(false) ->setSharedTables(false)
->setTenant(null) ->setTenant(null)
->setNamespace('_'.$project->getInternalId()); ->setNamespace('_' . $project->getInternalId());
} }
}); });
if (isset($databases[$dsn->getHost()])) { if (isset($databases[$dsn->getHost()])) {
$database = $databases[$dsn->getHost()]; $database = $databases[$dsn->getHost()];
$configure($database); $configure($database);
return $database; return $database;
} }
@ -1413,7 +1434,8 @@ App::setResource('cache', function (Group $pools) {
$adapters[] = $pools $adapters[] = $pools
->get($value) ->get($value)
->pop() ->pop()
->getResource(); ->getResource()
;
} }
return new Cache(new Sharding($adapters)); return new Cache(new Sharding($adapters));
@ -1423,28 +1445,29 @@ App::setResource('deviceForLocal', function () {
return new Local(); return new Local();
}); });
App::setResource('deviceForFiles', function ($project, $connectionStorage) { App::setResource('deviceForFiles', function ($project, $connectionString) {
return getDevice(APP_STORAGE_UPLOADS.'/app-'.$project->getId(), $connectionStorage); return getDevice(APP_STORAGE_UPLOADS.'/app-'.$project->getId(), $connectionString);
}, ['project', 'connectionStorage']); }, ['project', 'connectionString']);
App::setResource('deviceForFunctions', function ($project, $connectionStorage) { App::setResource('deviceForFunctions', function ($project, $connectionString) {
return getDevice(APP_STORAGE_FUNCTIONS.'/app-'.$project->getId(), $connectionStorage); return getDevice(APP_STORAGE_FUNCTIONS.'/app-'.$project->getId(), $connectionString);
}, ['project', 'connectionStorage']); }, ['project', 'connectionString']);
App::setResource('deviceForBuilds', function ($project, $connectionStorage) { App::setResource('deviceForBuilds', function ($project, $connectionString) {
return getDevice(APP_STORAGE_BUILDS.'/app-'.$project->getId(), $connectionStorage); return getDevice(APP_STORAGE_BUILDS.'/app-'.$project->getId(), $connectionString);
}, ['project', 'connectionStorage']); }, ['project', 'connectionString']);
App::setResource('connectionStorage', function () { App::setResource('connectionString', function () {
return ''; return System::getEnv('_APP_CONNECTIONS_STORAGE', '');
}); });
function getDevice(string $root, string $connectionStorage = ''): Device
function getDevice(string $root, string $connectionString = ''): Device
{ {
$connectionStorage = ! empty($connectionStorage) ? $connectionStorage : System::getEnv('_APP_CONNECTIONS_STORAGE', '');
var_dump('*****$connectionStorag****'); var_dump('*****$connectionStorage****');
var_dump($connectionStorage); var_dump($connectionString);
if (! empty($connectionStorage)) { if (! empty($connectionString)) {
$acl = 'private'; $acl = 'private';
$device = Storage::DEVICE_LOCAL; $device = Storage::DEVICE_LOCAL;
$accessKey = ''; $accessKey = '';
@ -1453,14 +1476,14 @@ function getDevice(string $root, string $connectionStorage = ''): Device
$region = ''; $region = '';
try { try {
$dsn = new DSN($connectionStorage); $dsn = new DSN($connectionString);
$device = $dsn->getScheme(); $device = $dsn->getScheme();
$accessKey = $dsn->getUser() ?? ''; $accessKey = $dsn->getUser() ?? '';
$accessSecret = $dsn->getPassword() ?? ''; $accessSecret = $dsn->getPassword() ?? '';
$bucket = $dsn->getPath() ?? ''; $bucket = $dsn->getPath() ?? '';
$region = $dsn->getParam('region'); $region = $dsn->getParam('region');
} catch (\Throwable $e) { } catch (\Throwable $e) {
Console::warning($e->getMessage().'Invalid DSN. Defaulting to Local device.'); Console::warning($e->getMessage() . 'Invalid DSN. Defaulting to Local device.');
} }
switch ($device) { switch ($device) {
@ -1469,7 +1492,6 @@ function getDevice(string $root, string $connectionStorage = ''): Device
case STORAGE::DEVICE_DO_SPACES: case STORAGE::DEVICE_DO_SPACES:
$device = new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl); $device = new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
$device->setHttpVersion(S3::HTTP_VERSION_1_1); $device->setHttpVersion(S3::HTTP_VERSION_1_1);
return $device; return $device;
case Storage::DEVICE_BACKBLAZE: case Storage::DEVICE_BACKBLAZE:
return new Backblaze($root, $accessKey, $accessSecret, $bucket, $region, $acl); return new Backblaze($root, $accessKey, $accessSecret, $bucket, $region, $acl);
@ -1492,7 +1514,6 @@ function getDevice(string $root, string $connectionStorage = ''): Device
$s3Region = System::getEnv('_APP_STORAGE_S3_REGION', ''); $s3Region = System::getEnv('_APP_STORAGE_S3_REGION', '');
$s3Bucket = System::getEnv('_APP_STORAGE_S3_BUCKET', ''); $s3Bucket = System::getEnv('_APP_STORAGE_S3_BUCKET', '');
$s3Acl = 'private'; $s3Acl = 'private';
return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl); return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
case Storage::DEVICE_DO_SPACES: case Storage::DEVICE_DO_SPACES:
$doSpacesAccessKey = System::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', ''); $doSpacesAccessKey = System::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
@ -1502,7 +1523,6 @@ function getDevice(string $root, string $connectionStorage = ''): Device
$doSpacesAcl = 'private'; $doSpacesAcl = 'private';
$device = new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl); $device = new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl);
$device->setHttpVersion(S3::HTTP_VERSION_1_1); $device->setHttpVersion(S3::HTTP_VERSION_1_1);
return $device; return $device;
case Storage::DEVICE_BACKBLAZE: case Storage::DEVICE_BACKBLAZE:
$backblazeAccessKey = System::getEnv('_APP_STORAGE_BACKBLAZE_ACCESS_KEY', ''); $backblazeAccessKey = System::getEnv('_APP_STORAGE_BACKBLAZE_ACCESS_KEY', '');
@ -1510,7 +1530,6 @@ function getDevice(string $root, string $connectionStorage = ''): Device
$backblazeRegion = System::getEnv('_APP_STORAGE_BACKBLAZE_REGION', ''); $backblazeRegion = System::getEnv('_APP_STORAGE_BACKBLAZE_REGION', '');
$backblazeBucket = System::getEnv('_APP_STORAGE_BACKBLAZE_BUCKET', ''); $backblazeBucket = System::getEnv('_APP_STORAGE_BACKBLAZE_BUCKET', '');
$backblazeAcl = 'private'; $backblazeAcl = 'private';
return new Backblaze($root, $backblazeAccessKey, $backblazeSecretKey, $backblazeBucket, $backblazeRegion, $backblazeAcl); return new Backblaze($root, $backblazeAccessKey, $backblazeSecretKey, $backblazeBucket, $backblazeRegion, $backblazeAcl);
case Storage::DEVICE_LINODE: case Storage::DEVICE_LINODE:
$linodeAccessKey = System::getEnv('_APP_STORAGE_LINODE_ACCESS_KEY', ''); $linodeAccessKey = System::getEnv('_APP_STORAGE_LINODE_ACCESS_KEY', '');
@ -1518,7 +1537,6 @@ function getDevice(string $root, string $connectionStorage = ''): Device
$linodeRegion = System::getEnv('_APP_STORAGE_LINODE_REGION', ''); $linodeRegion = System::getEnv('_APP_STORAGE_LINODE_REGION', '');
$linodeBucket = System::getEnv('_APP_STORAGE_LINODE_BUCKET', ''); $linodeBucket = System::getEnv('_APP_STORAGE_LINODE_BUCKET', '');
$linodeAcl = 'private'; $linodeAcl = 'private';
return new Linode($root, $linodeAccessKey, $linodeSecretKey, $linodeBucket, $linodeRegion, $linodeAcl); return new Linode($root, $linodeAccessKey, $linodeSecretKey, $linodeBucket, $linodeRegion, $linodeAcl);
case Storage::DEVICE_WASABI: case Storage::DEVICE_WASABI:
$wasabiAccessKey = System::getEnv('_APP_STORAGE_WASABI_ACCESS_KEY', ''); $wasabiAccessKey = System::getEnv('_APP_STORAGE_WASABI_ACCESS_KEY', '');
@ -1526,7 +1544,6 @@ function getDevice(string $root, string $connectionStorage = ''): Device
$wasabiRegion = System::getEnv('_APP_STORAGE_WASABI_REGION', ''); $wasabiRegion = System::getEnv('_APP_STORAGE_WASABI_REGION', '');
$wasabiBucket = System::getEnv('_APP_STORAGE_WASABI_BUCKET', ''); $wasabiBucket = System::getEnv('_APP_STORAGE_WASABI_BUCKET', '');
$wasabiAcl = 'private'; $wasabiAcl = 'private';
return new Wasabi($root, $wasabiAccessKey, $wasabiSecretKey, $wasabiBucket, $wasabiRegion, $wasabiAcl); return new Wasabi($root, $wasabiAccessKey, $wasabiSecretKey, $wasabiBucket, $wasabiRegion, $wasabiAcl);
} }
} }
@ -1553,6 +1570,7 @@ App::setResource('passwordsDictionary', function ($register) {
return $register->get('passwordsDictionary'); return $register->get('passwordsDictionary');
}, ['register']); }, ['register']);
App::setResource('servers', function () { App::setResource('servers', function () {
$platforms = Config::getParam('platforms'); $platforms = Config::getParam('platforms');
$server = $platforms[APP_PLATFORM_SERVER]; $server = $platforms[APP_PLATFORM_SERVER];
@ -1609,7 +1627,7 @@ App::setResource('schema', function ($utopia, $dbForProject) {
$params = [ $params = [
'list' => function (string $databaseId, string $collectionId, array $args) { 'list' => function (string $databaseId, string $collectionId, array $args) {
return ['queries' => $args['queries']]; return [ 'queries' => $args['queries']];
}, },
'create' => function (string $databaseId, string $collectionId, array $args) { 'create' => function (string $databaseId, string $collectionId, array $args) {
$id = $args['id'] ?? 'unique()'; $id = $args['id'] ?? 'unique()';
@ -1657,21 +1675,18 @@ App::setResource('schema', function ($utopia, $dbForProject) {
App::setResource('contributors', function () { App::setResource('contributors', function () {
$path = 'app/config/contributors.json'; $path = 'app/config/contributors.json';
$list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : []; $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
return $list; return $list;
}); });
App::setResource('employees', function () { App::setResource('employees', function () {
$path = 'app/config/employees.json'; $path = 'app/config/employees.json';
$list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : []; $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
return $list; return $list;
}); });
App::setResource('heroes', function () { App::setResource('heroes', function () {
$path = 'app/config/heroes.json'; $path = 'app/config/heroes.json';
$list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : []; $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
return $list; return $list;
}); });
@ -1683,14 +1698,13 @@ App::setResource('requestTimestamp', function ($request) {
//TODO: Move this to the Request class itself //TODO: Move this to the Request class itself
$timestampHeader = $request->getHeader('x-appwrite-timestamp'); $timestampHeader = $request->getHeader('x-appwrite-timestamp');
$requestTimestamp = null; $requestTimestamp = null;
if (! empty($timestampHeader)) { if (!empty($timestampHeader)) {
try { try {
$requestTimestamp = new \DateTime($timestampHeader); $requestTimestamp = new \DateTime($timestampHeader);
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid X-Appwrite-Timestamp header value'); throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid X-Appwrite-Timestamp header value');
} }
} }
return $requestTimestamp; return $requestTimestamp;
}, ['request']); }, ['request']);
App::setResource('plan', function (array $plan = []) { App::setResource('plan', function (array $plan = []) {

24
app/worker.php
View file

@ -258,21 +258,21 @@ Server::setResource('pools', function (Registry $register) {
return $register->get('pools'); return $register->get('pools');
}, ['register']); }, ['register']);
Server::setResource('deviceForFunctions', function (Document $project) { Server::setResource('deviceForFunctions', function (Document $project, $connectionString) {
return getDevice(APP_STORAGE_FUNCTIONS.'/app-'.$project->getId()); return getDevice(APP_STORAGE_FUNCTIONS.'/app-'.$project->getId(), $connectionString);
}, ['project']); }, ['project', 'connectionString']);
Server::setResource('deviceForFiles', function (Document $project) { Server::setResource('deviceForFiles', function (Document $project, $connectionString) {
return getDevice(APP_STORAGE_UPLOADS.'/app-'.$project->getId()); return getDevice(APP_STORAGE_UPLOADS.'/app-'.$project->getId(), $connectionString);
}, ['project']); }, ['project', 'connectionString']);
Server::setResource('deviceForBuilds', function (Document $project) { Server::setResource('deviceForBuilds', function (Document $project, $connectionString) {
return getDevice(APP_STORAGE_BUILDS.'/app-'.$project->getId()); return getDevice(APP_STORAGE_BUILDS.'/app-'.$project->getId(), $connectionString);
}, ['project']); }, ['project', 'connectionString']);
Server::setResource('deviceForCache', function (Document $project) { Server::setResource('deviceForCache', function (Document $project, $connectionString) {
return getDevice(APP_STORAGE_CACHE.'/app-'.$project->getId()); return getDevice(APP_STORAGE_CACHE.'/app-'.$project->getId(), $connectionString);
}, ['project']); }, ['project', 'connectionString']);
$pools = $register->get('pools'); $pools = $register->get('pools');
$platform = new Appwrite(); $platform = new Appwrite();