diff --git a/README.md b/README.md
index 9815229e43..ed83252e2f 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,28 @@
-> We just announced DB operators for Appwrite Databases - [Learn more](https://appwrite.io/blog/post/announcing-db-operators)
-
-> Appwrite Cloud is now Generally Available - [Learn more](https://appwrite.io/cloud-ga)
-
-> [Get started with Appwrite](https://apwr.dev/appcloud)
+
- 
-
-
- Appwrite is a best-in-class, developer-first platform that gives builders everything they need to create scalable, stable, and production-ready software, fast.
+
Appwrite
+ Appwrite is an open-source, all-in-one development platform. Use built-in backend infrastructure and web hosting, all from a single place.
-
-
-[](https://appwrite.io/company/careers)
-[](https://hacktoberfest.appwrite.io)
-[](https://appwrite.io/discord?r=Github)
-[](https://github.com/appwrite/appwrite/actions)
-[](https://twitter.com/appwrite)
-
-
-
-
+[](https://appwrite.io/discord)
+[](https://x.com/appwrite)
+[](https://cloud.appwrite.io)
English | [简体中文](README-CN.md)
-Appwrite is an end-to-end platform for building Web, Mobile, Native, or Backend apps, packaged as a set of Docker microservices. It includes both a backend server and a fully integrated hosting solution for deploying static and server-side rendered frontends. Appwrite abstracts the complexity and repetitiveness required to build modern apps from scratch and allows you to build secure, full-stack applications faster.
+Appwrite is an open-source development platform for building web, mobile, and AI applications. It brings together backend infrastructure and web hosting in one place, so teams can build, ship, and scale without stitching together a fragmented stack. Appwrite is available as a managed cloud platform and can also be self-hosted on infrastructure you control.
-Using Appwrite, you can easily integrate your app with user authentication and multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, Cloud Functions, messaging, and [more services](https://appwrite.io/docs).
+With Appwrite, you can add authentication, databases, storage, functions, messaging, realtime capabilities, and integrated web app hosting through Sites. It is designed to reduce the repetitive backend work required to launch modern products while giving developers secure primitives and flexible APIs to build production-ready applications faster.
-
-
-Find out more at: [https://appwrite.io](https://appwrite.io).
+Find out more at [https://appwrite.io](https://appwrite.io).
Table of Contents:
+- [Products](#products)
- [Installation \& Setup](#installation--setup)
- [Self-Hosting](#self-hosting)
- [Unix](#unix)
@@ -47,17 +32,31 @@ Table of Contents:
- [Upgrade from an Older Version](#upgrade-from-an-older-version)
- [One-Click Setups](#one-click-setups)
- [Getting Started](#getting-started)
- - [Products](#products)
- [SDKs](#sdks)
- [Client](#client)
- [Server](#server)
- - [Community](#community)
- [Architecture](#architecture)
- [Contributing](#contributing)
- [Security](#security)
- [Follow Us](#follow-us)
- [License](#license)
+
+## Products
+
+- **[Appwrite Auth](https://appwrite.io/docs/products/authentication)** - Secure user authentication with multiple login methods including email/password, SMS, OAuth, anonymous sessions, and magic links. Includes session management, multi-factor authentication, and user verification flows.
+
+- **[Appwrite Databases](https://appwrite.io/docs/products/databases)** - Scalable structured data storage with support for databases, tables, and rows. Includes querying, pagination, indexing, and relationships to model complex application data.
+
+- **[Appwrite Storage](https://appwrite.io/docs/products/storage)** - Secure file storage with support for uploads, downloads, encryption, compression, and file transformations for media and assets.
+
+- **[Appwrite Functions](https://appwrite.io/docs/products/functions)** - Serverless compute platform to run custom backend logic in isolated runtimes, triggered by events or scheduled jobs.15 runtimes supported.
+
+- **[Appwrite Messaging](https://appwrite.io/docs/products/messaging)** - Multi-channel messaging system for sending emails, SMS, and push notifications to users for engagement, alerts, and transactional workflows.
+
+- **[Appwrite Sites](https://appwrite.io/docs/products/sites)** - Integrated hosting platform to deploy and scale web applications with support for custom domains, SSR, and seamless backend integration. Git integration and previews are supported.
+
+
## Installation & Setup
The easiest way to get started with Appwrite is by [signing up for Appwrite Cloud](https://cloud.appwrite.io/). While Appwrite Cloud is in public beta, you can build with Appwrite completely free, and we won't collect your credit card information.
@@ -168,51 +167,29 @@ Getting started with Appwrite is as easy as creating a new project, choosing you
| | [Quick start for Kotlin](https://appwrite.io/docs/quick-starts/kotlin) |
| | [Quick start for Swift](https://appwrite.io/docs/quick-starts/swift) |
-### Products
-
-- [**Account**](https://appwrite.io/docs/references/cloud/client-web/account) - Manage current user authentication and account. Track and manage the user sessions, devices, sign-in methods, and security logs.
-- [**Users**](https://appwrite.io/docs/server/users) - Manage and list all project users when building backend integrations with Server SDKs.
-- [**Teams**](https://appwrite.io/docs/references/cloud/client-web/teams) - Manage and group users in teams. Manage memberships, invites, and user roles within a team.
-- [**Databases**](https://appwrite.io/docs/references/cloud/client-web/databases) - Manage databases, collections, and documents. Read, create, update, and delete documents and filter lists of document collections using advanced filters.
-- [**Storage**](https://appwrite.io/docs/references/cloud/client-web/storage) - Manage storage files. Read, create, delete, and preview files. Manipulate the preview of your files to perfectly fit your app. All files are scanned by ClamAV and stored in a secure and encrypted way.
-- [**Functions**](https://appwrite.io/docs/references/cloud/server-nodejs/functions) - Customize your Appwrite project by executing your custom code in a secure, isolated environment. You can trigger your code on any Appwrite system event either manually or using a CRON schedule.
-- [**Messaging**](https://appwrite.io/docs/references/cloud/client-web/messaging) - Communicate with your users through push notifications, emails, and SMS text messages using Appwrite Messaging.
-- [**Realtime**](https://appwrite.io/docs/realtime) - Listen to real-time events for any of your Appwrite services including users, storage, functions, databases, and more.
-- [**Locale**](https://appwrite.io/docs/references/cloud/client-web/locale) - Track your user's location and manage your app locale-based data.
-- [**Avatars**](https://appwrite.io/docs/references/cloud/client-web/avatars) - Manage your users' avatars, countries' flags, browser icons, and credit card symbols. Generate QR codes from links or plaintext strings.
-- [**MCP**](https://appwrite.io/docs/tooling/mcp) - Use Appwrite's Model Context Protocol (MCP) server to allow LLMs and AI tools like Claude Desktop, Cursor, and Windsurf Editor to directly interact with your Appwrite project through natural language.
-- [**Sites**](https://appwrite.io/docs/products/sites) - Develop, deploy, and scale your web applications directly from Appwrite, alongside your backend.
-
-For the complete API documentation, visit [https://appwrite.io/docs](https://appwrite.io/docs). For more tutorials, news and announcements check out our [blog](https://medium.com/appwrite-io) and [Discord Server](https://discord.gg/GSeTUeA).
-
### SDKs
Below is a list of currently supported platforms and languages. If you would like to help us add support to your platform of choice, you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md).
#### Client
-- :white_check_mark: [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
-- :white_check_mark: [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
-- :white_check_mark: [Apple](https://github.com/appwrite/sdk-for-apple) (Maintained by the Appwrite Team)
-- :white_check_mark: [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
-- :white_check_mark: [React Native](https://github.com/appwrite/sdk-for-react-native) - **Beta** (Maintained by the Appwrite Team)
+- :white_check_mark: [Web](https://github.com/appwrite/sdk-for-web)
+- :white_check_mark: [Flutter](https://github.com/appwrite/sdk-for-flutter)
+- :white_check_mark: [Apple](https://github.com/appwrite/sdk-for-apple)
+- :white_check_mark: [Android](https://github.com/appwrite/sdk-for-android)
+- :white_check_mark: [React Native](https://github.com/appwrite/sdk-for-react-native)
#### Server
-- :white_check_mark: [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team)
-- :white_check_mark: [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team)
-- :white_check_mark: [Dart](https://github.com/appwrite/sdk-for-dart) (Maintained by the Appwrite Team)
-- :white_check_mark: [Deno](https://github.com/appwrite/sdk-for-deno) (Maintained by the Appwrite Team)
-- :white_check_mark: [Ruby](https://github.com/appwrite/sdk-for-ruby) (Maintained by the Appwrite Team)
-- :white_check_mark: [Python](https://github.com/appwrite/sdk-for-python) (Maintained by the Appwrite Team)
-- :white_check_mark: [Kotlin](https://github.com/appwrite/sdk-for-kotlin) (Maintained by the Appwrite Team)
-- :white_check_mark: [Swift](https://github.com/appwrite/sdk-for-swift) (Maintained by the Appwrite Team)
-- :white_check_mark: [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Beta** (Maintained by the Appwrite Team)
-
-#### Community
-
-- :white_check_mark: [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (Maintained by [Michael Gangolf](https://github.com/m1ga/))
-- :white_check_mark: [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (Maintained by [fenix-hub @GodotNuts](https://github.com/fenix-hub))
+- :white_check_mark: [NodeJS](https://github.com/appwrite/sdk-for-node)
+- :white_check_mark: [PHP](https://github.com/appwrite/sdk-for-php)
+- :white_check_mark: [Dart](https://github.com/appwrite/sdk-for-dart)
+- :white_check_mark: [Deno](https://github.com/appwrite/sdk-for-deno)
+- :white_check_mark: [Ruby](https://github.com/appwrite/sdk-for-ruby)
+- :white_check_mark: [Python](https://github.com/appwrite/sdk-for-python)
+- :white_check_mark: [Kotlin](https://github.com/appwrite/sdk-for-kotlin)
+- :white_check_mark: [Swift](https://github.com/appwrite/sdk-for-swift)
+- :white_check_mark: [.NET](https://github.com/appwrite/sdk-for-dotnet)
Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)!
diff --git a/app/cli.php b/app/cli.php
index b8721320be..458df2d642 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -18,13 +18,15 @@ use Swoole\Timer;
use Utopia\Cache\Adapter\Pool as CachePool;
use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache;
+use Utopia\CLI\Adapters\Generic;
+use Utopia\CLI\CLI;
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\Dependency;
+use Utopia\DI\Container;
use Utopia\DSN\DSN;
use Utopia\Logger\Log;
use Utopia\Platform\Service;
@@ -47,7 +49,7 @@ require_once __DIR__ . '/controllers/general.php';
global $register;
$platform = new Appwrite();
-$args = $platform->getEnv('argv');
+$args = $_SERVER['argv'] ?? [];
\array_shift($args);
if (! isset($args[0])) {
@@ -56,21 +58,15 @@ if (! isset($args[0])) {
}
$taskName = $args[0];
+$container = new Container();
+$cli = new CLI(new Generic(), $_SERVER['argv'] ?? [], $container);
+
+$platform->setCli($cli);
$platform->init(Service::TYPE_TASK);
-$cli = $platform->getCli();
-$setResource = function (string $name, callable $callback, array $injections = []) use ($cli) {
- $dependency = new Dependency();
- $dependency->setName($name)->setCallback($callback);
- foreach ($injections as $injection) {
- $dependency->inject($injection);
- }
- $cli->setResource($dependency);
-};
+$container->set('register', fn () => $register, []);
-$setResource('register', fn () => $register, []);
-
-$setResource('cache', function ($pools) {
+$container->set('cache', function ($pools) {
$list = Config::getParam('pools-cache', []);
$adapters = [];
@@ -81,18 +77,18 @@ $setResource('cache', function ($pools) {
return new Cache(new Sharding($adapters));
}, ['pools']);
-$setResource('pools', function (Registry $register) {
+$container->set('pools', function (Registry $register) {
return $register->get('pools');
}, ['register']);
-$setResource('authorization', function () {
+$container->set('authorization', function () {
$authorization = new Authorization();
$authorization->disable();
return $authorization;
}, []);
-$setResource('dbForPlatform', function ($pools, $cache, $authorization) {
+$container->set('dbForPlatform', function ($pools, $cache, $authorization) {
$sleep = 3;
$maxAttempts = 5;
$attempts = 0;
@@ -135,17 +131,17 @@ $setResource('dbForPlatform', function ($pools, $cache, $authorization) {
return $dbForPlatform;
}, ['pools', 'cache', 'authorization']);
-$setResource('console', function () {
+$container->set('console', function () {
return new Document(Config::getParam('console'));
}, []);
-$setResource(
+$container->set(
'isResourceBlocked',
fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false,
[]
);
-$setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, $authorization) {
+$container->set('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, $authorization) {
$databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases) {
@@ -207,10 +203,10 @@ $setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $c
};
}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
-$setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+$container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
$database = null;
- return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
+ return function (?Document $project = null) use ($pools, $cache, &$database, $authorization) {
if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
$database->setTenant($project->getSequence());
return $database;
@@ -235,41 +231,41 @@ $setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $a
return $database;
};
}, ['pools', 'cache', 'authorization']);
-$setResource('publisher', function (Group $pools) {
+$container->set('publisher', function (Group $pools) {
return new BrokerPool(publisher: $pools->get('publisher'));
}, ['pools']);
-$setResource('publisherDatabases', function (BrokerPool $publisher) {
+$container->set('publisherDatabases', function (BrokerPool $publisher) {
return $publisher;
}, ['publisher']);
-$setResource('publisherFunctions', function (BrokerPool $publisher) {
+$container->set('publisherFunctions', function (BrokerPool $publisher) {
return $publisher;
}, ['publisher']);
-$setResource('publisherMigrations', function (BrokerPool $publisher) {
+$container->set('publisherMigrations', function (BrokerPool $publisher) {
return $publisher;
}, ['publisher']);
-$setResource('publisherMessaging', function (BrokerPool $publisher) {
+$container->set('publisherMessaging', function (BrokerPool $publisher) {
return $publisher;
}, ['publisher']);
-$setResource('usage', function () {
+$container->set('usage', function () {
return new UsageContext();
}, []);
-$setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
+$container->set('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
$publisher,
new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
), ['publisher']);
-$setResource('queueForStatsResources', function (Publisher $publisher) {
+$container->set('queueForStatsResources', function (Publisher $publisher) {
return new StatsResources($publisher);
}, ['publisher']);
-$setResource('queueForFunctions', function (Publisher $publisher) {
+$container->set('queueForFunctions', function (Publisher $publisher) {
return new Func($publisher);
}, ['publisher']);
-$setResource('queueForDeletes', function (Publisher $publisher) {
+$container->set('queueForDeletes', function (Publisher $publisher) {
return new Delete($publisher);
}, ['publisher']);
-$setResource('queueForCertificates', function (Publisher $publisher) {
+$container->set('queueForCertificates', function (Publisher $publisher) {
return new Certificate($publisher);
}, ['publisher']);
-$setResource('logError', function (Registry $register) {
+$container->set('logError', function (Registry $register) {
return function (Throwable $error, string $namespace, string $action) use ($register) {
Console::error('[Error] Timestamp: ' . date('c', time()));
Console::error('[Error] Type: ' . get_class($error));
@@ -321,25 +317,28 @@ $setResource('logError', function (Registry $register) {
};
}, ['register']);
-$setResource('executor', fn () => new Executor(), []);
+$container->set('executor', fn () => new Executor(), []);
-$setResource('bus', function (Registry $register) use ($cli) {
- return $register->get('bus')->setResolver(fn (string $name) => $cli->getResource($name));
+$container->set('bus', function (Registry $register) use ($container) {
+ return $register->get('bus')->setResolver(fn (string $name) => $container->get($name));
}, ['register']);
-$setResource('telemetry', fn () => new NoTelemetry(), []);
+$container->set('telemetry', fn () => new NoTelemetry(), []);
+
+$exitCode = 0;
$cli
->error()
->inject('error')
->inject('logError')
- ->action(function (Throwable $error, callable $logError) use ($taskName) {
+ ->action(function (Throwable $error, callable $logError) use ($taskName, &$exitCode) {
call_user_func_array($logError, [
$error,
'Task',
$taskName,
]);
+ $exitCode = 1;
Timer::clearAll();
});
@@ -348,3 +347,4 @@ $cli->shutdown()->action(fn () => Timer::clearAll());
Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
require_once __DIR__ . '/init/span.php';
run($cli->run(...));
+Console::exit($exitCode);
diff --git a/app/config/console.php b/app/config/console.php
index 24de8a8cbb..0b0d6c5881 100644
--- a/app/config/console.php
+++ b/app/config/console.php
@@ -39,6 +39,10 @@ $console = [
'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
'duration' => TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
'sessionAlerts' => System::getEnv('_APP_CONSOLE_SESSION_ALERTS', 'disabled') === 'enabled',
+ // For email configuration, false means feature is disabled; false means these emails are allowed during sign-ups
+ 'disposableEmails' => false,
+ 'canonicalEmails' => false,
+ 'freeEmails' => false,
'invalidateSessions' => true
],
'authWhitelistEmails' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
diff --git a/app/config/errors.php b/app/config/errors.php
index ec2593d207..03fdc2bcc5 100644
--- a/app/config/errors.php
+++ b/app/config/errors.php
@@ -226,6 +226,21 @@ return [
'description' => 'A user with the same email already exists in the current project.',
'code' => 409,
],
+ Exception::USER_EMAIL_DISPOSABLE => [
+ 'name' => Exception::USER_EMAIL_DISPOSABLE,
+ 'description' => 'Disposable email addresses are not allowed. Please use a permanent email address.',
+ 'code' => 400,
+ ],
+ Exception::USER_EMAIL_FREE => [
+ 'name' => Exception::USER_EMAIL_FREE,
+ 'description' => 'Free email addresses are not allowed. Please use a business or custom-domain email address.',
+ 'code' => 400,
+ ],
+ Exception::USER_EMAIL_NOT_CANONICAL => [
+ 'name' => Exception::USER_EMAIL_NOT_CANONICAL,
+ 'description' => 'This email address must already be in its canonical form. Please remove aliases, tags, or provider-specific variations and try again.',
+ 'code' => 400,
+ ],
Exception::USER_PASSWORD_MISMATCH => [
'name' => Exception::USER_PASSWORD_MISMATCH,
'description' => 'Passwords do not match. Please check the password and confirm password.',
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 4cfc4476b6..cbdf11225a 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -207,7 +207,7 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, arr
}
-$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, Authorization $authorization) {
+$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
// Attempt to decode secret as a JWT (used by OAuth2 token flow to carry provider info)
$oauthProvider = null;
@@ -345,7 +345,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
->setProperty('secret', $sessionSecret)
->encode();
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
}
@@ -353,8 +353,8 @@ $createSession = function (string $userId, string $secret, Request $request, Res
$protocol = $request->getProtocol();
$response
- ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
- ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+ ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
+ ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
->setStatusCode(Response::STATUS_CODE_CREATED);
$countryName = $locale->getText('countries.' . strtolower($session->getAttribute('countryCode')), $locale->getText('locale.country.unknown'));
@@ -403,7 +403,8 @@ Http::post('/v1/account')
->inject('dbForProject')
->inject('authorization')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Authorization $authorization, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Authorization $authorization, Hooks $hooks, array $plan) {
$email = \strtolower($email);
if ('console' === $project->getId()) {
@@ -452,11 +453,38 @@ Http::post('/v1/account')
$passwordHistory = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
$proof = new ProofsPassword();
$hash = $proof->hash($password);
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
try {
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
+ throw new Exception(Exception::GENERAL_INVALID_EMAIL);
+ }
+
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
}
try {
@@ -487,11 +515,11 @@ Http::post('/v1/account')
'authenticators' => null,
'search' => implode(' ', [$userId, $email, $name]),
'accessedAt' => DateTime::now(),
- 'emailCanonical' => $emailCanonical?->getCanonical(),
- 'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
- 'emailIsCorporate' => $emailCanonical?->isCorporate(),
- 'emailIsDisposable' => $emailCanonical?->isDisposable(),
- 'emailIsFree' => $emailCanonical?->isFree(),
+ 'emailCanonical' => $emailMetadata['emailCanonical'],
+ 'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+ 'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+ 'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+ 'emailIsFree' => $emailMetadata['emailIsFree'],
]);
$user->removeAttribute('$sequence');
@@ -691,7 +719,9 @@ Http::delete('/v1/account/sessions')
->inject('queueForDeletes')
->inject('store')
->inject('proofForToken')
- ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken) {
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
+ ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
$protocol = $request->getProtocol();
$sessions = $user->getAttribute('sessions', []);
@@ -700,7 +730,7 @@ Http::delete('/v1/account/sessions')
foreach ($sessions as $session) {/** @var Document $session */
$dbForProject->deleteDocument('sessions', $session->getId());
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([]));
}
@@ -713,8 +743,8 @@ Http::delete('/v1/account/sessions')
// If current session delete the cookies too
$response
- ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
- ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+ ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
+ ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
// Use current session for events.
$currentSession = $session;
@@ -821,7 +851,9 @@ Http::delete('/v1/account/sessions/:sessionId')
->inject('queueForDeletes')
->inject('store')
->inject('proofForToken')
- ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken) {
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
+ ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
$protocol = $request->getProtocol();
$sessionId = ($sessionId === 'current')
@@ -847,13 +879,13 @@ Http::delete('/v1/account/sessions/:sessionId')
->setAttribute('current', true)
->setAttribute('countryName', $locale->getText('countries.' . strtolower($session->getAttribute('countryCode')), $locale->getText('locale.country.unknown')));
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([]));
}
$response
- ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
- ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+ ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
+ ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
}
$dbForProject->purgeCachedDocument('users', $user->getId());
@@ -1007,8 +1039,10 @@ Http::post('/v1/account/sessions/email')
->inject('store')
->inject('proofForPassword')
->inject('proofForToken')
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
->inject('authorization')
- ->action(function (string $email, string $password, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Hooks $hooks, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, Authorization $authorization) {
+ ->action(function (string $email, string $password, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Hooks $hooks, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
$email = \strtolower($email);
$protocol = $request->getProtocol();
@@ -1082,15 +1116,15 @@ Http::post('/v1/account/sessions/email')
->setProperty('secret', $secret)
->encode();
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
}
$expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
$response
- ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
- ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+ ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
+ ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
->setStatusCode(Response::STATUS_CODE_CREATED)
;
@@ -1156,8 +1190,10 @@ Http::post('/v1/account/sessions/anonymous')
->inject('store')
->inject('proofForPassword')
->inject('proofForToken')
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
->inject('authorization')
- ->action(function (Request $request, Response $response, Locale $locale, User $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, Authorization $authorization) {
+ ->action(function (Request $request, Response $response, Locale $locale, User $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
$protocol = $request->getProtocol();
if ('console' === $project->getId()) {
@@ -1248,15 +1284,15 @@ Http::post('/v1/account/sessions/anonymous')
->setProperty('secret', $secret)
->encode();
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
}
$expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
$response
- ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
- ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+ ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
+ ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
->setStatusCode(Response::STATUS_CODE_CREATED)
;
@@ -1311,7 +1347,9 @@ Http::post('/v1/account/sessions/token')
->inject('store')
->inject('proofForToken')
->inject('proofForCode')
-->inject('authorization')
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
+ ->inject('authorization')
->action($createSession);
Http::get('/v1/account/sessions/oauth2/:provider')
@@ -1509,8 +1547,11 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
->inject('store')
->inject('proofForPassword')
->inject('proofForToken')
+ ->inject('plan')
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
->inject('authorization')
- ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Validator $redirectValidator, Document $devKey, User $user, Database $dbForProject, Database $dbForPlatform, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, Authorization $authorization) use ($oauthDefaultSuccess) {
+ ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Validator $redirectValidator, Document $devKey, User $user, Database $dbForProject, Database $dbForPlatform, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, array $plan, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) use ($oauthDefaultSuccess) {
$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
$port = $request->getPort();
$callbackBase = $protocol . '://' . $request->getHostname();
@@ -1752,10 +1793,38 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
}
}
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
+ $failureRedirect(Exception::GENERAL_INVALID_EMAIL);
+ }
+
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ $failureRedirect(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ $failureRedirect(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ $failureRedirect(Exception::USER_EMAIL_FREE);
}
try {
@@ -1785,11 +1854,11 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
'authenticators' => null,
'search' => implode(' ', [$userId, $email, $name]),
'accessedAt' => DateTime::now(),
- 'emailCanonical' => $emailCanonical?->getCanonical(),
- 'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
- 'emailIsCorporate' => $emailCanonical?->isCorporate(),
- 'emailIsDisposable' => $emailCanonical?->isDisposable(),
- 'emailIsFree' => $emailCanonical?->isFree(),
+ 'emailCanonical' => $emailMetadata['emailCanonical'],
+ 'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+ 'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+ 'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+ 'emailIsFree' => $emailMetadata['emailIsFree'],
]);
$user->removeAttribute('$sequence');
@@ -1864,19 +1933,47 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
}
if (empty($user->getAttribute('email'))) {
- $user->setAttribute('email', $oauth2->getUserEmail($accessToken));
+ $email = $oauth2->getUserEmail($accessToken);
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
try {
- $emailCanonical = new Email($user->getAttribute('email'));
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
+ $failureRedirect(Exception::GENERAL_INVALID_EMAIL);
}
- $user->setAttribute('emailCanonical', $emailCanonical?->getCanonical());
- $user->setAttribute('emailIsCanonical', $emailCanonical?->isCanonicalSupported());
- $user->setAttribute('emailIsCorporate', $emailCanonical?->isCorporate());
- $user->setAttribute('emailIsDisposable', $emailCanonical?->isDisposable());
- $user->setAttribute('emailIsFree', $emailCanonical?->isFree());
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ $failureRedirect(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ $failureRedirect(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ $failureRedirect(Exception::USER_EMAIL_FREE);
+ }
+
+ $user->setAttribute('email', $email);
+ $user->setAttribute('emailCanonical', $emailMetadata['emailCanonical']);
+ $user->setAttribute('emailIsCanonical', $emailMetadata['emailIsCanonical']);
+ $user->setAttribute('emailIsCorporate', $emailMetadata['emailIsCorporate']);
+ $user->setAttribute('emailIsDisposable', $emailMetadata['emailIsDisposable']);
+ $user->setAttribute('emailIsFree', $emailMetadata['emailIsFree']);
}
if (empty($user->getAttribute('name'))) {
@@ -1970,7 +2067,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
->setProperty('secret', $secret)
->encode();
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
}
@@ -1983,14 +2080,14 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
// TODO: Remove this deprecated workaround - support only token
if ($state['success']['path'] == $oauthDefaultSuccess) {
$query['project'] = $project->getId();
- $query['domain'] = Config::getParam('cookieDomain');
+ $query['domain'] = $cookieDomain;
$query['key'] = $store->getKey();
$query['secret'] = $encoded;
}
$response
- ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
- ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+ ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
+ ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
}
if (isset($sessionUpgrade) && $sessionUpgrade && isset($session)) {
@@ -2154,10 +2251,11 @@ Http::post('/v1/account/tokens/magic-url')
->inject('locale')
->inject('queueForEvents')
->inject('queueForMails')
+ ->inject('plan')
->inject('proofForPassword')
->inject('platform')
->inject('authorization')
- ->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) {
+ ->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, array $plan, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) {
if (empty(System::getEnv('_APP_SMTP_HOST'))) {
throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
}
@@ -2192,10 +2290,38 @@ Http::post('/v1/account/tokens/magic-url')
$userId = $userId === 'unique()' ? ID::unique() : $userId;
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
+ throw new Exception(Exception::GENERAL_INVALID_EMAIL);
+ }
+
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
}
$user->setAttributes([
@@ -2222,11 +2348,11 @@ Http::post('/v1/account/tokens/magic-url')
'authenticators' => null,
'search' => implode(' ', [$userId, $email]),
'accessedAt' => DateTime::now(),
- 'emailCanonical' => $emailCanonical?->getCanonical(),
- 'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
- 'emailIsCorporate' => $emailCanonical?->isCorporate(),
- 'emailIsDisposable' => $emailCanonical?->isDisposable(),
- 'emailIsFree' => $emailCanonical?->isFree(),
+ 'emailCanonical' => $emailMetadata['emailCanonical'],
+ 'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+ 'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+ 'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+ 'emailIsFree' => $emailMetadata['emailIsFree'],
]);
$user->removeAttribute('$sequence');
@@ -2434,10 +2560,11 @@ Http::post('/v1/account/tokens/email')
->inject('locale')
->inject('queueForEvents')
->inject('queueForMails')
+ ->inject('plan')
->inject('proofForPassword')
->inject('proofForCode')
->inject('authorization')
- ->action(function (string $userId, string $email, bool $phrase, Request $request, Response $response, User $user, Document $project, array $platform, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, ProofsPassword $proofForPassword, ProofsCode $proofForCode, Authorization $authorization) {
+ ->action(function (string $userId, string $email, bool $phrase, Request $request, Response $response, User $user, Document $project, array $platform, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, array $plan, ProofsPassword $proofForPassword, ProofsCode $proofForCode, Authorization $authorization) {
if (empty(System::getEnv('_APP_SMTP_HOST'))) {
throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
}
@@ -2470,10 +2597,38 @@ Http::post('/v1/account/tokens/email')
$userId = $userId === 'unique()' ? ID::unique() : $userId;
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
+ throw new Exception(Exception::GENERAL_INVALID_EMAIL);
+ }
+
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
}
$user->setAttributes([
@@ -2498,11 +2653,11 @@ Http::post('/v1/account/tokens/email')
'memberships' => null,
'search' => implode(' ', [$userId, $email]),
'accessedAt' => DateTime::now(),
- 'emailCanonical' => $emailCanonical?->getCanonical(),
- 'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
- 'emailIsCorporate' => $emailCanonical?->isCorporate(),
- 'emailIsDisposable' => $emailCanonical?->isDisposable(),
- 'emailIsFree' => $emailCanonical?->isFree(),
+ 'emailCanonical' => $emailMetadata['emailCanonical'],
+ 'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+ 'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+ 'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+ 'emailIsFree' => $emailMetadata['emailIsFree'],
]);
$user->removeAttribute('$sequence');
@@ -2743,11 +2898,13 @@ Http::put('/v1/account/sessions/magic-url')
->inject('queueForMails')
->inject('store')
->inject('proofForCode')
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
->inject('authorization')
- ->action(function ($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $queueForMails, $store, $proofForCode, $authorization) use ($createSession) {
+ ->action(function ($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $queueForMails, $store, $proofForCode, $domainVerification, $cookieDomain, $authorization) use ($createSession) {
$proofForToken = new ProofsToken(TOKEN_LENGTH_MAGIC_URL);
$proofForToken->setHash(new Sha());
- $createSession($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $queueForMails, $store, $proofForToken, $proofForCode, $authorization);
+ $createSession($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $queueForMails, $store, $proofForToken, $proofForCode, $domainVerification, $cookieDomain, $authorization);
});
Http::put('/v1/account/sessions/phone')
@@ -2793,6 +2950,8 @@ Http::put('/v1/account/sessions/phone')
->inject('store')
->inject('proofForToken')
->inject('proofForCode')
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
->inject('authorization')
->action($createSession);
@@ -3319,9 +3478,10 @@ Http::patch('/v1/account/email')
->inject('queueForEvents')
->inject('project')
->inject('hooks')
+ ->inject('plan')
->inject('proofForPassword')
- ->inject('authorization')
- ->action(function (string $email, string $password, ?\DateTime $requestTimestamp, Response $response, User $user, Database $dbForProject, Event $queueForEvents, Document $project, Hooks $hooks, ProofsPassword $proofForPassword, Authorization $authorization) {
+ ->inject('authorization')
+ ->action(function (string $email, string $password, ?\DateTime $requestTimestamp, Response $response, User $user, Database $dbForProject, Event $queueForEvents, Document $project, Hooks $hooks, array $plan, ProofsPassword $proofForPassword, Authorization $authorization) {
// passwordUpdate will be empty if the user has never set a password
$passwordUpdate = $user->getAttribute('passwordUpdate');
@@ -3349,20 +3509,48 @@ Http::patch('/v1/account/email')
throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
}
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
+ throw new Exception(Exception::GENERAL_INVALID_EMAIL);
+ }
+
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
}
$user
->setAttribute('email', $email)
->setAttribute('emailVerification', false) // After this user needs to confirm mail again
- ->setAttribute('emailCanonical', $emailCanonical?->getCanonical())
- ->setAttribute('emailIsCanonical', $emailCanonical?->isCanonicalSupported())
- ->setAttribute('emailIsCorporate', $emailCanonical?->isCorporate())
- ->setAttribute('emailIsDisposable', $emailCanonical?->isDisposable())
- ->setAttribute('emailIsFree', $emailCanonical?->isFree())
+ ->setAttribute('emailCanonical', $emailMetadata['emailCanonical'])
+ ->setAttribute('emailIsCanonical', $emailMetadata['emailIsCanonical'])
+ ->setAttribute('emailIsCorporate', $emailMetadata['emailIsCorporate'])
+ ->setAttribute('emailIsDisposable', $emailMetadata['emailIsDisposable'])
+ ->setAttribute('emailIsFree', $emailMetadata['emailIsFree'])
;
if (empty($passwordUpdate)) {
@@ -3555,7 +3743,9 @@ Http::patch('/v1/account/status')
->inject('dbForProject')
->inject('queueForEvents')
->inject('store')
- ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Store $store) {
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
+ ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Store $store, bool $domainVerification, ?string $cookieDomain) {
$user->setAttribute('status', false);
@@ -3565,14 +3755,14 @@ Http::patch('/v1/account/status')
->setParam('userId', $user->getId())
->setPayload($response->output($user, Response::MODEL_ACCOUNT));
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([]));
}
$protocol = $request->getProtocol();
$response
- ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
- ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+ ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
+ ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
;
$response->dynamic($user, Response::MODEL_ACCOUNT);
@@ -3765,7 +3955,7 @@ Http::post('/v1/account/recovery')
->setParam('userId', $profile->getId())
->setParam('tokenId', $recovery->getId())
->setUser($profile)
- ->setPayload(Response::showSensitive(fn () => $response->output($recovery, Response::MODEL_TOKEN)), sensitive: ['secret']);
+ ->setPayload($response->showSensitive(fn () => $response->output($recovery, Response::MODEL_TOKEN)), sensitive: ['secret']);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3866,7 +4056,7 @@ Http::put('/v1/account/recovery')
$queueForEvents
->setParam('userId', $profile->getId())
->setParam('tokenId', $recoveryDocument->getId())
- ->setPayload(Response::showSensitive(fn () => $response->output($recoveryDocument, Response::MODEL_TOKEN)), sensitive: ['secret']);
+ ->setPayload($response->showSensitive(fn () => $response->output($recoveryDocument, Response::MODEL_TOKEN)), sensitive: ['secret']);
$response->dynamic($recoveryDocument, Response::MODEL_TOKEN);
});
@@ -4096,7 +4286,7 @@ Http::post('/v1/account/verifications/email')
$queueForEvents
->setParam('userId', $user->getId())
->setParam('tokenId', $verification->getId())
- ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
+ ->setPayload($response->showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -4188,7 +4378,7 @@ Http::put('/v1/account/verifications/email')
$queueForEvents
->setParam('userId', $userId)
->setParam('tokenId', $verification->getId())
- ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
+ ->setPayload($response->showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
$response->dynamic($verification, Response::MODEL_TOKEN);
});
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index e4900e6564..51fc3d03c7 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -73,7 +73,7 @@ use Utopia\Validator\Text;
use Utopia\Validator\WhiteList;
/** TODO: Remove function when we move to using utopia/platform */
-function createUser(Hash $hash, string $userId, ?string $email, ?string $password, ?string $phone, ?string $name, Document $project, Database $dbForProject, Hooks $hooks): Document
+function createUser(Hash $hash, string $userId, ?string $email, ?string $password, ?string $phone, ?string $name, Document $project, Database $dbForProject, Hooks $hooks, array $plan): Document
{
$name = $name ?? '';
$plaintextPassword = $password;
@@ -110,11 +110,39 @@ function createUser(Hash $hash, string $userId, ?string $email, ?string $passwor
}
}
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email ?? '');
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
}
+
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
+ }
+
$hashedPassword = null;
$isHashed = !$hash instanceof Plaintext;
@@ -159,11 +187,11 @@ function createUser(Hash $hash, string $userId, ?string $email, ?string $passwor
'tokens' => null,
'memberships' => null,
'search' => implode(' ', [$userId, $email, $phone, $name]),
- 'emailCanonical' => $emailCanonical?->getCanonical(),
- 'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
- 'emailIsCorporate' => $emailCanonical?->isCorporate(),
- 'emailIsDisposable' => $emailCanonical?->isDisposable(),
- 'emailIsFree' => $emailCanonical?->isFree(),
+ 'emailCanonical' => $emailMetadata['emailCanonical'],
+ 'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+ 'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+ 'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+ 'emailIsFree' => $emailMetadata['emailIsFree'],
]);
if (!$isHashed && !empty($password)) {
@@ -256,10 +284,11 @@ Http::post('/v1/users')
->inject('project')
->inject('dbForProject')
->inject('hooks')
- ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
$plaintext = new Plaintext();
- $user = createUser($plaintext, $userId, $email, $password, $phone, $name, $project, $dbForProject, $hooks);
+ $user = createUser($plaintext, $userId, $email, $password, $phone, $name, $project, $dbForProject, $hooks, $plan);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($user, Response::MODEL_USER);
@@ -292,11 +321,12 @@ Http::post('/v1/users/bcrypt')
->inject('project')
->inject('dbForProject')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
$bcrypt = new Bcrypt();
$bcrypt->setCost(8); // Default cost
- $user = createUser($bcrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+ $user = createUser($bcrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -330,10 +360,11 @@ Http::post('/v1/users/md5')
->inject('project')
->inject('dbForProject')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
$md5 = new MD5();
- $user = createUser($md5, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+ $user = createUser($md5, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -367,10 +398,11 @@ Http::post('/v1/users/argon2')
->inject('project')
->inject('dbForProject')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
$argon2 = new Argon2();
- $user = createUser($argon2, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+ $user = createUser($argon2, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -405,13 +437,14 @@ Http::post('/v1/users/sha')
->inject('project')
->inject('dbForProject')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $passwordVersion, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, string $email, string $password, string $passwordVersion, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
$sha = new Sha();
if (!empty($passwordVersion)) {
$sha->setVersion($passwordVersion);
}
- $user = createUser($sha, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+ $user = createUser($sha, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -445,10 +478,11 @@ Http::post('/v1/users/phpass')
->inject('project')
->inject('dbForProject')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
$phpass = new PHPass();
- $user = createUser($phpass, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+ $user = createUser($phpass, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -487,7 +521,8 @@ Http::post('/v1/users/scrypt')
->inject('project')
->inject('dbForProject')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
$scrypt = new Scrypt();
$scrypt
->setSalt($passwordSalt)
@@ -496,7 +531,7 @@ Http::post('/v1/users/scrypt')
->setParallelCost($passwordParallel)
->setLength($passwordLength);
- $user = createUser($scrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+ $user = createUser($scrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -533,14 +568,15 @@ Http::post('/v1/users/scrypt-modified')
->inject('project')
->inject('dbForProject')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ ->inject('plan')
+ ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
$scryptModified = new ScryptModified();
$scryptModified
->setSalt($passwordSalt)
->setSaltSeparator($passwordSaltSeparator)
->setSignerKey($passwordSignerKey);
- $user = createUser($scryptModified, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+ $user = createUser($scryptModified, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -1470,8 +1506,10 @@ Http::patch('/v1/users/:userId/email')
->param('email', '', new EmailValidator(allowEmpty: true), 'User email.')
->inject('response')
->inject('dbForProject')
+ ->inject('project')
+ ->inject('plan')
->inject('queueForEvents')
- ->action(function (string $userId, string $email, Response $response, Database $dbForProject, Event $queueForEvents) {
+ ->action(function (string $userId, string $email, Response $response, Database $dbForProject, Document $project, array $plan, Event $queueForEvents) {
$user = $dbForProject->getDocument('users', $userId);
@@ -1502,20 +1540,47 @@ Http::patch('/v1/users/:userId/email')
$oldEmail = $user->getAttribute('email');
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
+ }
+
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
}
$user
->setAttribute('email', $email)
->setAttribute('emailVerification', false)
- ->setAttribute('emailCanonical', $emailCanonical?->getCanonical())
- ->setAttribute('emailIsCanonical', $emailCanonical?->isCanonicalSupported())
- ->setAttribute('emailIsCorporate', $emailCanonical?->isCorporate())
- ->setAttribute('emailIsDisposable', $emailCanonical?->isDisposable())
- ->setAttribute('emailIsFree', $emailCanonical?->isFree())
+ ->setAttribute('emailCanonical', $emailMetadata['emailCanonical'])
+ ->setAttribute('emailIsCanonical', $emailMetadata['emailIsCanonical'])
+ ->setAttribute('emailIsCorporate', $emailMetadata['emailIsCorporate'])
+ ->setAttribute('emailIsDisposable', $emailMetadata['emailIsDisposable'])
+ ->setAttribute('emailIsFree', $emailMetadata['emailIsFree'])
;
try {
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 3bf5f027f2..c6e2eacb33 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -61,8 +61,6 @@ use Utopia\System\System;
use Utopia\Validator;
use Utopia\Validator\Text;
-Config::setParam('domainVerification', false);
-Config::setParam('cookieDomain', 'localhost');
Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeleteEvent $queueForDeletes, int $executionsRetentionCount)
@@ -754,11 +752,8 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
}
if (\is_array($values)) {
- $count = 0;
foreach ($values as $value) {
- $override = $count === 0;
- $response->addHeader($name, $value, override: $override);
- $count++;
+ $response->addHeader($name, $value);
}
} else {
$response->addHeader($name, $values);
@@ -868,7 +863,7 @@ Http::init()
* Request format
*/
$route = $utopia->getRoute();
- Request::setRoute($route);
+ $request->setRoute($route);
if ($route === null) {
$response->setStatusCode(404);
@@ -904,40 +899,16 @@ Http::init()
$locale->setDefault($localeParam);
}
- $origin = \parse_url($request->getOrigin($request->getReferer('')), PHP_URL_HOST);
- $selfDomain = new Domain($request->getHostname());
- $endDomain = new Domain((string)$origin);
- Config::setParam(
- 'domainVerification',
- ($selfDomain->getRegisterable() === $endDomain->getRegisterable()) &&
- $endDomain->getRegisterable() !== ''
- );
-
$localHosts = ['localhost','localhost:'.$request->getPort()];
$migrationHost = System::getEnv('_APP_MIGRATION_HOST');
if (!empty($migrationHost)) {
+ // Treat the migration host like localhost because internal migration and
+ // CI traffic may use it before a public domain is configured.
$localHosts[] = $migrationHost;
$localHosts[] = $migrationHost.':'.$request->getPort();
}
- $isLocalHost = in_array($request->getHostname(), $localHosts);
- $isIpAddress = filter_var($request->getHostname(), FILTER_VALIDATE_IP) !== false;
-
- $isConsoleProject = $project->getAttribute('$id', '') === 'console';
- $isConsoleRootSession = System::getEnv('_APP_CONSOLE_ROOT_SESSION', 'disabled') === 'enabled';
-
- Config::setParam(
- 'cookieDomain',
- $isLocalHost || $isIpAddress
- ? null
- : (
- $isConsoleProject && $isConsoleRootSession
- ? '.' . $selfDomain->getRegisterable()
- : '.' . $request->getHostname()
- )
- );
-
$warnings = [];
/*
@@ -1019,7 +990,7 @@ Http::init()
return;
}
$route = $request->getRoute();
- if ($route->getLabel('origin', false) === '*') {
+ if ($route?->getLabel('origin', false) === '*') {
return;
}
if (!$originValidator->isValid($origin)) {
@@ -1493,6 +1464,21 @@ Http::error()
'type' => $type,
];
+ // Add CORS headers to error responses so browsers can read the error.
+ // Wrapped in try-catch: if the error itself is a DB failure, resolving
+ // the cors resource (which depends on rule -> DB) would cascade.
+ // Uses override:true to avoid duplicate headers if init() already set them.
+ try {
+ $cors = $utopia->getResource('cors');
+ foreach ($cors->headers($request->getOrigin()) as $name => $value) {
+ $response
+ ->removeHeader($name)
+ ->addHeader($name, $value);
+ }
+ } catch (Throwable) {
+ // Degrade gracefully - error response without CORS is no worse than before.
+ }
+
$response
->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
->addHeader('Expires', '0')
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 5166429e32..8254a22ac0 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -98,6 +98,9 @@ Http::init()
->inject('authorization')
->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
$route = $utopia->getRoute();
+ if ($route === null) {
+ throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
+ }
/**
* Handle user authentication and session validation.
@@ -489,6 +492,10 @@ Http::init()
$request->setUser($user);
$route = $utopia->getRoute();
+ if ($route === null) {
+ throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
+ }
+
$path = $route->getMatchedPath();
$databaseType = match (true) {
str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
diff --git a/app/http.php b/app/http.php
index 4532839727..67da67376d 100644
--- a/app/http.php
+++ b/app/http.php
@@ -1,16 +1,13 @@
column('value', Table::TYPE_INT, 1);
$certifiedDomains->create();
-Http::setResource('riskyDomains', fn () => $riskyDomains);
-Http::setResource('certifiedDomains', fn () => $certifiedDomains);
-
-$http = new Server(
- host: "0.0.0.0",
- port: System::getEnv('PORT', 80),
- mode: SWOOLE_PROCESS,
-);
+global $container;
+$container->set('riskyDomains', fn () => $riskyDomains);
+$container->set('certifiedDomains', fn () => $certifiedDomains);
+$container->set('pools', function ($register) {
+ return $register->get('pools');
+}, ['register']);
$payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
$totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
+$swooleAdapter = new Server(
+ host: "0.0.0.0",
+ port: System::getEnv('PORT', 80),
+ settings: [
+ Constant::OPTION_WORKER_NUM => $totalWorkers,
+ Constant::OPTION_DISPATCH_FUNC => dispatch(...),
+ Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
+ Constant::OPTION_HTTP_COMPRESSION => false,
+ Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
+ Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
+ Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
+ ],
+ container: $container,
+);
+
+$container->set('container', fn () => fn () => $swooleAdapter->getContainer());
+
+$http = $swooleAdapter->getServer();
+
/**
* Assigns HTTP requests to worker threads by analyzing its payload/content.
*
@@ -69,16 +84,16 @@ $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intva
* riskier tasks to a dedicated worker subset. Prefers idle workers, with fallback to random selection if necessary.
* doc: https://openswoole.com/docs/modules/swoole-server/configuration#dispatch_func
*
- * @param Server $server Swoole server instance.
+ * @param \Swoole\Http\Server $server Swoole server instance.
* @param int $fd client ID
* @param int $type the type of data and its current state
* @param string|null $data Request content for categorization.
* @global int $totalThreads Total number of workers.
* @return int Chosen worker ID for the request.
*/
-function dispatch(Server $server, int $fd, int $type, $data = null): int
+function dispatch(\Swoole\Http\Server $server, int $fd, int $type, $data = null): int
{
- $resolveWorkerId = function (Server $server, $data = null) {
+ $resolveWorkerId = function (\Swoole\Http\Server $server, $data = null) {
global $totalWorkers, $riskyDomains;
// If data is not set we can send request to any worker
@@ -161,18 +176,6 @@ function dispatch(Server $server, int $fd, int $type, $data = null): int
return $workerId;
}
-
-$http
- ->set([
- Constant::OPTION_WORKER_NUM => $totalWorkers,
- Constant::OPTION_DISPATCH_FUNC => dispatch(...),
- Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
- Constant::OPTION_HTTP_COMPRESSION => false,
- Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
- Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
- Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
- ]);
-
$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
});
@@ -189,16 +192,14 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server) {
Console::success('Reload completed...');
});
-Http::setResource('bus', function ($register, $utopia) {
- return $register->get('bus')->setResolver(fn (string $name) => $utopia->getResource($name));
-}, ['register', 'utopia']);
+$container->set('bus', function ($register) use ($swooleAdapter) {
+ return $register->get('bus')->setResolver(fn (string $name) => $swooleAdapter->getContainer()->get($name));
+}, ['register']);
include __DIR__ . '/controllers/general.php';
function createDatabase(Http $app, string $resourceKey, string $dbName, array $collections, mixed $pools, ?callable $extraSetup = null): void
{
- $max = 15;
- $sleep = 2;
$max = 15;
$sleep = 2;
$attempts = 0;
@@ -289,13 +290,13 @@ function createDatabase(Http $app, string $resourceKey, string $dbName, array $c
Span::current()?->finish();
}
-$http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $totalWorkers, $register) {
- $app = new Http('UTC');
+$http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorkers, $swooleAdapter) {
+ $app = new Http($swooleAdapter, 'UTC');
- go(function () use ($register, $app) {
- $pools = $register->get('pools');
- /** @var \Utopia\Pools\Group $pools */
- Http::setResource('pools', fn () => $pools);
+ /** @var \Utopia\Pools\Group $pools */
+ $pools = $app->getResource('pools');
+
+ go(function () use ($app, $pools) {
/** @var array $collections */
$collections = Config::getParam('collections', []);
@@ -511,14 +512,11 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $tot
});
});
-$http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register, $files) {
+$swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swooleAdapter, $registerRequestResources) {
Span::init('http.request');
- Http::setResource('swooleRequest', fn () => $swooleRequest);
- Http::setResource('swooleResponse', fn () => $swooleResponse);
-
- $request = new Request($swooleRequest);
- $response = new Response($swooleResponse);
+ $request = new Request($utopiaRequest->getSwooleRequest());
+ $response = new Response($utopiaResponse->getSwooleResponse());
Span::add('http.method', $request->getMethod());
@@ -534,13 +532,18 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
return;
}
- $app = new Http('UTC');
+ $requestContainer = $swooleAdapter->getContainer();
+ $requestContainer->set('request', fn () => $request);
+ $requestContainer->set('response', fn () => $response);
+
+ $app = new Http($swooleAdapter, 'UTC');
+ $requestContainer->set('utopia', fn () => $app);
+
+ $registerRequestResources($requestContainer);
+
$app->setCompression(System::getEnv('_APP_COMPRESSION_ENABLED', 'enabled') === 'enabled');
$app->setCompressionMinSize(intval(System::getEnv('_APP_COMPRESSION_MIN_SIZE_BYTES', '1024'))); // 1KB
- $pools = $register->get('pools');
- Http::setResource('pools', fn () => $pools);
-
try {
$authorization = $app->getResource('authorization');
@@ -624,6 +627,7 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
}
}
+ $swooleResponse = $utopiaResponse->getSwooleResponse();
$swooleResponse->setStatusCode(500);
$output = ((Http::isDevelopment())) ? [
@@ -647,11 +651,10 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
});
// Fetch domains every `DOMAIN_SYNC_TIMER` seconds and update in the memory
-$http->on(Constant::EVENT_TASK, function () use ($register) {
+$http->on(Constant::EVENT_TASK, function () use ($swooleAdapter) {
$lastSyncUpdate = null;
- $pools = $register->get('pools');
- Http::setResource('pools', fn () => $pools);
- $app = new Http('UTC');
+
+ $app = new Http($swooleAdapter, 'UTC');
/** @var Utopia\Database\Database $dbForPlatform */
$dbForPlatform = $app->getResource('dbForPlatform');
@@ -726,4 +729,4 @@ $http->on(Constant::EVENT_TASK, function () use ($register) {
});
});
-$http->start();
+$swooleAdapter->start();
diff --git a/app/init/registers.php b/app/init/registers.php
index 68ccbd2097..c07bc9da8b 100644
--- a/app/init/registers.php
+++ b/app/init/registers.php
@@ -245,19 +245,8 @@ $register->set('pools', function () {
$maxConnections = (int) System::getEnv('_APP_CONNECTIONS_MAX', 151);
$instanceConnections = $maxConnections / (int) System::getEnv('_APP_POOL_CLIENTS', 14);
- $multiprocessing = System::getEnv('_APP_SERVER_MULTIPROCESS', 'disabled') === 'enabled';
-
- if ($multiprocessing) {
- $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
- } else {
- $workerCount = 1;
- }
-
- if ($workerCount > $instanceConnections) {
- 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);
+ $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
+ $poolSize = max(1, (int)($instanceConnections / $workerCount));
foreach ($connections as $key => $connection) {
$type = $connection['type'] ?? '';
diff --git a/app/init/resources.php b/app/init/resources.php
index 8acecb8e3e..fdca88c30e 100644
--- a/app/init/resources.php
+++ b/app/init/resources.php
@@ -1,47 +1,10 @@
new Log());
-Http::setResource('logger', function ($register) {
+global $register;
+global $container;
+$container = new Container();
+
+$container->set('logger', function ($register) {
return $register->get('logger');
}, ['register']);
-Http::setResource('hooks', function ($register) {
+$container->set('hooks', function ($register) {
return $register->get('hooks');
}, ['register']);
-global $register;
-Http::setResource('register', fn () => $register);
-Http::setResource('locale', function () {
- $locale = new Locale(System::getEnv('_APP_LOCALE', 'en'));
- $locale->setFallback(System::getEnv('_APP_LOCALE', 'en'));
+$container->set('register', fn () => $register);
- return $locale;
-});
-
-Http::setResource('localeCodes', function () {
+$container->set('localeCodes', function () {
return array_map(fn ($locale) => $locale['code'], Config::getParam('locale-codes', []));
});
-// Queues
-Http::setResource('publisher', function (Group $pools) {
+// Queues - shared infrastructure (stateless pool wrappers)
+$container->set('publisher', function (Group $pools) {
return new BrokerPool(publisher: $pools->get('publisher'));
}, ['pools']);
-Http::setResource('publisherDatabases', function (Publisher $publisher) {
+$container->set('publisherDatabases', function (Publisher $publisher) {
return $publisher;
}, ['publisher']);
-Http::setResource('publisherFunctions', function (Publisher $publisher) {
+$container->set('publisherFunctions', function (Publisher $publisher) {
return $publisher;
}, ['publisher']);
-Http::setResource('publisherMigrations', function (Publisher $publisher) {
+$container->set('publisherMigrations', function (Publisher $publisher) {
return $publisher;
}, ['publisher']);
-Http::setResource('publisherMails', function (Publisher $publisher) {
+$container->set('publisherMails', function (Publisher $publisher) {
return $publisher;
}, ['publisher']);
-Http::setResource('publisherDeletes', function (Publisher $publisher) {
+$container->set('publisherDeletes', function (Publisher $publisher) {
return $publisher;
}, ['publisher']);
-Http::setResource('publisherMessaging', function (Publisher $publisher) {
+$container->set('publisherMessaging', function (Publisher $publisher) {
return $publisher;
}, ['publisher']);
-Http::setResource('publisherWebhooks', function (Publisher $publisher) {
+$container->set('publisherWebhooks', function (Publisher $publisher) {
return $publisher;
}, ['publisher']);
-Http::setResource('queueForMessaging', function (Publisher $publisher) {
- return new Messaging($publisher);
-}, ['publisher']);
-Http::setResource('queueForMails', function (Publisher $publisher) {
- return new Mail($publisher);
-}, ['publisher']);
-Http::setResource('queueForBuilds', function (Publisher $publisher) {
- return new Build($publisher);
-}, ['publisher']);
-Http::setResource('queueForScreenshots', function (Publisher $publisher) {
- return new Screenshot($publisher);
-}, ['publisher']);
-Http::setResource('queueForDatabase', function (Publisher $publisher) {
- return new EventDatabase($publisher);
-}, ['publisher']);
-Http::setResource('queueForDeletes', function (Publisher $publisher) {
- return new Delete($publisher);
-}, ['publisher']);
-Http::setResource('queueForEvents', function (Publisher $publisher) {
- return new Event($publisher);
-}, ['publisher']);
-Http::setResource('queueForWebhooks', function (Publisher $publisher) {
- return new Webhook($publisher);
-}, ['publisher']);
-Http::setResource('queueForRealtime', function () {
- return new Realtime();
-}, []);
-Http::setResource('usage', function () {
- return new UsageContext();
-}, []);
-Http::setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
+$container->set('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
$publisher,
new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
), ['publisher']);
-Http::setResource('queueForAudits', function (Publisher $publisher) {
- return new AuditEvent($publisher);
-}, ['publisher']);
-Http::setResource('queueForFunctions', function (Publisher $publisher) {
- return new Func($publisher);
-}, ['publisher']);
-Http::setResource('eventProcessor', function () {
- return new EventProcessor();
-}, []);
-Http::setResource('queueForCertificates', function (Publisher $publisher) {
- return new Certificate($publisher);
-}, ['publisher']);
-Http::setResource('queueForMigrations', function (Publisher $publisher) {
- return new Migration($publisher);
-}, ['publisher']);
-Http::setResource('queueForStatsResources', function (Publisher $publisher) {
- return new StatsResources($publisher);
-}, ['publisher']);
/**
* Platform configuration
*/
-Http::setResource('platform', function () {
+$container->set('platform', function () {
return Config::getParam('platform', []);
}, []);
-/**
- * List of allowed request hostnames for the request.
- */
-Http::setResource('allowedHostnames', function (array $platform, Document $project, Document $rule, Document $devKey, Request $request) {
- $allowed = [...($platform['hostnames'] ?? [])];
-
- /* Add platform configured hostnames */
- if (! $project->isEmpty() && $project->getId() !== 'console') {
- $platforms = $project->getAttribute('platforms', []);
- $hostnames = Platform::getHostnames($platforms);
- $allowed = [...$allowed, ...$hostnames];
- }
-
- /* Add the request hostname if a dev key is found */
- if (! $devKey->isEmpty()) {
- $allowed[] = $request->getHostname();
- }
-
- $originHostname = parse_url($request->getOrigin(), PHP_URL_HOST);
- $refererHostname = parse_url($request->getReferer(), PHP_URL_HOST);
-
- $hostname = $originHostname;
- if (empty($hostname)) {
- $hostname = $refererHostname;
- }
-
- /* Add request hostname for preflight requests */
- if ($request->getMethod() === 'OPTIONS') {
- $allowed[] = $hostname;
- }
-
- /* Allow the request origin of rule */
- if (! $rule->isEmpty() && ! empty($rule->getAttribute('domain', ''))) {
- $allowed[] = $rule->getAttribute('domain', '');
- }
-
- /* Allow the request origin if a dev key is found */
- if (! $devKey->isEmpty() && ! empty($hostname)) {
- $allowed[] = $hostname;
- }
-
- return array_unique($allowed);
-}, ['platform', 'project', 'rule', 'devKey', 'request']);
-
-/**
- * List of allowed request schemes for the request.
- */
-Http::setResource('allowedSchemes', function (array $platform, Document $project) {
- $allowed = [...($platform['schemas'] ?? [])];
-
- if (! $project->isEmpty() && $project->getId() !== 'console') {
- /* Add hardcoded schemes */
- $allowed[] = 'exp';
- $allowed[] = 'appwrite-callback-' . $project->getId();
-
- /* Add platform configured schemes */
- $platforms = $project->getAttribute('platforms', []);
- $schemes = Platform::getSchemes($platforms);
- $allowed = [...$allowed, ...$schemes];
- }
-
- return array_unique($allowed);
-}, ['platform', 'project']);
-
-/**
- * Rule associated with a request origin.
- */
-Http::setResource('rule', function (Request $request, Database $dbForPlatform, Document $project, Authorization $authorization) {
- $domain = \parse_url($request->getOrigin(), PHP_URL_HOST);
-
- if (empty($domain)) {
- $domain = \parse_url($request->getReferer(), PHP_URL_HOST);
- }
-
- if (empty($domain)) {
- return new Document();
- }
-
- // TODO: (@Meldiron) Remove after 1.7.x migration
- $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
- $rule = $authorization->skip(function () use ($dbForPlatform, $domain, $isMd5) {
- if ($isMd5) {
- return $dbForPlatform->getDocument('rules', md5($domain));
- }
-
- return $dbForPlatform->findOne('rules', [
- Query::equal('domain', [$domain]),
- ]) ?? new Document();
- });
-
- $permitsCurrentProject = $rule->getAttribute('projectInternalId', '') === $project->getSequence();
-
- // Temporary implementation until custom wildcard domains are an official feature
- // Allow trusted projects; Used for Console (website) previews
- if (! $permitsCurrentProject && ! $rule->isEmpty() && ! empty($rule->getAttribute('projectId', ''))) {
- $trustedProjects = [];
- foreach (\explode(',', System::getEnv('_APP_CONSOLE_TRUSTED_PROJECTS', '')) as $trustedProject) {
- if (empty($trustedProject)) {
- continue;
- }
- $trustedProjects[] = $trustedProject;
- }
- if (\in_array($rule->getAttribute('projectId', ''), $trustedProjects)) {
- $permitsCurrentProject = true;
- }
- }
-
- if (! $permitsCurrentProject) {
- return new Document();
- }
-
- return $rule;
-}, ['request', 'dbForPlatform', 'project', 'authorization']);
-
-/**
- * CORS service
- */
-Http::setResource('cors', function (array $allowedHostnames) {
- $corsConfig = Config::getParam('cors');
-
- return new Cors(
- $allowedHostnames,
- allowedMethods: $corsConfig['allowedMethods'],
- allowedHeaders: $corsConfig['allowedHeaders'],
- allowCredentials: true,
- exposedHeaders: $corsConfig['exposedHeaders'],
- );
-}, ['allowedHostnames']);
-
-Http::setResource('originValidator', function (Document $devKey, array $allowedHostnames, array $allowedSchemes) {
- if (! $devKey->isEmpty()) {
- return new URL();
- }
-
- return new Origin($allowedHostnames, $allowedSchemes);
-}, ['devKey', 'allowedHostnames', 'allowedSchemes']);
-
-Http::setResource('redirectValidator', function (Document $devKey, array $allowedHostnames, array $allowedSchemes) {
- if (! $devKey->isEmpty()) {
- return new URL();
- }
-
- return new Redirect($allowedHostnames, $allowedSchemes);
-}, ['devKey', 'allowedHostnames', 'allowedSchemes']);
-
-Http::setResource('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken, $authorization) {
- /**
- * Handles user authentication and session validation.
- *
- * This function follows a series of steps to determine the appropriate user session
- * based on cookies, headers, and JWT tokens.
- *
- * Process:
- * 1. Checks the cookie based on mode:
- * - If in admin mode, uses console project id for key.
- * - Otherwise, sets the key using the project ID
- * 2. If no cookie is found, attempts to retrieve the fallback header `x-fallback-cookies`.
- * - If this method is used, returns the header: `X-Debug-Fallback: true`.
- * 3. Fetches the user document from the appropriate database based on the mode.
- * 4. If the user document is empty or the session key cannot be verified, sets an empty user document.
- * 5. Regardless of the results from steps 1-4, attempts to fetch the JWT token.
- * 6. If the JWT user has a valid session ID, updates the user variable with the user from `projectDB`,
- * overwriting the previous value.
- * 7. If account API key is passed, use user of the account API key as long as user ID header matches too
- */
- $authorization->setDefaultStatus(true);
-
- $store->setKey('a_session_' . $project->getId());
-
- if ($mode === APP_MODE_ADMIN) {
- $store->setKey('a_session_' . $console->getId());
- }
-
- $store->decode(
- $request->getCookie(
- $store->getKey(), // Get sessions
- $request->getCookie($store->getKey() . '_legacy', '')
- )
- );
-
- // Get session from header for SSR clients
- if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
- $sessionHeader = $request->getHeader('x-appwrite-session', '');
-
- if (! empty($sessionHeader)) {
- $store->decode($sessionHeader);
- }
- }
-
- // Get fallback session from old clients (no SameSite support) or clients who block 3rd-party cookies
- if ($response) { // if in http context - add debug header
- $response->addHeader('X-Debug-Fallback', 'false');
- }
-
- if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
- if ($response) {
- $response->addHeader('X-Debug-Fallback', 'true');
- }
- $fallback = $request->getHeader('x-fallback-cookies', '');
- $fallback = \json_decode($fallback, true);
- $store->decode(((is_array($fallback) && isset($fallback[$store->getKey()])) ? $fallback[$store->getKey()] : ''));
- }
-
- $user = null;
- if ($mode === APP_MODE_ADMIN) {
- /** @var User $user */
- $user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
- } else {
- if ($project->isEmpty()) {
- $user = new User([]);
- } else {
- if (! empty($store->getProperty('id', ''))) {
- if ($project->getId() === 'console') {
- /** @var User $user */
- $user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
- } else {
- /** @var User $user */
- $user = $dbForProject->getDocument('users', $store->getProperty('id', ''));
- }
- }
- }
- }
-
- if (
- ! $user ||
- $user->isEmpty() // Check a document has been found in the DB
- || ! $user->sessionVerify($store->getProperty('secret', ''), $proofForToken)
- ) { // Validate user has valid login token
- $user = new User([]);
- }
-
- $authJWT = $request->getHeader('x-appwrite-jwt', '');
- if (! empty($authJWT) && ! $project->isEmpty()) { // JWT authentication
- if (! $user->isEmpty()) {
- throw new Exception(Exception::USER_JWT_AND_COOKIE_SET);
- }
-
- $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
- try {
- $payload = $jwt->decode($authJWT);
- } catch (JWTException $error) {
- throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
- }
-
- $jwtUserId = $payload['userId'] ?? '';
- if (! empty($jwtUserId)) {
- if ($mode === APP_MODE_ADMIN) {
- /** @var User $user */
- $user = $dbForPlatform->getDocument('users', $jwtUserId);
- } else {
- /** @var User $user */
- $user = $dbForProject->getDocument('users', $jwtUserId);
- }
- }
- $jwtSessionId = $payload['sessionId'] ?? '';
- if (! empty($jwtSessionId)) {
- if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token
- $user = new User([]);
- }
- }
- }
-
- // Account based on account API key
- $accountKey = $request->getHeader('x-appwrite-key', '');
- $accountKeyUserId = $request->getHeader('x-appwrite-user', '');
- if (! empty($accountKeyUserId) && ! empty($accountKey)) {
- if (! $user->isEmpty()) {
- throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
- }
-
- /** @var User $accountKeyUser */
- $accountKeyUser = $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->getDocument('users', $accountKeyUserId));
- if (! $accountKeyUser->isEmpty()) {
- $key = $accountKeyUser->find(
- key: 'secret',
- find: $accountKey,
- subject: 'keys'
- );
-
- if (! empty($key)) {
- $expire = $key->getAttribute('expire');
- if (! empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
- throw new Exception(Exception::ACCOUNT_KEY_EXPIRED);
- }
-
- $user = $accountKeyUser;
- }
- }
- }
-
- // Impersonation: if current user has impersonator capability and headers are set, act as another user
- $impersonateUserId = $request->getHeader('x-appwrite-impersonate-user-id', '');
- $impersonateEmail = $request->getHeader('x-appwrite-impersonate-user-email', '');
- $impersonatePhone = $request->getHeader('x-appwrite-impersonate-user-phone', '');
- if (!$user->isEmpty() && $user->getAttribute('impersonator', false)) {
- $userDb = (APP_MODE_ADMIN === $mode || $project->getId() === 'console') ? $dbForPlatform : $dbForProject;
- $targetUser = null;
- if (!empty($impersonateUserId)) {
- $targetUser = $userDb->getAuthorization()->skip(fn () => $userDb->getDocument('users', $impersonateUserId));
- } elseif (!empty($impersonateEmail)) {
- $targetUser = $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])]));
- } elseif (!empty($impersonatePhone)) {
- $targetUser = $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])]));
- }
- if ($targetUser !== null && !$targetUser->isEmpty()) {
- $impersonator = clone $user;
- $user = clone $targetUser;
- $user->setAttribute('impersonatorUserId', $impersonator->getId());
- $user->setAttribute('impersonatorUserInternalId', $impersonator->getSequence());
- $user->setAttribute('impersonatorUserName', $impersonator->getAttribute('name', ''));
- $user->setAttribute('impersonatorUserEmail', $impersonator->getAttribute('email', ''));
- $user->setAttribute('impersonatorAccessedAt', $impersonator->getAttribute('accessedAt', 0));
- }
- }
-
- $dbForProject->setMetadata('user', $user->getId());
- $dbForPlatform->setMetadata('user', $user->getId());
-
- return $user;
-}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken', 'authorization']);
-
-Http::setResource('project', function ($dbForPlatform, $request, $console, $authorization, Http $utopia) {
- /** @var Appwrite\Utopia\Request $request */
- /** @var Utopia\Database\Database $dbForPlatform */
- /** @var Utopia\Database\Document $console */
- $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
- // Realtime channel "project" can send project=Query array
- if (! \is_string($projectId)) {
- $projectId = $request->getHeader('x-appwrite-project', '');
- }
-
- // Backwards compatibility for new services, originally project resources
- // These endpoints moved from /v1/projects/:projectId/ to /v1/
- // When accessed via the old alias path, extract projectId from the URI
- $deprecatedProjectPathPrefix = '/v1/projects/';
- $route = $utopia->match($request);
- if (!empty($route)) {
- $isDeprecatedAlias = \str_starts_with($request->getURI(), $deprecatedProjectPathPrefix) &&
- !\str_starts_with($route->getPath(), $deprecatedProjectPathPrefix);
-
- if ($isDeprecatedAlias) {
- $projectId = \explode('/', $request->getURI(), 5)[3] ?? '';
- }
- }
-
- if (empty($projectId) || $projectId === 'console') {
- return $console;
- }
-
- $project = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-
- return $project;
-}, ['dbForPlatform', 'request', 'console', 'authorization', 'utopia']);
-
-Http::setResource('session', function (User $user, Store $store, Token $proofForToken) {
- if ($user->isEmpty()) {
- return;
- }
-
- $sessions = $user->getAttribute('sessions', []);
- $sessionId = $user->sessionVerify($store->getProperty('secret', ''), $proofForToken);
-
- if (! $sessionId) {
- return;
- }
- foreach ($sessions as $session) {
- /** @var Document $session */
- if ($sessionId === $session->getId()) {
- return $session;
- }
- }
-
-}, ['user', 'store', 'proofForToken']);
-
-Http::setResource('store', function (): Store {
- return new Store();
-});
-
-Http::setResource('proofForPassword', function (): Password {
- $hash = new Argon2();
- $hash
- ->setMemoryCost(7168)
- ->setTimeCost(5)
- ->setThreads(1);
-
- $password = new Password();
- $password
- ->setHash($hash);
-
- return $password;
-});
-
-Http::setResource('proofForToken', function (): Token {
- $token = new Token();
- $token->setHash(new Sha());
-
- return $token;
-});
-
-Http::setResource('proofForCode', function (): Code {
- $code = new Code();
- $code->setHash(new Sha());
-
- return $code;
-});
-
-Http::setResource('console', function () {
+$container->set('console', function () {
return new Document(Config::getParam('console'));
}, []);
-Http::setResource('authorization', function () {
+$container->set('authorization', function () {
return new Authorization();
}, []);
-Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, UsageContext $usage, Authorization $authorization, Request $request) {
- if ($project->isEmpty() || $project->getId() === 'console') {
- return $dbForPlatform;
- }
-
- $database = $project->getAttribute('database', '');
- if (empty($database)) {
- 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)) {
- $database
- ->setSharedTables(true)
- ->setTenant($project->getSequence())
- ->setNamespace($dsn->getParam('namespace'));
- } else {
- $database
- ->setSharedTables(false)
- ->setTenant(null)
- ->setNamespace('_' . $project->getSequence());
- }
-
- /**
- * This isolated event handling for `users.*.create` which is based on a `Database::EVENT_DOCUMENT_CREATE` listener may look odd, but it is **intentional**.
- *
- * Accounts can be created in many ways beyond `createAccount`
- * (anonymous, OAuth, phone, etc.), and those flows are probably not covered in event tests; so we handle this here.
- */
- $eventDatabaseListener = function (Document $project, Document $document, Response $response, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
- // Only trigger events for user creation with the database listener.
- if ($document->getCollection() !== 'users') {
- return;
- }
-
- $queueForEvents
- ->setEvent('users.[userId].create')
- ->setParam('userId', $document->getId())
- ->setPayload($response->output($document, Response::MODEL_USER));
-
- // Trigger functions, webhooks, and realtime events
- $queueForFunctions
- ->from($queueForEvents)
- ->trigger();
-
- /** Trigger webhooks events only if a project has them enabled */
- if (! empty($project->getAttribute('webhooks'))) {
- $queueForWebhooks
- ->from($queueForEvents)
- ->trigger();
- }
-
- /** Trigger realtime events only for non console events */
- if ($queueForEvents->getProject()->getId() !== 'console') {
- $queueForRealtime
- ->from($queueForEvents)
- ->trigger();
- }
- };
-
- /**
- * Purge function events cache when functions are created, updated or deleted.
- */
- $functionsEventsCacheListener = function (string $event, Document $document, Document $project, Database $dbForProject) {
-
- if ($document->getCollection() !== 'functions') {
- return;
- }
-
- if ($project->isEmpty() || $project->getId() === 'console') {
- return;
- }
-
- $hostname = $dbForProject->getAdapter()->getHostname();
- $cacheKey = \sprintf(
- '%s-cache-%s:%s:%s:project:%s:functions:events',
- $dbForProject->getCacheName(),
- $hostname,
- $dbForProject->getNamespace(),
- $dbForProject->getTenant(),
- $project->getId()
- );
-
- $dbForProject->getCache()->purge($cacheKey);
- };
-
- /**
- * Prefix metrics with database type when applicable.
- * Avoids prefixing for legacy and tablesdb types to preserve historical metrics.
- */
- $getDatabaseTypePrefixedMetric = function (string $databaseType, string $metric): string {
- if (
- $databaseType === '' ||
- $databaseType === DATABASE_TYPE_LEGACY ||
- $databaseType === DATABASE_TYPE_TABLESDB
- ) {
- return $metric;
- }
-
- return $databaseType . '.' . $metric;
- };
-
- // Determine database type from request path, similar to api.php
- $path = $request->getURI();
- $databaseType = match (true) {
- str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
- str_contains($path, '/vectorsdb') => DATABASE_TYPE_VECTORSDB,
- default => '',
- };
-
- $usageDatabaseListener = function (string $event, Document $document, UsageContext $usage) use ($getDatabaseTypePrefixedMetric, $databaseType) {
- $value = 1;
-
- switch ($event) {
- case Database::EVENT_DOCUMENT_DELETE:
- $value = -1;
- break;
- case Database::EVENT_DOCUMENTS_DELETE:
- $value = -1 * $document->getAttribute('modified', 0);
- break;
- case Database::EVENT_DOCUMENTS_CREATE:
- $value = $document->getAttribute('modified', 0);
- break;
- case Database::EVENT_DOCUMENTS_UPSERT:
- $value = $document->getAttribute('created', 0);
- break;
- }
-
- switch (true) {
- case $document->getCollection() === 'teams':
- $usage->addMetric(METRIC_TEAMS, $value); // per project
- break;
- case $document->getCollection() === 'users':
- $usage->addMetric(METRIC_USERS, $value); // per project
- if ($event === Database::EVENT_DOCUMENT_DELETE) {
- $usage->addReduce($document);
- }
- break;
- case $document->getCollection() === 'sessions': // sessions
- $usage->addMetric(METRIC_SESSIONS, $value); // per project
- break;
- case $document->getCollection() === 'databases': // databases
- $metric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASES);
- $usage->addMetric($metric, $value); // per project
-
- if ($event === Database::EVENT_DOCUMENT_DELETE) {
- $usage->addReduce($document);
- }
- break;
- case str_starts_with($document->getCollection(), 'database_') && ! str_contains($document->getCollection(), 'collection'): // collections
- $parts = explode('_', $document->getCollection());
- $databaseInternalId = $parts[1] ?? 0;
- $collectionMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_COLLECTIONS);
- $databaseIdCollectionMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_COLLECTIONS);
- $usage
- ->addMetric($collectionMetric, $value) // per project
- ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdCollectionMetric), $value);
-
- if ($event === Database::EVENT_DOCUMENT_DELETE) {
- $usage->addReduce($document);
- }
- break;
- case str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_'): // documents
- $parts = explode('_', $document->getCollection());
- $databaseInternalId = $parts[1] ?? 0;
- $collectionInternalId = $parts[3] ?? 0;
- $documentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DOCUMENTS);
- $databaseIdDocumentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_DOCUMENTS);
- $databaseIdCollectionIdDocumentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS);
- $usage
- ->addMetric($documentsMetric, $value) // per project
- ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
- ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
- break;
- case $document->getCollection() === 'buckets': // buckets
- $usage->addMetric(METRIC_BUCKETS, $value); // per project
- if ($event === Database::EVENT_DOCUMENT_DELETE) {
- $usage
- ->addReduce($document);
- }
- break;
- case str_starts_with($document->getCollection(), 'bucket_'): // files
- $parts = explode('_', $document->getCollection());
- $bucketInternalId = $parts[1];
- $usage
- ->addMetric(METRIC_FILES, $value) // per project
- ->addMetric(METRIC_FILES_STORAGE, $document->getAttribute('sizeOriginal') * $value) // per project
- ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES), $value) // per bucket
- ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES_STORAGE), $document->getAttribute('sizeOriginal') * $value); // per bucket
- break;
- case $document->getCollection() === 'functions':
- $usage->addMetric(METRIC_FUNCTIONS, $value); // per project
-
- if ($event === Database::EVENT_DOCUMENT_DELETE) {
- $usage
- ->addReduce($document);
- }
- break;
- case $document->getCollection() === 'sites':
- $usage->addMetric(METRIC_SITES, $value); // per project
-
- if ($event === Database::EVENT_DOCUMENT_DELETE) {
- $usage
- ->addReduce($document);
- }
- break;
- case $document->getCollection() === 'deployments':
- $usage
- ->addMetric(METRIC_DEPLOYMENTS, $value) // per project
- ->addMetric(METRIC_DEPLOYMENTS_STORAGE, $document->getAttribute('size') * $value) // per project
- ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS), $value) // per function
- ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value)
- ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS), $value) // per function
- ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value);
- break;
- default:
- break;
- }
- };
-
- // Clone the queues, to prevent events triggered by the database listener
- // from overwriting the events that are supposed to be triggered in the shutdown hook.
- $queueForEventsClone = new Event($publisher);
- $queueForFunctions = new Func($publisherFunctions);
- $queueForWebhooks = new Webhook($publisherWebhooks);
- $queueForRealtime = new Realtime();
-
- $database
- ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
- ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
- ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
- ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
- ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
- ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
- $project,
- $document,
- $response,
- $queueForEventsClone->from($queueForEvents),
- $queueForFunctions->from($queueForEvents),
- $queueForWebhooks->from($queueForEvents),
- $queueForRealtime->from($queueForEvents)
- ))
- ->on(Database::EVENT_DOCUMENT_CREATE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database))
- ->on(Database::EVENT_DOCUMENT_UPDATE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database))
- ->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', 'queueForFunctions', 'queueForWebhooks', 'queueForRealtime', 'usage', 'authorization', 'request']);
-
-Http::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
+$container->set('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
$adapter = new DatabasePool($pools->get('console'));
$database = new Database($adapter, $cache);
@@ -887,200 +117,7 @@ Http::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authori
return $database;
}, ['pools', 'cache', 'authorization']);
-Http::setResource('getDatabasesDB', function (Group $pools, Cache $cache, Document $project, Request $request, UsageContext $usage, Authorization $authorization) {
-
- return function (Document $database) use ($pools, $cache, $project, $request, $usage, $authorization): Database {
- $databaseDSN = $database->getAttribute('database', $project->getAttribute('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'));
- }
-
- $pool = $pools->get($databaseDSN->getHost());
-
- $adapter = new DatabasePool($pool);
- $database = new Database($adapter, $cache);
- $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
- $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);
- if (\in_array($dsn->getHost(), $sharedTables)) {
- $database
- ->setSharedTables(true)
- ->setTenant((int)$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);
- }
-
- // Register database event listeners for usage stats collection
- $documentsMetric = METRIC_DOCUMENTS;
- $databaseIdDocumentsMetric = METRIC_DATABASE_ID_DOCUMENTS;
- $databaseIdCollectionIdDocumentsMetric = METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS;
- if ($databaseType !== DATABASE_TYPE_LEGACY && $databaseType !== DATABASE_TYPE_TABLESDB) {
- $documentsMetric = $databaseType. '.' .$documentsMetric;
- $databaseIdDocumentsMetric = $databaseType. '.' .$databaseIdDocumentsMetric;
- $databaseIdCollectionIdDocumentsMetric = $databaseType . '.' .$databaseIdCollectionIdDocumentsMetric;
- }
- $database
- ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
- $value = 1;
-
- if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
- $parts = explode('_', $document->getCollection());
- $databaseInternalId = $parts[1] ?? 0;
- $collectionInternalId = $parts[3] ?? 0;
- $usage
- ->addMetric($documentsMetric, $value) // per project
- ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
- ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
- }
- })
- ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
- $value = -1;
-
- if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
- $parts = explode('_', $document->getCollection());
- $databaseInternalId = $parts[1] ?? 0;
- $collectionInternalId = $parts[3] ?? 0;
- $usage
- ->addMetric($documentsMetric, $value) // per project
- ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
- ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
- }
- })
- ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
- $value = $document->getAttribute('modified', 0);
-
- if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
- $parts = explode('_', $document->getCollection());
- $databaseInternalId = $parts[1] ?? 0;
- $collectionInternalId = $parts[3] ?? 0;
- $usage
- ->addMetric($documentsMetric, $value) // per project
- ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
- ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
- }
- })
- ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
- $value = -1 * $document->getAttribute('modified', 0);
-
- if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
- $parts = explode('_', $document->getCollection());
- $databaseInternalId = $parts[1] ?? 0;
- $collectionInternalId = $parts[3] ?? 0;
- $usage
- ->addMetric($documentsMetric, $value) // per project
- ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
- ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
- }
- })
- ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
- $value = $document->getAttribute('created', 0);
-
- if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
- $parts = explode('_', $document->getCollection());
- $databaseInternalId = $parts[1] ?? 0;
- $collectionInternalId = $parts[3] ?? 0;
- $usage
- ->addMetric($documentsMetric, $value) // per project
- ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
- ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
- }
- });
-
- return $database;
- };
-
-}, ['pools','cache','project','request','usage','authorization']);
-
-Http::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, Authorization $authorization) {
- $databases = [];
-
- return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases) {
- if ($project->isEmpty() || $project->getId() === 'console') {
- return $dbForPlatform;
- }
-
- $database = $project->getAttribute('database', '');
- if (empty($database)) {
- 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);
- }
-
- $configure = (function (Database $database) use ($project, $dsn, $authorization) {
- $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)) {
- $database
- ->setSharedTables(true)
- ->setTenant($project->getSequence())
- ->setNamespace($dsn->getParam('namespace'));
- } else {
- $database
- ->setSharedTables(false)
- ->setTenant(null)
- ->setNamespace('_' . $project->getSequence());
- }
- });
-
- if (isset($databases[$dsn->getHost()])) {
- $database = $databases[$dsn->getHost()];
- $configure($database);
-
- return $database;
- }
-
- $adapter = new DatabasePool($pools->get($dsn->getHost()));
- $database = new Database($adapter, $cache);
- $databases[$dsn->getHost()] = $database;
- $configure($database);
-
- return $database;
- };
-}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
-
-Http::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+$container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
$database = null;
return function (?Document $project = null) use ($pools, $cache, $authorization, &$database) {
@@ -1109,15 +146,9 @@ Http::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorizati
};
}, ['pools', 'cache', 'authorization']);
-Http::setResource('audit', function ($dbForProject) {
- $adapter = new AdapterDatabase($dbForProject);
+$container->set('telemetry', fn () => new NoTelemetry());
- return new Audit($adapter);
-}, ['dbForProject']);
-
-Http::setResource('telemetry', fn () => new NoTelemetry());
-
-Http::setResource('cache', function (Group $pools, Telemetry $telemetry) {
+$container->set('cache', function (Group $pools, Telemetry $telemetry) {
$list = Config::getParam('pools-cache', []);
$adapters = [];
@@ -1131,7 +162,7 @@ Http::setResource('cache', function (Group $pools, Telemetry $telemetry) {
return $cache;
}, ['pools', 'telemetry']);
-Http::setResource('redis', function () {
+$container->set('redis', function () {
$host = System::getEnv('_APP_REDIS_HOST', 'localhost');
$port = System::getEnv('_APP_REDIS_PORT', 6379);
$pass = System::getEnv('_APP_REDIS_PASS', '');
@@ -1146,31 +177,15 @@ Http::setResource('redis', function () {
return $redis;
});
-Http::setResource('timelimit', function (\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']);
-Http::setResource('deviceForLocal', function (Telemetry $telemetry) {
+$container->set('deviceForLocal', function (Telemetry $telemetry) {
return new Device\Telemetry($telemetry, new Local());
}, ['telemetry']);
-Http::setResource('deviceForFiles', function ($project, Telemetry $telemetry) {
- return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-Http::setResource('deviceForSites', function ($project, Telemetry $telemetry) {
- return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-Http::setResource('deviceForMigrations', function ($project, Telemetry $telemetry) {
- return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-Http::setResource('deviceForFunctions', function ($project, Telemetry $telemetry) {
- return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-Http::setResource('deviceForBuilds', function ($project, Telemetry $telemetry) {
- return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-
function getDevice(string $root, string $connection = ''): Device
{
$connection = ! empty($connection) ? $connection : System::getEnv('_APP_CONNECTIONS_STORAGE', '');
@@ -1278,33 +293,17 @@ function getDevice(string $root, string $connection = ''): Device
}
}
-Http::setResource('mode', function (Request $request, Document $project) {
- /**
- * Defines the mode for the request:
- * - 'default' => Requests for Client and Server Side
- * - 'admin' => Request from the Console on non-console projects
- */
- $mode = $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
-
- $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
- if (!empty($projectId) && $project->getId() !== $projectId) {
- $mode = APP_MODE_ADMIN;
- }
-
- return $mode;
-}, ['request', 'project']);
-
-Http::setResource('geodb', function ($register) {
+$container->set('geodb', function ($register) {
/** @var Utopia\Registry\Registry $register */
return $register->get('geodb');
}, ['register']);
-Http::setResource('passwordsDictionary', function ($register) {
+$container->set('passwordsDictionary', function ($register) {
/** @var Utopia\Registry\Registry $register */
return $register->get('passwordsDictionary');
}, ['register']);
-Http::setResource('servers', function () {
+$container->set('servers', function () {
$platforms = Config::getParam('sdks');
$server = $platforms[APP_SDK_PLATFORM_SERVER];
@@ -1315,358 +314,25 @@ Http::setResource('servers', function () {
return $languages;
});
-Http::setResource('promiseAdapter', function ($register) {
+$container->set('promiseAdapter', function ($register) {
return $register->get('promiseAdapter');
}, ['register']);
-Http::setResource('schema', function ($utopia, $dbForProject, $authorization) {
-
- $complexity = function (int $complexity, array $args) {
- $queries = Query::parseQueries($args['queries'] ?? []);
- $query = Query::getByType($queries, [Query::TYPE_LIMIT])[0] ?? null;
- $limit = $query ? $query->getValue() : APP_LIMIT_LIST_DEFAULT;
-
- return $complexity * $limit;
- };
-
- $attributes = function (int $limit, int $offset) use ($dbForProject, $authorization) {
- $attrs = $authorization->skip(fn () => $dbForProject->find('attributes', [
- Query::limit($limit),
- Query::offset($offset),
- ]));
-
- return \array_map(function ($attr) {
- return $attr->getArrayCopy();
- }, $attrs);
- };
-
- $urls = [
- 'list' => function (string $databaseId, string $collectionId, array $args) {
- return "/v1/databases/$databaseId/collections/$collectionId/documents";
- },
- 'create' => function (string $databaseId, string $collectionId, array $args) {
- return "/v1/databases/$databaseId/collections/$collectionId/documents";
- },
- 'read' => function (string $databaseId, string $collectionId, array $args) {
- return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
- },
- 'update' => function (string $databaseId, string $collectionId, array $args) {
- return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
- },
- 'delete' => function (string $databaseId, string $collectionId, array $args) {
- return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
- },
- ];
-
- // NOTE: `params` and `urls` are not used internally in the `Schema::build` function below!
- $params = [
- 'list' => function (string $databaseId, string $collectionId, array $args) {
- return ['queries' => $args['queries']];
- },
- 'create' => function (string $databaseId, string $collectionId, array $args) {
- $id = $args['id'] ?? 'unique()';
- $permissions = $args['permissions'] ?? null;
-
- unset($args['id']);
- unset($args['permissions']);
-
- // Order must be the same as the route params
- return [
- 'databaseId' => $databaseId,
- 'documentId' => $id,
- 'collectionId' => $collectionId,
- 'data' => $args,
- 'permissions' => $permissions,
- ];
- },
- 'update' => function (string $databaseId, string $collectionId, array $args) {
- $documentId = $args['id'];
- $permissions = $args['permissions'] ?? null;
-
- unset($args['id']);
- unset($args['permissions']);
-
- // Order must be the same as the route params
- return [
- 'databaseId' => $databaseId,
- 'collectionId' => $collectionId,
- 'documentId' => $documentId,
- 'data' => $args,
- 'permissions' => $permissions,
- ];
- },
- ];
-
- return Schema::build(
- $utopia,
- $complexity,
- $attributes,
- $urls,
- $params,
- );
-}, ['utopia', 'dbForProject', 'authorization']);
-
-Http::setResource('gitHub', function (Cache $cache) {
+$container->set('gitHub', function (Cache $cache) {
return new VcsGitHub($cache);
}, ['cache']);
-Http::setResource('requestTimestamp', function ($request) {
- // TODO: Move this to the Request class itself
- $timestampHeader = $request->getHeader('x-appwrite-timestamp');
- $requestTimestamp = null;
- if (! empty($timestampHeader)) {
- try {
- $requestTimestamp = new \DateTime($timestampHeader);
- } catch (\Throwable $e) {
- throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid X-Appwrite-Timestamp header value');
- }
- }
-
- return $requestTimestamp;
-}, ['request']);
-
-Http::setResource('plan', function (array $plan = []) {
+$container->set('plan', function () {
return [];
});
-Http::setResource('smsRates', function () {
+$container->set('smsRates', function () {
return [];
});
-Http::setResource('devKey', function (Request $request, Document $project, array $servers, Database $dbForPlatform, Authorization $authorization) {
- $devKey = $request->getHeader('x-appwrite-dev-key', $request->getParam('devKey', ''));
-
- // Check if given key match project's development keys
- $key = $project->find('secret', $devKey, 'devKeys');
- if (! $key) {
- return new Document([]);
- }
-
- // check expiration
- $expire = $key->getAttribute('expire');
- if (! empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
- return new Document([]);
- }
-
- // update access time
- $accessedAt = $key->getAttribute('accessedAt', 0);
- if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
- $key->setAttribute('accessedAt', DatabaseDateTime::now());
- $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), new Document([
- 'accessedAt' => $key->getAttribute('accessedAt')
- ])));
- $dbForPlatform->purgeCachedDocument('projects', $project->getId());
- }
-
- // add sdk to key
- $sdkValidator = new WhiteList($servers, true);
- $sdk = \strtolower($request->getHeader('x-sdk-name', 'UNKNOWN'));
-
- if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
- $sdks = $key->getAttribute('sdks', []);
-
- if (! in_array($sdk, $sdks)) {
- $sdks[] = $sdk;
- $key->setAttribute('sdks', $sdks);
-
- /** Update access time as well */
- $key->setAttribute('accessedAt', DatabaseDateTime::now());
- $key = $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), new Document([
- 'sdks' => $key->getAttribute('sdks'),
- 'accessedAt' => $key->getAttribute('accessedAt')
- ])));
- $dbForPlatform->purgeCachedDocument('projects', $project->getId());
- }
- }
-
- return $key;
-}, ['request', 'project', 'servers', 'dbForPlatform', 'authorization']);
-
-Http::setResource('team', function (Document $project, Database $dbForPlatform, Http $utopia, Request $request, Authorization $authorization) {
- $teamInternalId = '';
- if ($project->getId() !== 'console') {
- $teamInternalId = $project->getAttribute('teamInternalId', '');
- } else {
- $route = $utopia->match($request);
- $path = ! empty($route) ? $route->getPath() : $request->getURI();
- $orgHeader = $request->getHeader('x-appwrite-organization', '');
- if (str_starts_with($path, '/v1/projects/:projectId')) {
- $uri = $request->getURI();
- $pid = explode('/', $uri)[3];
- $p = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $pid));
- $teamInternalId = $p->getAttribute('teamInternalId', '');
- } elseif ($path === '/v1/projects') {
- $teamId = $request->getParam('teamId', '');
-
- if (empty($teamId)) {
- return new Document([]);
- }
-
- $team = $authorization->skip(fn () => $dbForPlatform->getDocument('teams', $teamId));
-
- return $team;
- } elseif (! empty($orgHeader)) {
- return $authorization->skip(fn () => $dbForPlatform->getDocument('teams', $orgHeader));
- }
- }
-
- // if teamInternalId is empty, return an empty document
-
- if (empty($teamInternalId)) {
- return new Document([]);
- }
-
- $team = $authorization->skip(function () use ($dbForPlatform, $teamInternalId) {
- return $dbForPlatform->findOne('teams', [
- Query::equal('$sequence', [$teamInternalId]),
- ]);
- });
-
- return $team;
-}, ['project', 'dbForPlatform', 'utopia', 'request', 'authorization']);
-
-Http::setResource(
+$container->set(
'isResourceBlocked',
fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
);
-Http::setResource('previewHostname', function (Request $request, ?Key $apiKey) {
- $allowed = false;
-
- if (Http::isDevelopment()) {
- $allowed = true;
- } elseif (! \is_null($apiKey) && $apiKey->getHostnameOverride() === true) {
- $allowed = true;
- }
-
- if ($allowed) {
- $host = $request->getQuery('appwrite-hostname', $request->getHeader('x-appwrite-hostname', '')) ?? '';
- if (! empty($host)) {
- return $host;
- }
- }
-
- return '';
-}, ['request', 'apiKey']);
-
-Http::setResource('apiKey', function (Request $request, Document $project, Document $team, Document $user): ?Key {
- $key = $request->getHeader('x-appwrite-key');
-
- if (empty($key)) {
- return null;
- }
-
- $key = Key::decode($project, $team, $user, $key);
-
- $userHeader = $request->getHeader('x-appwrite-user');
- $organizationHeader = $request->getHeader('x-appwrite-organization');
- $projectHeader = $request->getHeader('x-appwrite-project');
-
- if (! empty($key->getProjectId())) {
- if (empty($projectHeader) || $projectHeader !== $key->getProjectId()) {
- throw new Exception(Exception::PROJECT_ID_MISSING);
- }
- }
-
- if (! empty($key->getUserId())) {
- if (empty($userHeader) || $userHeader !== $key->getUserId()) {
- throw new Exception(Exception::USER_ID_MISSING);
- }
- }
-
- if (! empty($key->getTeamId())) {
- if (empty($organizationHeader) || $organizationHeader !== $key->getTeamId()) {
- throw new Exception(Exception::ORGANIZATION_ID_MISSING);
- }
- }
-
- return $key;
-}, ['request', 'project', 'team', 'user']);
-
-Http::setResource('executor', fn () => new Executor());
-
-Http::setResource('resourceToken', function ($project, $dbForProject, $request, Authorization $authorization) {
- $tokenJWT = $request->getParam('token');
-
- if (! empty($tokenJWT) && ! $project->isEmpty()) { // JWT authentication
- // Use a large but reasonable maxAge to avoid auto-exp when token has no expiry
- $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), RESOURCE_TOKEN_ALGORITHM, RESOURCE_TOKEN_MAX_AGE, RESOURCE_TOKEN_LEEWAY); // Instantiate with key, algo, maxAge and leeway.
-
- try {
- $payload = $jwt->decode($tokenJWT);
- } catch (JWTException $error) {
- return new Document([]);
- }
-
- $tokenId = $payload['tokenId'] ?? '';
- if (empty($tokenId)) {
- return new Document([]);
- }
-
- $token = $authorization->skip(fn () => $dbForProject->getDocument('resourceTokens', $tokenId));
-
- if ($token->isEmpty()) {
- return new Document([]);
- }
-
- $expiry = $token->getAttribute('expire');
-
- if ($expiry !== null) {
- $now = new \DateTime();
- $expiryDate = new \DateTime($expiry);
-
- if ($expiryDate < $now) {
- return new Document([]);
- }
- }
-
- return match ($token->getAttribute('resourceType')) {
- TOKENS_RESOURCE_TYPE_FILES => (function () use ($token, $dbForProject, $authorization) {
- $sequences = explode(':', $token->getAttribute('resourceInternalId'));
- $ids = explode(':', $token->getAttribute('resourceId'));
-
- if (count($sequences) !== 2 || count($ids) !== 2) {
- return new Document([]);
- }
-
- $accessedAt = $token->getAttribute('accessedAt', 0);
- if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), -APP_RESOURCE_TOKEN_ACCESS)) > $accessedAt) {
- $token->setAttribute('accessedAt', DatabaseDateTime::now());
- $authorization->skip(fn () => $dbForProject->updateDocument('resourceTokens', $token->getId(), new Document([
- 'accessedAt' => $token->getAttribute('accessedAt')
- ])));
- }
-
- return new Document([
- 'bucketId' => $ids[0],
- 'fileId' => $ids[1],
- 'bucketInternalId' => $sequences[0],
- 'fileInternalId' => $sequences[1],
- ]);
- })(),
-
- default => throw new Exception(Exception::TOKEN_RESOURCE_TYPE_INVALID),
- };
- }
-
- return new Document([]);
-}, ['project', 'dbForProject', 'request', 'authorization']);
-
-Http::setResource('transactionState', function (Database $dbForProject, Authorization $authorization, callable $getDatabasesDB) {
- return new TransactionState($dbForProject, $authorization, $getDatabasesDB);
-}, ['dbForProject', 'authorization', 'getDatabasesDB']);
-
-Http::setResource('executionsRetentionCount', function (Document $project, array $plan) {
- if ($project->getId() === 'console' || empty($plan)) {
- return 0;
- }
-
- return (int) ($plan['executionsRetentionCount'] ?? 100);
-}, ['project', 'plan']);
-
-Http::setResource('embeddingAgent', function ($register) {
- $adapter = new Ollama();
- $adapter->setEndpoint(System::getEnv('_APP_EMBEDDING_ENDPOINT', 'http://ollama:11434/api/embed'));
- $adapter->setTimeout((int) System::getEnv('_APP_EMBEDDING_TIMEOUT', '30000'));
- return new Agent($adapter);
-}, ['register']);
+$container->set('executor', fn () => new Executor());
diff --git a/app/init/resources/request.php b/app/init/resources/request.php
new file mode 100644
index 0000000000..2bec412882
--- /dev/null
+++ b/app/init/resources/request.php
@@ -0,0 +1,1455 @@
+set('utopia:graphql', function ($utopia) {
+ return $utopia;
+ }, ['utopia']);
+
+ $container->set('log', fn () => new Log(), []);
+
+ $container->set('logger', function ($register) {
+ return $register->get('logger');
+ }, ['register']);
+
+ $container->set('authorization', function () {
+ return new Authorization();
+ }, []);
+
+ $container->set('store', function (): Store {
+ return new Store();
+ }, []);
+
+ $container->set('proofForPassword', function (): Password {
+ $hash = new Argon2();
+ $hash
+ ->setMemoryCost(7168)
+ ->setTimeCost(5)
+ ->setThreads(1);
+
+ $password = new Password();
+ $password
+ ->setHash($hash);
+
+ return $password;
+ });
+
+ $container->set('proofForToken', function (): Token {
+ $token = new Token();
+ $token->setHash(new Sha());
+
+ return $token;
+ });
+
+ $container->set('proofForCode', function (): Code {
+ $code = new Code();
+ $code->setHash(new Sha());
+
+ return $code;
+ });
+
+ $container->set('locale', function () {
+ $locale = new Locale(System::getEnv('_APP_LOCALE', 'en'));
+ $locale->setFallback(System::getEnv('_APP_LOCALE', 'en'));
+
+ return $locale;
+ });
+
+ // Per-request queue resources (stateful, accumulate event data during request)
+ $container->set('queueForMessaging', function (Publisher $publisher) {
+ return new Messaging($publisher);
+ }, ['publisher']);
+ $container->set('queueForMails', function (Publisher $publisher) {
+ return new Mail($publisher);
+ }, ['publisher']);
+ $container->set('queueForBuilds', function (Publisher $publisher) {
+ return new Build($publisher);
+ }, ['publisher']);
+ $container->set('queueForScreenshots', function (Publisher $publisher) {
+ return new Screenshot($publisher);
+ }, ['publisher']);
+ $container->set('queueForDatabase', function (Publisher $publisher) {
+ return new EventDatabase($publisher);
+ }, ['publisher']);
+ $container->set('queueForDeletes', function (Publisher $publisher) {
+ return new Delete($publisher);
+ }, ['publisher']);
+ $container->set('queueForEvents', function (Publisher $publisher) {
+ return new Event($publisher);
+ }, ['publisher']);
+ $container->set('queueForWebhooks', function (Publisher $publisher) {
+ return new Webhook($publisher);
+ }, ['publisher']);
+ $container->set('queueForRealtime', function () {
+ return new Realtime();
+ }, []);
+ $container->set('usage', function () {
+ return new UsageContext();
+ }, []);
+ $container->set('queueForAudits', function (Publisher $publisher) {
+ return new AuditEvent($publisher);
+ }, ['publisher']);
+ $container->set('queueForFunctions', function (Publisher $publisher) {
+ return new Func($publisher);
+ }, ['publisher']);
+ $container->set('eventProcessor', function () {
+ return new EventProcessor();
+ }, []);
+ $container->set('queueForCertificates', function (Publisher $publisher) {
+ return new Certificate($publisher);
+ }, ['publisher']);
+ $container->set('queueForMigrations', function (Publisher $publisher) {
+ return new Migration($publisher);
+ }, ['publisher']);
+ $container->set('queueForStatsResources', function (Publisher $publisher) {
+ return new StatsResources($publisher);
+ }, ['publisher']);
+
+ $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('getProjectDB', function (Group $pools, Database $dbForPlatform, Cache $cache, Authorization $authorization) {
+ $adapters = [];
+
+ return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$adapters) {
+ if ($project->isEmpty() || $project->getId() === 'console') {
+ return $dbForPlatform;
+ }
+
+ $database = $project->getAttribute('database', '');
+ if (empty($database)) {
+ 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)) {
+ $database
+ ->setSharedTables(true)
+ ->setTenant($project->getSequence())
+ ->setNamespace($dsn->getParam('namespace'));
+ } else {
+ $database
+ ->setSharedTables(false)
+ ->setTenant(null)
+ ->setNamespace('_' . $project->getSequence());
+ }
+
+ return $database;
+ };
+ }, ['pools', 'dbForPlatform', 'cache', 'authorization']);
+
+ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+ $adapter = null;
+
+ return function (?Document $project = null) use ($pools, $cache, $authorization, &$adapter) {
+ $adapter ??= new DatabasePool($pools->get('logs'));
+ $database = new Database($adapter, $cache);
+
+ $database
+ ->setDatabase(APP_DATABASE)
+ ->setAuthorization($authorization)
+ ->setSharedTables(true)
+ ->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;
+ };
+ }, ['pools', 'cache', 'authorization']);
+
+ /**
+ * List of allowed request hostnames for the request.
+ */
+ $container->set('allowedHostnames', function (array $platform, Document $project, Document $rule, Document $devKey, Request $request) {
+ $allowed = [...($platform['hostnames'] ?? [])];
+
+ /* Add platform configured hostnames */
+ if (! $project->isEmpty() && $project->getId() !== 'console') {
+ $platforms = $project->getAttribute('platforms', []);
+ $hostnames = Platform::getHostnames($platforms);
+ $allowed = [...$allowed, ...$hostnames];
+ }
+
+ /* Add the request hostname if a dev key is found */
+ if (! $devKey->isEmpty()) {
+ $allowed[] = $request->getHostname();
+ }
+
+ $originHostname = parse_url($request->getOrigin(), PHP_URL_HOST);
+ $refererHostname = parse_url($request->getReferer(), PHP_URL_HOST);
+
+ $hostname = $originHostname;
+ if (empty($hostname)) {
+ $hostname = $refererHostname;
+ }
+
+ /* Add request hostname for preflight requests */
+ if ($request->getMethod() === 'OPTIONS') {
+ $allowed[] = $hostname;
+ }
+
+ /* Allow the request origin of rule */
+ if (! $rule->isEmpty() && ! empty($rule->getAttribute('domain', ''))) {
+ $allowed[] = $rule->getAttribute('domain', '');
+ }
+
+ /* Allow the request origin if a dev key is found */
+ if (! $devKey->isEmpty() && ! empty($hostname)) {
+ $allowed[] = $hostname;
+ }
+
+ return array_unique($allowed);
+ }, ['platform', 'project', 'rule', 'devKey', 'request']);
+
+ /**
+ * List of allowed request schemes for the request.
+ */
+ $container->set('allowedSchemes', function (array $platform, Document $project) {
+ $allowed = [...($platform['schemas'] ?? [])];
+
+ if (! $project->isEmpty() && $project->getId() !== 'console') {
+ /* Add hardcoded schemes */
+ $allowed[] = 'exp';
+ $allowed[] = 'appwrite-callback-' . $project->getId();
+
+ /* Add platform configured schemes */
+ $platforms = $project->getAttribute('platforms', []);
+ $schemes = Platform::getSchemes($platforms);
+ $allowed = [...$allowed, ...$schemes];
+ }
+
+ return array_unique($allowed);
+ }, ['platform', 'project']);
+
+ /**
+ * Whether the request origin is verified against the request hostname.
+ */
+ $container->set('domainVerification', function (Request $request) {
+ $origin = \parse_url($request->getOrigin($request->getReferer('')), PHP_URL_HOST);
+ $selfDomain = new Domain($request->getHostname());
+ $endDomain = new Domain((string) $origin);
+
+ return ($selfDomain->getRegisterable() === $endDomain->getRegisterable())
+ && $endDomain->getRegisterable() !== '';
+ }, ['request']);
+
+ /**
+ * Cookie domain for the current request.
+ */
+ $container->set('cookieDomain', function (Request $request, Document $project) {
+ $localHosts = ['localhost', 'localhost:' . $request->getPort()];
+
+ $migrationHost = System::getEnv('_APP_MIGRATION_HOST');
+ if (!empty($migrationHost)) {
+ // Treat the migration host like localhost because internal migration and CI
+ // traffic may use it before a public domain is configured.
+ $localHosts[] = $migrationHost;
+ $localHosts[] = $migrationHost . ':' . $request->getPort();
+ }
+
+ $hostname = $request->getHostname();
+ $isLocalHost = \in_array($hostname, $localHosts, true);
+ $isIpAddress = \filter_var($hostname, FILTER_VALIDATE_IP) !== false;
+
+ if ($isLocalHost || $isIpAddress) {
+ return;
+ }
+
+ $isConsoleProject = $project->getAttribute('$id', '') === 'console';
+ $isConsoleRootSession = System::getEnv('_APP_CONSOLE_ROOT_SESSION', 'disabled') === 'enabled';
+
+ if ($isConsoleProject && $isConsoleRootSession) {
+ $domain = new Domain($hostname);
+
+ return '.' . $domain->getRegisterable();
+ }
+
+ return '.' . $hostname;
+ }, ['request', 'project']);
+
+ /**
+ * Rule associated with a request origin.
+ */
+ $container->set('rule', function (Request $request, Database $dbForPlatform, Document $project, Authorization $authorization) {
+ $domain = \parse_url($request->getOrigin(), PHP_URL_HOST);
+
+ if (empty($domain)) {
+ $domain = \parse_url($request->getReferer(), PHP_URL_HOST);
+ }
+
+ if (empty($domain)) {
+ return new Document();
+ }
+
+ // TODO: (@Meldiron) Remove after 1.7.x migration
+ $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
+ $rule = $authorization->skip(function () use ($dbForPlatform, $domain, $isMd5) {
+ if ($isMd5) {
+ return $dbForPlatform->getDocument('rules', md5($domain));
+ }
+
+ return $dbForPlatform->findOne('rules', [
+ Query::equal('domain', [$domain]),
+ ]) ?? new Document();
+ });
+
+ $permitsCurrentProject = $rule->getAttribute('projectInternalId', '') === $project->getSequence();
+
+ // Temporary implementation until custom wildcard domains are an official feature
+ // Allow trusted projects; Used for Console (website) previews
+ if (! $permitsCurrentProject && ! $rule->isEmpty() && ! empty($rule->getAttribute('projectId', ''))) {
+ $trustedProjects = [];
+ foreach (\explode(',', System::getEnv('_APP_CONSOLE_TRUSTED_PROJECTS', '')) as $trustedProject) {
+ if (empty($trustedProject)) {
+ continue;
+ }
+ $trustedProjects[] = $trustedProject;
+ }
+ if (\in_array($rule->getAttribute('projectId', ''), $trustedProjects)) {
+ $permitsCurrentProject = true;
+ }
+ }
+
+ if (! $permitsCurrentProject) {
+ return new Document();
+ }
+
+ return $rule;
+ }, ['request', 'dbForPlatform', 'project', 'authorization']);
+
+ /**
+ * CORS service
+ */
+ $container->set('cors', function (array $allowedHostnames) {
+ $corsConfig = Config::getParam('cors');
+
+ return new Cors(
+ $allowedHostnames,
+ allowedMethods: $corsConfig['allowedMethods'],
+ allowedHeaders: $corsConfig['allowedHeaders'],
+ allowCredentials: true,
+ exposedHeaders: $corsConfig['exposedHeaders'],
+ );
+ }, ['allowedHostnames']);
+
+ $container->set('originValidator', function (Document $devKey, array $allowedHostnames, array $allowedSchemes) {
+ if (! $devKey->isEmpty()) {
+ return new URL();
+ }
+
+ return new Origin($allowedHostnames, $allowedSchemes);
+ }, ['devKey', 'allowedHostnames', 'allowedSchemes']);
+
+ $container->set('redirectValidator', function (Document $devKey, array $allowedHostnames, array $allowedSchemes) {
+ if (! $devKey->isEmpty()) {
+ return new URL();
+ }
+
+ return new Redirect($allowedHostnames, $allowedSchemes);
+ }, ['devKey', 'allowedHostnames', 'allowedSchemes']);
+
+ $container->set('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken, $authorization) {
+ /**
+ * Handles user authentication and session validation.
+ *
+ * This function follows a series of steps to determine the appropriate user session
+ * based on cookies, headers, and JWT tokens.
+ *
+ * Process:
+ * 1. Checks the cookie based on mode:
+ * - If in admin mode, uses console project id for key.
+ * - Otherwise, sets the key using the project ID
+ * 2. If no cookie is found, attempts to retrieve the fallback header `x-fallback-cookies`.
+ * - If this method is used, returns the header: `X-Debug-Fallback: true`.
+ * 3. Fetches the user document from the appropriate database based on the mode.
+ * 4. If the user document is empty or the session key cannot be verified, sets an empty user document.
+ * 5. Regardless of the results from steps 1-4, attempts to fetch the JWT token.
+ * 6. If the JWT user has a valid session ID, updates the user variable with the user from `projectDB`,
+ * overwriting the previous value.
+ * 7. If account API key is passed, use user of the account API key as long as user ID header matches too
+ */
+ $authorization->setDefaultStatus(true);
+
+ $store->setKey('a_session_' . $project->getId());
+
+ if ($mode === APP_MODE_ADMIN) {
+ $store->setKey('a_session_' . $console->getId());
+ }
+
+ $store->decode(
+ $request->getCookie(
+ $store->getKey(), // Get sessions
+ $request->getCookie($store->getKey() . '_legacy', '')
+ )
+ );
+
+ // Get session from header for SSR clients
+ if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
+ $sessionHeader = $request->getHeader('x-appwrite-session', '');
+
+ if (! empty($sessionHeader)) {
+ $store->decode($sessionHeader);
+ }
+ }
+
+ // Get fallback session from old clients (no SameSite support) or clients who block 3rd-party cookies
+ if ($response) { // if in http context - add debug header
+ $response->addHeader('X-Debug-Fallback', 'false');
+ }
+
+ if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
+ if ($response) {
+ $response->addHeader('X-Debug-Fallback', 'true');
+ }
+ $fallback = $request->getHeader('x-fallback-cookies', '');
+ $fallback = \json_decode($fallback, true);
+ $store->decode(((is_array($fallback) && isset($fallback[$store->getKey()])) ? $fallback[$store->getKey()] : ''));
+ }
+
+ $user = null;
+ if ($mode === APP_MODE_ADMIN) {
+ /** @var User $user */
+ $user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
+ } else {
+ if ($project->isEmpty()) {
+ $user = new User([]);
+ } else {
+ if (! empty($store->getProperty('id', ''))) {
+ if ($project->getId() === 'console') {
+ /** @var User $user */
+ $user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
+ } else {
+ /** @var User $user */
+ $user = $dbForProject->getDocument('users', $store->getProperty('id', ''));
+ }
+ }
+ }
+ }
+
+ if (
+ ! $user ||
+ $user->isEmpty() // Check a document has been found in the DB
+ || ! $user->sessionVerify($store->getProperty('secret', ''), $proofForToken)
+ ) { // Validate user has valid login token
+ $user = new User([]);
+ }
+
+ $authJWT = $request->getHeader('x-appwrite-jwt', '');
+ if (! empty($authJWT) && ! $project->isEmpty()) { // JWT authentication
+ if (! $user->isEmpty()) {
+ throw new Exception(Exception::USER_JWT_AND_COOKIE_SET);
+ }
+
+ $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
+ try {
+ $payload = $jwt->decode($authJWT);
+ } catch (JWTException $error) {
+ throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
+ }
+
+ $jwtUserId = $payload['userId'] ?? '';
+ if (! empty($jwtUserId)) {
+ if ($mode === APP_MODE_ADMIN) {
+ $user = $dbForPlatform->getDocument('users', $jwtUserId);
+ } else {
+ $user = $dbForProject->getDocument('users', $jwtUserId);
+ }
+ }
+ $jwtSessionId = $payload['sessionId'] ?? '';
+ if (! empty($jwtSessionId)) {
+ if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token
+ $user = new User([]);
+ }
+ }
+ }
+
+ // Account based on account API key
+ $accountKey = $request->getHeader('x-appwrite-key', '');
+ $accountKeyUserId = $request->getHeader('x-appwrite-user', '');
+ if (! empty($accountKeyUserId) && ! empty($accountKey)) {
+ if (! $user->isEmpty()) {
+ throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
+ }
+
+ $accountKeyUser = $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->getDocument('users', $accountKeyUserId));
+ if (! $accountKeyUser->isEmpty()) {
+ $key = $accountKeyUser->find(
+ key: 'secret',
+ find: $accountKey,
+ subject: 'keys'
+ );
+
+ if (! empty($key)) {
+ $expire = $key->getAttribute('expire');
+ if (! empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
+ throw new Exception(Exception::ACCOUNT_KEY_EXPIRED);
+ }
+
+ $user = $accountKeyUser;
+ }
+ }
+ }
+
+ // Impersonation: if current user has impersonator capability and headers are set, act as another user
+ $impersonateUserId = $request->getHeader('x-appwrite-impersonate-user-id', '');
+ $impersonateEmail = $request->getHeader('x-appwrite-impersonate-user-email', '');
+ $impersonatePhone = $request->getHeader('x-appwrite-impersonate-user-phone', '');
+ if (!$user->isEmpty() && $user->getAttribute('impersonator', false)) {
+ $userDb = (APP_MODE_ADMIN === $mode || $project->getId() === 'console') ? $dbForPlatform : $dbForProject;
+ $targetUser = null;
+ if (!empty($impersonateUserId)) {
+ $targetUser = $userDb->getAuthorization()->skip(fn () => $userDb->getDocument('users', $impersonateUserId));
+ } elseif (!empty($impersonateEmail)) {
+ $targetUser = $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])]));
+ } elseif (!empty($impersonatePhone)) {
+ $targetUser = $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])]));
+ }
+ if ($targetUser !== null && !$targetUser->isEmpty()) {
+ $impersonator = clone $user;
+ $user = clone $targetUser;
+ $user->setAttribute('impersonatorUserId', $impersonator->getId());
+ $user->setAttribute('impersonatorUserInternalId', $impersonator->getSequence());
+ $user->setAttribute('impersonatorUserName', $impersonator->getAttribute('name', ''));
+ $user->setAttribute('impersonatorUserEmail', $impersonator->getAttribute('email', ''));
+ $user->setAttribute('impersonatorAccessedAt', $impersonator->getAttribute('accessedAt', 0));
+ }
+ }
+
+ $dbForProject->setMetadata('user', $user->getId());
+ $dbForPlatform->setMetadata('user', $user->getId());
+
+ return $user;
+ }, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken', 'authorization']);
+
+ $container->set('project', function ($dbForPlatform, $request, $console, $authorization, Http $utopia) {
+ /** @var Appwrite\Utopia\Request $request */
+ /** @var Utopia\Database\Database $dbForPlatform */
+ /** @var Utopia\Database\Document $console */
+ $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
+ // Realtime channel "project" can send project=Query array
+ if (! \is_string($projectId)) {
+ $projectId = $request->getHeader('x-appwrite-project', '');
+ }
+
+ // Backwards compatibility for new services, originally project resources
+ // These endpoints moved from /v1/projects/:projectId/ to /v1/
+ // When accessed via the old alias path, extract projectId from the URI
+ $deprecatedProjectPathPrefix = '/v1/projects/';
+ $route = $utopia->match($request);
+ if (!empty($route)) {
+ $isDeprecatedAlias = \str_starts_with($request->getURI(), $deprecatedProjectPathPrefix) &&
+ !\str_starts_with($route->getPath(), $deprecatedProjectPathPrefix);
+
+ if ($isDeprecatedAlias) {
+ $projectId = \explode('/', $request->getURI(), 5)[3] ?? '';
+ }
+ }
+
+ if (empty($projectId) || $projectId === 'console') {
+ return $console;
+ }
+
+ $project = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+
+ return $project;
+ }, ['dbForPlatform', 'request', 'console', 'authorization', 'utopia']);
+
+ $container->set('session', function (User $user, Store $store, Token $proofForToken) {
+ if ($user->isEmpty()) {
+ return;
+ }
+
+ $sessions = $user->getAttribute('sessions', []);
+ $sessionId = $user->sessionVerify($store->getProperty('secret', ''), $proofForToken);
+
+ if (! $sessionId) {
+ return;
+ }
+ foreach ($sessions as $session) {
+ /** @var Document $session */
+ if ($sessionId === $session->getId()) {
+ return $session;
+ }
+ }
+
+ return;
+ }, ['user', 'store', 'proofForToken']);
+
+ $container->set('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, UsageContext $usage, Authorization $authorization, Request $request) {
+ if ($project->isEmpty() || $project->getId() === 'console') {
+ return $dbForPlatform;
+ }
+
+ $database = $project->getAttribute('database', '');
+ if (empty($database)) {
+ 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)) {
+ $database
+ ->setSharedTables(true)
+ ->setTenant($project->getSequence())
+ ->setNamespace($dsn->getParam('namespace'));
+ } else {
+ $database
+ ->setSharedTables(false)
+ ->setTenant(null)
+ ->setNamespace('_' . $project->getSequence());
+ }
+
+ /**
+ * This isolated event handling for `users.*.create` which is based on a `Database::EVENT_DOCUMENT_CREATE` listener may look odd, but it is **intentional**.
+ *
+ * Accounts can be created in many ways beyond `createAccount`
+ * (anonymous, OAuth, phone, etc.), and those flows are probably not covered in event tests; so we handle this here.
+ */
+ $eventDatabaseListener = function (Document $project, Document $document, Response $response, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
+ // Only trigger events for user creation with the database listener.
+ if ($document->getCollection() !== 'users') {
+ return;
+ }
+
+ $queueForEvents
+ ->setEvent('users.[userId].create')
+ ->setParam('userId', $document->getId())
+ ->setPayload($response->output($document, Response::MODEL_USER));
+
+ // Trigger functions, webhooks, and realtime events
+ $queueForFunctions
+ ->from($queueForEvents)
+ ->trigger();
+
+ /** Trigger webhooks events only if a project has them enabled */
+ if (! empty($project->getAttribute('webhooks'))) {
+ $queueForWebhooks
+ ->from($queueForEvents)
+ ->trigger();
+ }
+
+ /** Trigger realtime events only for non console events */
+ if ($queueForEvents->getProject()->getId() !== 'console') {
+ $queueForRealtime
+ ->from($queueForEvents)
+ ->trigger();
+ }
+ };
+
+ /**
+ * Purge function events cache when functions are created, updated or deleted.
+ */
+ $functionsEventsCacheListener = function (string $event, Document $document, Document $project, Database $dbForProject) {
+
+ if ($document->getCollection() !== 'functions') {
+ return;
+ }
+
+ if ($project->isEmpty() || $project->getId() === 'console') {
+ return;
+ }
+
+ $hostname = $dbForProject->getAdapter()->getHostname();
+ $cacheKey = \sprintf(
+ '%s-cache-%s:%s:%s:project:%s:functions:events',
+ $dbForProject->getCacheName(),
+ $hostname,
+ $dbForProject->getNamespace(),
+ $dbForProject->getTenant(),
+ $project->getId()
+ );
+
+ $dbForProject->getCache()->purge($cacheKey);
+ };
+
+ /**
+ * Prefix metrics with database type when applicable.
+ * Avoids prefixing for legacy and tablesdb types to preserve historical metrics.
+ */
+ $getDatabaseTypePrefixedMetric = function (string $databaseType, string $metric): string {
+ if (
+ $databaseType === '' ||
+ $databaseType === DATABASE_TYPE_LEGACY ||
+ $databaseType === DATABASE_TYPE_TABLESDB
+ ) {
+ return $metric;
+ }
+
+ return $databaseType . '.' . $metric;
+ };
+
+ // Determine database type from request path, similar to api.php
+ $path = $request->getURI();
+ $databaseType = match (true) {
+ str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
+ str_contains($path, '/vectorsdb') => DATABASE_TYPE_VECTORSDB,
+ default => '',
+ };
+
+ $usageDatabaseListener = function (string $event, Document $document, UsageContext $usage) use ($getDatabaseTypePrefixedMetric, $databaseType) {
+ $value = 1;
+
+ switch ($event) {
+ case Database::EVENT_DOCUMENT_DELETE:
+ $value = -1;
+ break;
+ case Database::EVENT_DOCUMENTS_DELETE:
+ $value = -1 * $document->getAttribute('modified', 0);
+ break;
+ case Database::EVENT_DOCUMENTS_CREATE:
+ $value = $document->getAttribute('modified', 0);
+ break;
+ case Database::EVENT_DOCUMENTS_UPSERT:
+ $value = $document->getAttribute('created', 0);
+ break;
+ }
+
+ switch (true) {
+ case $document->getCollection() === 'teams':
+ $usage->addMetric(METRIC_TEAMS, $value); // per project
+ break;
+ case $document->getCollection() === 'users':
+ $usage->addMetric(METRIC_USERS, $value); // per project
+ if ($event === Database::EVENT_DOCUMENT_DELETE) {
+ $usage->addReduce($document);
+ }
+ break;
+ case $document->getCollection() === 'sessions': // sessions
+ $usage->addMetric(METRIC_SESSIONS, $value); // per project
+ break;
+ case $document->getCollection() === 'databases': // databases
+ $metric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASES);
+ $usage->addMetric($metric, $value); // per project
+
+ if ($event === Database::EVENT_DOCUMENT_DELETE) {
+ $usage->addReduce($document);
+ }
+ break;
+ case str_starts_with($document->getCollection(), 'database_') && ! str_contains($document->getCollection(), 'collection'): // collections
+ $parts = explode('_', $document->getCollection());
+ $databaseInternalId = $parts[1] ?? 0;
+ $collectionMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_COLLECTIONS);
+ $databaseIdCollectionMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_COLLECTIONS);
+ $usage
+ ->addMetric($collectionMetric, $value) // per project
+ ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdCollectionMetric), $value);
+
+ if ($event === Database::EVENT_DOCUMENT_DELETE) {
+ $usage->addReduce($document);
+ }
+ break;
+ case str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_'): // documents
+ $parts = explode('_', $document->getCollection());
+ $databaseInternalId = $parts[1] ?? 0;
+ $collectionInternalId = $parts[3] ?? 0;
+ $documentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DOCUMENTS);
+ $databaseIdDocumentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_DOCUMENTS);
+ $databaseIdCollectionIdDocumentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS);
+ $usage
+ ->addMetric($documentsMetric, $value) // per project
+ ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
+ break;
+ case $document->getCollection() === 'buckets': // buckets
+ $usage->addMetric(METRIC_BUCKETS, $value); // per project
+ if ($event === Database::EVENT_DOCUMENT_DELETE) {
+ $usage
+ ->addReduce($document);
+ }
+ break;
+ case str_starts_with($document->getCollection(), 'bucket_'): // files
+ $parts = explode('_', $document->getCollection());
+ $bucketInternalId = $parts[1];
+ $usage
+ ->addMetric(METRIC_FILES, $value) // per project
+ ->addMetric(METRIC_FILES_STORAGE, $document->getAttribute('sizeOriginal') * $value) // per project
+ ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES), $value) // per bucket
+ ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES_STORAGE), $document->getAttribute('sizeOriginal') * $value); // per bucket
+ break;
+ case $document->getCollection() === 'functions':
+ $usage->addMetric(METRIC_FUNCTIONS, $value); // per project
+
+ if ($event === Database::EVENT_DOCUMENT_DELETE) {
+ $usage
+ ->addReduce($document);
+ }
+ break;
+ case $document->getCollection() === 'sites':
+ $usage->addMetric(METRIC_SITES, $value); // per project
+
+ if ($event === Database::EVENT_DOCUMENT_DELETE) {
+ $usage
+ ->addReduce($document);
+ }
+ break;
+ case $document->getCollection() === 'deployments':
+ $usage
+ ->addMetric(METRIC_DEPLOYMENTS, $value) // per project
+ ->addMetric(METRIC_DEPLOYMENTS_STORAGE, $document->getAttribute('size') * $value) // per project
+ ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS), $value) // per function
+ ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value)
+ ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS), $value) // per function
+ ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value);
+ break;
+ default:
+ break;
+ }
+ };
+
+ // Clone the queues, to prevent events triggered by the database listener
+ // from overwriting the events that are supposed to be triggered in the shutdown hook.
+ $queueForEventsClone = new Event($publisher);
+ $queueForFunctions = new Func($publisherFunctions);
+ $queueForWebhooks = new Webhook($publisherWebhooks);
+ $queueForRealtime = new Realtime();
+
+ $database
+ ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
+ ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
+ ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
+ ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
+ ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $usage))
+ ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
+ $project,
+ $document,
+ $response,
+ $queueForEventsClone->from($queueForEvents),
+ $queueForFunctions->from($queueForEvents),
+ $queueForWebhooks->from($queueForEvents),
+ $queueForRealtime->from($queueForEvents)
+ ))
+ ->on(Database::EVENT_DOCUMENT_CREATE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database))
+ ->on(Database::EVENT_DOCUMENT_UPDATE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database))
+ ->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', 'queueForFunctions', 'queueForWebhooks', 'queueForRealtime', 'usage', 'authorization', 'request']);
+
+ $container->set('schema', function ($utopia, $dbForProject, $authorization) {
+
+ $complexity = function (int $complexity, array $args) {
+ $queries = Query::parseQueries($args['queries'] ?? []);
+ $query = Query::getByType($queries, [Query::TYPE_LIMIT])[0] ?? null;
+ $limit = $query ? $query->getValue() : APP_LIMIT_LIST_DEFAULT;
+
+ return $complexity * $limit;
+ };
+
+ $attributes = function (int $limit, int $offset) use ($dbForProject, $authorization) {
+ $attrs = $authorization->skip(fn () => $dbForProject->find('attributes', [
+ Query::limit($limit),
+ Query::offset($offset),
+ ]));
+
+ return \array_map(function ($attr) {
+ return $attr->getArrayCopy();
+ }, $attrs);
+ };
+
+ $urls = [
+ 'list' => function (string $databaseId, string $collectionId, array $args) {
+ return "/v1/databases/$databaseId/collections/$collectionId/documents";
+ },
+ 'create' => function (string $databaseId, string $collectionId, array $args) {
+ return "/v1/databases/$databaseId/collections/$collectionId/documents";
+ },
+ 'read' => function (string $databaseId, string $collectionId, array $args) {
+ return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
+ },
+ 'update' => function (string $databaseId, string $collectionId, array $args) {
+ return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
+ },
+ 'delete' => function (string $databaseId, string $collectionId, array $args) {
+ return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
+ },
+ ];
+
+ // NOTE: `params` and `urls` are not used internally in the `Schema::build` function below!
+ $params = [
+ 'list' => function (string $databaseId, string $collectionId, array $args) {
+ return ['queries' => $args['queries']];
+ },
+ 'create' => function (string $databaseId, string $collectionId, array $args) {
+ $id = $args['id'] ?? 'unique()';
+ $permissions = $args['permissions'] ?? null;
+
+ unset($args['id']);
+ unset($args['permissions']);
+
+ // Order must be the same as the route params
+ return [
+ 'databaseId' => $databaseId,
+ 'documentId' => $id,
+ 'collectionId' => $collectionId,
+ 'data' => $args,
+ 'permissions' => $permissions,
+ ];
+ },
+ 'update' => function (string $databaseId, string $collectionId, array $args) {
+ $documentId = $args['id'];
+ $permissions = $args['permissions'] ?? null;
+
+ unset($args['id']);
+ unset($args['permissions']);
+
+ // Order must be the same as the route params
+ return [
+ 'databaseId' => $databaseId,
+ 'collectionId' => $collectionId,
+ 'documentId' => $documentId,
+ 'data' => $args,
+ 'permissions' => $permissions,
+ ];
+ },
+ ];
+
+ return Schema::build(
+ $utopia,
+ $complexity,
+ $attributes,
+ $urls,
+ $params,
+ );
+ }, ['utopia', 'dbForProject', 'authorization']);
+
+ $container->set('audit', function ($dbForProject) {
+ $adapter = new AdapterDatabase($dbForProject);
+
+ return new Audit($adapter);
+ }, ['dbForProject']);
+
+ $container->set('mode', function ($request, Document $project) {
+ /** @var Appwrite\Utopia\Request $request */
+
+ /**
+ * Defines the mode for the request:
+ * - 'default' => Requests for Client and Server Side
+ * - 'admin' => Request from the Console on non-console projects
+ */
+ $mode = $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
+
+ $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
+ if (!empty($projectId) && $project->getId() !== $projectId) {
+ $mode = APP_MODE_ADMIN;
+ }
+
+ return $mode;
+ }, ['request', 'project']);
+
+ $container->set('requestTimestamp', function ($request) {
+ // TODO: Move this to the Request class itself
+ $timestampHeader = $request->getHeader('x-appwrite-timestamp');
+ $requestTimestamp = null;
+ if (! empty($timestampHeader)) {
+ try {
+ $requestTimestamp = new \DateTime($timestampHeader);
+ } catch (\Throwable $e) {
+ throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid X-Appwrite-Timestamp header value');
+ }
+ }
+
+ return $requestTimestamp;
+ }, ['request']);
+
+ $container->set('devKey', function (Request $request, Document $project, array $servers, Database $dbForPlatform, Authorization $authorization) {
+ $devKey = $request->getHeader('x-appwrite-dev-key', $request->getParam('devKey', ''));
+
+ // Check if given key match project's development keys
+ $key = $project->find('secret', $devKey, 'devKeys');
+ if (! $key) {
+ return new Document([]);
+ }
+
+ // check expiration
+ $expire = $key->getAttribute('expire');
+ if (! empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
+ return new Document([]);
+ }
+
+ // update access time
+ $accessedAt = $key->getAttribute('accessedAt', 0);
+ if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
+ $key->setAttribute('accessedAt', DatabaseDateTime::now());
+ $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), new Document([
+ 'accessedAt' => $key->getAttribute('accessedAt')
+ ])));
+ $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+ }
+
+ // add sdk to key
+ $sdkValidator = new WhiteList($servers, true);
+ $sdk = \strtolower($request->getHeader('x-sdk-name', 'UNKNOWN'));
+
+ if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
+ $sdks = $key->getAttribute('sdks', []);
+
+ if (! in_array($sdk, $sdks)) {
+ $sdks[] = $sdk;
+ $key->setAttribute('sdks', $sdks);
+
+ /** Update access time as well */
+ $key->setAttribute('accessedAt', DatabaseDateTime::now());
+ $key = $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), new Document([
+ 'sdks' => $key->getAttribute('sdks'),
+ 'accessedAt' => $key->getAttribute('accessedAt')
+ ])));
+ $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+ }
+ }
+
+ return $key;
+ }, ['request', 'project', 'servers', 'dbForPlatform', 'authorization']);
+
+ $container->set('team', function (Document $project, Database $dbForPlatform, Http $utopia, Request $request, Authorization $authorization) {
+ $teamInternalId = '';
+ if ($project->getId() !== 'console') {
+ $teamInternalId = $project->getAttribute('teamInternalId', '');
+ } else {
+ $route = $utopia->match($request);
+ $path = ! empty($route) ? $route->getPath() : $request->getURI();
+ $orgHeader = $request->getHeader('x-appwrite-organization', '');
+ if (str_starts_with($path, '/v1/projects/:projectId')) {
+ $uri = $request->getURI();
+ $pid = explode('/', $uri)[3];
+ $p = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $pid));
+ $teamInternalId = $p->getAttribute('teamInternalId', '');
+ } elseif ($path === '/v1/projects') {
+ $teamId = $request->getParam('teamId', '');
+
+ if (empty($teamId)) {
+ return new Document([]);
+ }
+
+ $team = $authorization->skip(fn () => $dbForPlatform->getDocument('teams', $teamId));
+
+ return $team;
+ } elseif (! empty($orgHeader)) {
+ return $authorization->skip(fn () => $dbForPlatform->getDocument('teams', $orgHeader));
+ }
+ }
+
+ // if teamInternalId is empty, return an empty document
+
+ if (empty($teamInternalId)) {
+ return new Document([]);
+ }
+
+ $team = $authorization->skip(function () use ($dbForPlatform, $teamInternalId) {
+ return $dbForPlatform->findOne('teams', [
+ Query::equal('$sequence', [$teamInternalId]),
+ ]);
+ });
+
+ return $team;
+ }, ['project', 'dbForPlatform', 'utopia', 'request', 'authorization']);
+
+ $container->set('previewHostname', function (Request $request, ?Key $apiKey) {
+ $allowed = false;
+
+ if (Http::isDevelopment()) {
+ $allowed = true;
+ } elseif (! \is_null($apiKey) && $apiKey->getHostnameOverride() === true) {
+ $allowed = true;
+ }
+
+ if ($allowed) {
+ $host = $request->getQuery('appwrite-hostname', $request->getHeader('x-appwrite-hostname', '')) ?? '';
+ if (! empty($host)) {
+ return $host;
+ }
+ }
+
+ return '';
+ }, ['request', 'apiKey']);
+
+ $container->set('apiKey', function (Request $request, Document $project, Document $team, Document $user): ?Key {
+ $key = $request->getHeader('x-appwrite-key');
+
+ if (empty($key)) {
+ return null;
+ }
+
+ $key = Key::decode($project, $team, $user, $key);
+
+ $userHeader = $request->getHeader('x-appwrite-user');
+ $organizationHeader = $request->getHeader('x-appwrite-organization');
+ $projectHeader = $request->getHeader('x-appwrite-project');
+
+ if (! empty($key->getProjectId())) {
+ if (empty($projectHeader) || $projectHeader !== $key->getProjectId()) {
+ throw new Exception(Exception::PROJECT_ID_MISSING);
+ }
+ }
+
+ if (! empty($key->getUserId())) {
+ if (empty($userHeader) || $userHeader !== $key->getUserId()) {
+ throw new Exception(Exception::USER_ID_MISSING);
+ }
+ }
+
+ if (! empty($key->getTeamId())) {
+ if (empty($organizationHeader) || $organizationHeader !== $key->getTeamId()) {
+ throw new Exception(Exception::ORGANIZATION_ID_MISSING);
+ }
+ }
+
+ return $key;
+ }, ['request', 'project', 'team', 'user']);
+
+ $container->set('resourceToken', function ($project, $dbForProject, $request, Authorization $authorization) {
+ $tokenJWT = $request->getParam('token');
+
+ if (! empty($tokenJWT) && ! $project->isEmpty()) { // JWT authentication
+ // Use a large but reasonable maxAge to avoid auto-exp when token has no expiry
+ $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), RESOURCE_TOKEN_ALGORITHM, RESOURCE_TOKEN_MAX_AGE, RESOURCE_TOKEN_LEEWAY); // Instantiate with key, algo, maxAge and leeway.
+
+ try {
+ $payload = $jwt->decode($tokenJWT);
+ } catch (JWTException $error) {
+ return new Document([]);
+ }
+
+ $tokenId = $payload['tokenId'] ?? '';
+ if (empty($tokenId)) {
+ return new Document([]);
+ }
+
+ $token = $authorization->skip(fn () => $dbForProject->getDocument('resourceTokens', $tokenId));
+
+ if ($token->isEmpty()) {
+ return new Document([]);
+ }
+
+ $expiry = $token->getAttribute('expire');
+
+ if ($expiry !== null) {
+ $now = new \DateTime();
+ $expiryDate = new \DateTime($expiry);
+
+ if ($expiryDate < $now) {
+ return new Document([]);
+ }
+ }
+
+ return match ($token->getAttribute('resourceType')) {
+ TOKENS_RESOURCE_TYPE_FILES => (function () use ($token, $dbForProject, $authorization) {
+ $sequences = explode(':', $token->getAttribute('resourceInternalId'));
+ $ids = explode(':', $token->getAttribute('resourceId'));
+
+ if (count($sequences) !== 2 || count($ids) !== 2) {
+ return new Document([]);
+ }
+
+ $accessedAt = $token->getAttribute('accessedAt', 0);
+ if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), -APP_RESOURCE_TOKEN_ACCESS)) > $accessedAt) {
+ $token->setAttribute('accessedAt', DatabaseDateTime::now());
+ $authorization->skip(fn () => $dbForProject->updateDocument('resourceTokens', $token->getId(), new Document([
+ 'accessedAt' => $token->getAttribute('accessedAt')
+ ])));
+ }
+
+ return new Document([
+ 'bucketId' => $ids[0],
+ 'fileId' => $ids[1],
+ 'bucketInternalId' => $sequences[0],
+ 'fileInternalId' => $sequences[1],
+ ]);
+ })(),
+
+ default => throw new Exception(Exception::TOKEN_RESOURCE_TYPE_INVALID),
+ };
+ }
+
+ return new Document([]);
+ }, ['project', 'dbForProject', 'request', 'authorization']);
+
+ $container->set('getDatabasesDB', function (Group $pools, Cache $cache, Document $project, Request $request, UsageContext $usage, Authorization $authorization) {
+
+ return function (Document $database) use ($pools, $cache, $project, $request, $usage, $authorization): Database {
+ $databaseDSN = $database->getAttribute('database', $project->getAttribute('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'));
+ }
+
+ $pool = $pools->get($databaseDSN->getHost());
+
+ $adapter = new DatabasePool($pool);
+ $database = new Database($adapter, $cache);
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+ $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);
+ if (\in_array($dsn->getHost(), $sharedTables)) {
+ $database
+ ->setSharedTables(true)
+ ->setTenant((int) $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);
+ }
+
+ // Register database event listeners for usage stats collection
+ $documentsMetric = METRIC_DOCUMENTS;
+ $databaseIdDocumentsMetric = METRIC_DATABASE_ID_DOCUMENTS;
+ $databaseIdCollectionIdDocumentsMetric = METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS;
+ if ($databaseType !== DATABASE_TYPE_LEGACY && $databaseType !== DATABASE_TYPE_TABLESDB) {
+ $documentsMetric = $databaseType . '.' . $documentsMetric;
+ $databaseIdDocumentsMetric = $databaseType . '.' . $databaseIdDocumentsMetric;
+ $databaseIdCollectionIdDocumentsMetric = $databaseType . '.' . $databaseIdCollectionIdDocumentsMetric;
+ }
+ $database
+ ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+ $value = 1;
+
+ if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+ $parts = explode('_', $document->getCollection());
+ $databaseInternalId = $parts[1] ?? 0;
+ $collectionInternalId = $parts[3] ?? 0;
+ $usage
+ ->addMetric($documentsMetric, $value) // per project
+ ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
+ }
+ })
+ ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+ $value = -1;
+
+ if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+ $parts = explode('_', $document->getCollection());
+ $databaseInternalId = $parts[1] ?? 0;
+ $collectionInternalId = $parts[3] ?? 0;
+ $usage
+ ->addMetric($documentsMetric, $value) // per project
+ ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
+ }
+ })
+ ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+ $value = $document->getAttribute('modified', 0);
+
+ if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+ $parts = explode('_', $document->getCollection());
+ $databaseInternalId = $parts[1] ?? 0;
+ $collectionInternalId = $parts[3] ?? 0;
+ $usage
+ ->addMetric($documentsMetric, $value) // per project
+ ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
+ }
+ })
+ ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+ $value = -1 * $document->getAttribute('modified', 0);
+
+ if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+ $parts = explode('_', $document->getCollection());
+ $databaseInternalId = $parts[1] ?? 0;
+ $collectionInternalId = $parts[3] ?? 0;
+ $usage
+ ->addMetric($documentsMetric, $value) // per project
+ ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
+ }
+ })
+ ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', function ($event, $document) use ($usage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+ $value = $document->getAttribute('created', 0);
+
+ if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+ $parts = explode('_', $document->getCollection());
+ $databaseInternalId = $parts[1] ?? 0;
+ $collectionInternalId = $parts[3] ?? 0;
+ $usage
+ ->addMetric($documentsMetric, $value) // per project
+ ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value); // per collection
+ }
+ });
+
+ return $database;
+ };
+
+ }, ['pools', 'cache', 'project', 'request', 'usage', 'authorization']);
+
+ $container->set('transactionState', function (Database $dbForProject, Authorization $authorization, callable $getDatabasesDB) {
+ return new TransactionState($dbForProject, $authorization, $getDatabasesDB);
+ }, ['dbForProject', 'authorization', 'getDatabasesDB']);
+
+ $container->set('executionsRetentionCount', function (Document $project, array $plan) {
+ if ($project->getId() === 'console' || empty($plan)) {
+ return 0;
+ }
+
+ return (int) ($plan['executionsRetentionCount'] ?? 100);
+ }, ['project', 'plan']);
+
+ $container->set('deviceForFiles', function ($project, Telemetry $telemetry) {
+ return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+ $container->set('deviceForSites', function ($project, Telemetry $telemetry) {
+ return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+ $container->set('deviceForMigrations', function ($project, Telemetry $telemetry) {
+ return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+ $container->set('deviceForFunctions', function ($project, Telemetry $telemetry) {
+ return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+ $container->set('deviceForBuilds', function ($project, Telemetry $telemetry) {
+ return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+
+ $container->set('embeddingAgent', function ($register) {
+ $adapter = new Ollama();
+ $adapter->setEndpoint(System::getEnv('_APP_EMBEDDING_ENDPOINT', 'http://ollama:11434/api/embed'));
+ $adapter->setTimeout((int) System::getEnv('_APP_EMBEDDING_TIMEOUT', '30000'));
+ return new Agent($adapter);
+ }, ['register']);
+};
diff --git a/app/init/worker/message.php b/app/init/worker/message.php
new file mode 100644
index 0000000000..a444ada91d
--- /dev/null
+++ b/app/init/worker/message.php
@@ -0,0 +1,435 @@
+set('log', fn () => new Log(), []);
+
+ $container->set('usage', fn () => new Context(), []);
+
+ $container->set('authorization', function () {
+ $authorization = new Authorization();
+ $authorization->disable();
+
+ return $authorization;
+ }, []);
+
+ $container->set('dbForPlatform', function (Cache $cache, Group $pools, Authorization $authorization) {
+ $adapter = new DatabasePool($pools->get('console'));
+ $dbForPlatform = new Database($adapter, $cache);
+
+ $dbForPlatform
+ ->setDatabase(APP_DATABASE)
+ ->setAuthorization($authorization)
+ ->setNamespace('_console')
+ ->setDocumentType('users', User::class);
+
+ return $dbForPlatform;
+ }, ['cache', 'pools', 'authorization']);
+
+ $container->set('project', function ($message, Database $dbForPlatform) {
+ $payload = $message->getPayload() ?? [];
+ $project = new Document($payload['project'] ?? []);
+
+ if ($project->isEmpty() || $project->getId() === 'console') {
+ return $project;
+ }
+
+ 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;
+ }
+
+ 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)) {
+ $database
+ ->setSharedTables(true)
+ ->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 {
+ 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)) {
+ $database
+ ->setSharedTables(true)
+ ->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)) {
+ $database
+ ->setSharedTables(true)
+ ->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;
+ };
+ }, ['pools', 'dbForPlatform', 'cache', 'authorization']);
+
+ $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 {
+ $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', '');
+ }
+
+ 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');
+ $pool = $pools->get($databaseDSN->getHost());
+
+ $adapter = new DatabasePool($pool);
+ $database = new Database($adapter, $cache);
+ $database
+ ->setDatabase(APP_DATABASE)
+ ->setAuthorization($authorization);
+ $database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
+
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+ if (\in_array($dsn->getHost(), $sharedTables, true)) {
+ $database
+ ->setSharedTables(true)
+ ->setTenant((int) $projectDocument->getSequence())
+ ->setNamespace($dsn->getParam('namespace'));
+ } else {
+ $database
+ ->setSharedTables(false)
+ ->setTenant(null)
+ ->setNamespace('_' . $projectDocument->getSequence());
+ }
+
+ $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+ return $database;
+ };
+ }, ['cache', 'register', 'project', 'authorization']);
+
+ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+ $database = null;
+
+ return function (?Document $project = null) use ($pools, $cache, $authorization, &$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);
+
+ $database
+ ->setDatabase(APP_DATABASE)
+ ->setAuthorization($authorization)
+ ->setSharedTables(true)
+ ->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());
+ }
+
+ return $database;
+ };
+ }, ['pools', 'cache', 'authorization']);
+
+ $container->set('abuseRetention', function () {
+ return \time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
+ }, []);
+
+ $container->set('auditRetention', function (Document $project) {
+ if ($project->getId() === 'console') {
+ return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
+ }
+
+ return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
+ }, ['project']);
+
+ $container->set('executionRetention', function () {
+ return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
+ }, []);
+
+ $container->set('queueForDatabase', function (Publisher $publisher) {
+ return new EventDatabase($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForMessaging', function (Publisher $publisher) {
+ return new Messaging($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForMails', function (Publisher $publisher) {
+ return new Mail($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForBuilds', function (Publisher $publisher) {
+ return new Build($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForScreenshots', function (Publisher $publisher) {
+ return new Screenshot($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForDeletes', function (Publisher $publisher) {
+ return new Delete($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForEvents', function (Publisher $publisher) {
+ return new Event($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForAudits', function (Publisher $publisher) {
+ return new Audit($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForWebhooks', function (Publisher $publisher) {
+ return new Webhook($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForFunctions', function (Publisher $publisher) {
+ return new Func($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForRealtime', function () {
+ return new Realtime();
+ }, []);
+
+ $container->set('queueForCertificates', function (Publisher $publisher) {
+ return new Certificate($publisher);
+ }, ['publisher']);
+
+ $container->set('queueForMigrations', function (Publisher $publisher) {
+ return new Migration($publisher);
+ }, ['publisher']);
+
+ $container->set('deviceForSites', function (Document $project, Telemetry $telemetry) {
+ return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+
+ $container->set('deviceForMigrations', function (Document $project, Telemetry $telemetry) {
+ return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+
+ $container->set('deviceForFunctions', function (Document $project, Telemetry $telemetry) {
+ return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+
+ $container->set('deviceForFiles', function (Document $project, Telemetry $telemetry) {
+ return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+
+ $container->set('deviceForBuilds', function (Document $project, Telemetry $telemetry) {
+ return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+
+ $container->set('deviceForCache', function (Document $project, Telemetry $telemetry) {
+ return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId()));
+ }, ['project', 'telemetry']);
+
+ $container->set('logError', function (Registry $register, Document $project) {
+ return function (Throwable $error, string $namespace, string $action, ?array $extras = null) use ($register, $project) {
+ $logger = $register->get('logger');
+
+ if ($logger) {
+ $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
+
+ $log = new Log();
+ $log->setNamespace($namespace);
+ $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+ $log->setVersion($version);
+ $log->setType(Log::TYPE_ERROR);
+ $log->setMessage($error->getMessage());
+
+ $log->addTag('code', $error->getCode());
+ $log->addTag('verboseType', \get_class($error));
+ $log->addTag('projectId', $project->getId() ?? '');
+
+ $log->addExtra('file', $error->getFile());
+ $log->addExtra('line', $error->getLine());
+ $log->addExtra('trace', $error->getTraceAsString());
+
+ if ($error->getPrevious() !== null) {
+ if ($error->getPrevious()->getMessage() != $error->getMessage()) {
+ $log->addExtra('previousMessage', $error->getPrevious()->getMessage());
+ }
+ $log->addExtra('previousFile', $error->getPrevious()->getFile());
+ $log->addExtra('previousLine', $error->getPrevious()->getLine());
+ }
+
+ foreach (($extras ?? []) as $key => $value) {
+ $log->addExtra($key, $value);
+ }
+
+ $log->setAction($action);
+
+ $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
+ $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+ try {
+ $responseCode = $logger->addLog($log);
+ Console::info('Error log pushed with status code: ' . $responseCode);
+ } catch (Throwable $th) {
+ Console::error('Error pushing log: ' . $th->getMessage());
+ }
+ }
+
+ Console::warning("Failed: {$error->getMessage()}");
+ Console::warning($error->getTraceAsString());
+
+ if ($error->getPrevious() !== null) {
+ if ($error->getPrevious()->getMessage() != $error->getMessage()) {
+ Console::warning("Previous Failed: {$error->getPrevious()->getMessage()}");
+ }
+ Console::warning("Previous File: {$error->getPrevious()->getFile()} Line: {$error->getPrevious()->getLine()}");
+ }
+ };
+ }, ['register', 'project']);
+
+ $container->set('getAudit', function (Database $dbForPlatform, callable $getProjectDB) {
+ return function (Document $project) use ($dbForPlatform, $getProjectDB) {
+ if ($project->isEmpty() || $project->getId() === 'console') {
+ $adapter = new AdapterDatabase($dbForPlatform);
+
+ return new UtopiaAudit($adapter);
+ }
+
+ $dbForProject = $getProjectDB($project);
+ $adapter = new AdapterDatabase($dbForProject);
+
+ return new UtopiaAudit($adapter);
+ };
+ }, ['dbForPlatform', 'getProjectDB']);
+
+ $container->set('executionsRetentionCount', function (Document $project, array $plan) {
+ if ($project->getId() === 'console' || empty($plan)) {
+ return 0;
+ }
+
+ return (int) ($plan['executionsRetentionCount'] ?? 100);
+ }, ['project', 'plan']);
+};
diff --git a/app/realtime.php b/app/realtime.php
index 52bf62a11f..4d25b07005 100644
--- a/app/realtime.php
+++ b/app/realtime.php
@@ -33,7 +33,9 @@ use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Role;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
+use Utopia\DI\Container;
use Utopia\DSN\DSN;
+use Utopia\Http\Adapter\FPM\Server as HttpServer;
use Utopia\Http\Http;
use Utopia\Logger\Log;
use Utopia\Pools\Group;
@@ -48,6 +50,8 @@ use Utopia\WebSocket\Server;
*/
require_once __DIR__ . '/init.php';
+$registerRequestResources ??= require __DIR__ . '/init/resources/request.php';
+
Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
// Log uncaught exceptions in one line instead of relying on Swoole's full backtrace dump
@@ -240,6 +244,11 @@ if (!function_exists('triggerStats')) {
}
}
+global $container;
+$container->set('pools', function ($register) {
+ return $register->get('pools');
+}, ['register']);
+
$realtime = getRealtime();
/**
@@ -614,16 +623,22 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
Console::error('Failed to restart pub/sub...');
});
-$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime) {
- $app = new Http('UTC');
+$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime, $registerRequestResources) {
+ global $container;
$request = new Request($request);
$response = new Response(new SwooleResponse());
Console::info("Connection open (user: {$connection})");
- Http::setResource('pools', fn () => $register->get('pools'));
- Http::setResource('request', fn () => $request);
- Http::setResource('response', fn () => $response);
+ $connectionContainer = new Container($container);
+
+ $adapter = new HttpServer($connectionContainer);
+ $app = new Http($adapter, 'UTC');
+ $connectionContainer->set('utopia', fn () => $app);
+ $connectionContainer->set('request', fn () => $request);
+ $connectionContainer->set('response', fn () => $response);
+
+ $registerRequestResources($connectionContainer);
$project = null;
$logUser = null;
diff --git a/app/worker.php b/app/worker.php
index 4a0a4870e4..e55abb587c 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -2,564 +2,68 @@
require_once __DIR__ . '/init.php';
+$registerWorkerMessageResources = require __DIR__ . '/init/worker/message.php';
use Appwrite\Certificates\LetsEncrypt;
-use Appwrite\Event\Audit;
-use Appwrite\Event\Build;
-use Appwrite\Event\Certificate;
-use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
-use Appwrite\Event\Event;
-use Appwrite\Event\Func;
-use Appwrite\Event\Mail;
-use Appwrite\Event\Messaging;
-use Appwrite\Event\Migration;
-use Appwrite\Event\Publisher\Usage as UsagePublisher;
-use Appwrite\Event\Realtime;
-use Appwrite\Event\Screenshot;
-use Appwrite\Event\Webhook;
use Appwrite\Platform\Appwrite;
-use Appwrite\Usage\Context;
-use Appwrite\Utopia\Database\Documents\User;
-use Executor\Executor;
use Swoole\Runtime;
-use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
-use Utopia\Audit\Adapter\Database as AdapterDatabase;
-use Utopia\Audit\Audit as UtopiaAudit;
-use Utopia\Cache\Adapter\Pool as CachePool;
-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\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Validator\Authorization;
-use Utopia\DSN\DSN;
use Utopia\Logger\Log;
use Utopia\Logger\Logger;
use Utopia\Platform\Service;
use Utopia\Pools\Group;
+use Utopia\Queue\Adapter\Swoole;
use Utopia\Queue\Broker\Pool as BrokerPool;
-use Utopia\Queue\Message;
-use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
use Utopia\Queue\Server;
-use Utopia\Registry\Registry;
-use Utopia\Storage\Device\Telemetry as TelemetryDevice;
use Utopia\System\System;
-use Utopia\Telemetry\Adapter as Telemetry;
-use Utopia\Telemetry\Adapter\None as NoTelemetry;
Runtime::enableCoroutine();
require_once __DIR__ . '/init/span.php';
-global $register;
-Server::setResource('register', fn () => $register);
+global $container;
+$container->set('pools', function ($register) {
+ return $register->get('pools');
+}, ['register']);
-Server::setResource('authorization', function () {
+$container->set('authorization', function () {
$authorization = new Authorization();
$authorization->disable();
return $authorization;
}, []);
-Server::setResource('dbForPlatform', function (Cache $cache, Registry $register, Authorization $authorization) {
- $pools = $register->get('pools');
- $adapter = new DatabasePool($pools->get('console'));
- $dbForPlatform = new Database($adapter, $cache);
+$container->set('project', fn () => new Document([]), []);
- $dbForPlatform
- ->setDatabase(APP_DATABASE)
- ->setAuthorization($authorization)
- ->setNamespace('_console')
- ->setDocumentType('users', User::class);
+$container->set('log', fn () => new Log(), []);
- return $dbForPlatform;
-}, ['cache', 'register', 'authorization']);
-
-Server::setResource('project', function (Message $message, Database $dbForPlatform) {
- $payload = $message->getPayload() ?? [];
- $project = new Document($payload['project'] ?? []);
-
- if ($project->getId() === 'console') {
- return $project;
- }
-
- return $dbForPlatform->getDocument('projects', $project->getId());
-}, ['message', 'dbForPlatform']);
-
-Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Document $project, Database $dbForPlatform, Authorization $authorization) {
- if ($project->isEmpty() || $project->getId() === 'console') {
- return $dbForPlatform;
- }
-
- $pools = $register->get('pools');
-
- 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)) {
- $database
- ->setSharedTables(true)
- ->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', 'register', 'message', 'project', 'dbForPlatform', 'authorization']);
-
-Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $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 {
- 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)) {
- $database
- ->setSharedTables(true)
- ->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)) {
- $database
- ->setSharedTables(true)
- ->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;
- };
-}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
-
-Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
- $database = null;
-
- return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
- 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);
-
- $database
- ->setDatabase(APP_DATABASE)
- ->setAuthorization($authorization)
- ->setSharedTables(true)
- ->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());
- }
-
- return $database;
- };
-}, ['pools', 'cache', 'authorization']);
-
-Server::setResource('getDatabasesDB', function (Cache $cache, Registry $register, Document $project, Authorization $authorization) {
- return function (Document $database, ?Document $projectDocument = null) use ($cache, $register, $project, $authorization): 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', '');
- }
-
- 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');
- $pool = $pools->get($databaseDSN->getHost());
-
- $adapter = new DatabasePool($pool);
- $database = new Database($adapter, $cache);
- $database
- ->setDatabase(APP_DATABASE)
- ->setAuthorization($authorization);
- $database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
-
- $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
- if (\in_array($dsn->getHost(), $sharedTables, true)) {
- $database
- ->setSharedTables(true)
- ->setTenant((int) $projectDocument->getSequence())
- ->setNamespace($dsn->getParam('namespace'));
- } else {
- $database
- ->setSharedTables(false)
- ->setTenant(null)
- ->setNamespace('_' . $projectDocument->getSequence());
- }
-
- $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
- return $database;
- };
-}, ['cache', 'register', 'project', 'authorization']);
-
-Server::setResource('abuseRetention', function () {
- return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
-});
-
-Server::setResource('auditRetention', function (Document $project) {
- if ($project->getId() === 'console') {
- return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
- }
-
- return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
-}, ['project']);
-
-Server::setResource('executionRetention', function () {
- return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
-});
-
-Server::setResource('cache', function (Registry $register) {
- $pools = $register->get('pools');
- $list = Config::getParam('pools-cache', []);
- $adapters = [];
-
- foreach ($list as $value) {
- $adapters[] = new CachePool($pools->get($value));
- }
-
- return new Cache(new Sharding($adapters));
-}, ['register']);
-
-Server::setResource('redis', function () {
- $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
- $port = System::getEnv('_APP_REDIS_PORT', 6379);
- $pass = System::getEnv('_APP_REDIS_PASS', '');
-
- $redis = new \Redis();
- @$redis->pconnect($host, (int) $port);
- if ($pass) {
- $redis->auth($pass);
- }
- $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
-
- return $redis;
-});
-
-Server::setResource('timelimit', function (\Redis $redis) {
- return function (string $key, int $limit, int $time) use ($redis) {
- return new TimeLimitRedis($key, $limit, $time, $redis);
- };
-}, ['redis']);
-
-Server::setResource('log', fn () => new Log());
-
-Server::setResource('publisher', function (Group $pools) {
- return new BrokerPool(publisher: $pools->get('publisher'));
-}, ['pools']);
-
-Server::setResource('publisherDatabases', function (BrokerPool $publisher) {
- return $publisher;
-}, ['publisher']);
-
-Server::setResource('publisherFunctions', function (BrokerPool $publisher) {
- return $publisher;
-}, ['publisher']);
-
-Server::setResource('publisherMigrations', function (BrokerPool $publisher) {
- return $publisher;
-}, ['publisher']);
-
-Server::setResource('publisherMessaging', function (BrokerPool $publisher) {
- return $publisher;
-}, ['publisher']);
-
-Server::setResource('consumer', function (Group $pools) {
+$container->set('consumer', function (Group $pools) {
return new BrokerPool(consumer: $pools->get('consumer'));
}, ['pools']);
-Server::setResource('consumerDatabases', function (BrokerPool $consumer) {
+$container->set('consumerDatabases', function (BrokerPool $consumer) {
return $consumer;
}, ['consumer']);
-Server::setResource('consumerMigrations', function (BrokerPool $consumer) {
+$container->set('consumerMigrations', function (BrokerPool $consumer) {
return $consumer;
}, ['consumer']);
-Server::setResource('consumerStatsUsage', function (BrokerPool $consumer) {
+$container->set('consumerStatsUsage', function (BrokerPool $consumer) {
return $consumer;
}, ['consumer']);
-Server::setResource('usage', function () {
- return new Context();
-}, []);
-Server::setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
- $publisher,
- new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
-), ['publisher']);
-
-Server::setResource('queueForDatabase', function (Publisher $publisher) {
- return new EventDatabase($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForMessaging', function (Publisher $publisher) {
- return new Messaging($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForMails', function (Publisher $publisher) {
- return new Mail($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForBuilds', function (Publisher $publisher) {
- return new Build($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForScreenshots', function (Publisher $publisher) {
- return new Screenshot($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForDeletes', function (Publisher $publisher) {
- return new Delete($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForEvents', function (Publisher $publisher) {
- return new Event($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForAudits', function (Publisher $publisher) {
- return new Audit($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForWebhooks', function (Publisher $publisher) {
- return new Webhook($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForFunctions', function (Publisher $publisher) {
- return new Func($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForRealtime', function () {
- return new Realtime();
-}, []);
-
-Server::setResource('queueForCertificates', function (Publisher $publisher) {
- return new Certificate($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForMigrations', function (Publisher $publisher) {
- return new Migration($publisher);
-}, ['publisher']);
-
-Server::setResource('logger', function (Registry $register) {
- return $register->get('logger');
-}, ['register']);
-
-Server::setResource('pools', function (Registry $register) {
- return $register->get('pools');
-}, ['register']);
-
-Server::setResource('telemetry', fn () => new NoTelemetry());
-
-Server::setResource('deviceForSites', function (Document $project, Telemetry $telemetry) {
- return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-
-Server::setResource('deviceForMigrations', function (Document $project, Telemetry $telemetry) {
- return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-
-Server::setResource('deviceForFunctions', function (Document $project, Telemetry $telemetry) {
- return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-
-Server::setResource('deviceForFiles', function (Document $project, Telemetry $telemetry) {
- return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-
-Server::setResource('deviceForBuilds', function (Document $project, Telemetry $telemetry) {
- return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-
-Server::setResource('deviceForCache', function (Document $project, Telemetry $telemetry) {
- return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId()));
-}, ['project', 'telemetry']);
-
-Server::setResource(
- 'isResourceBlocked',
- fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
-);
-
-Server::setResource('plan', function (array $plan = []) {
- return [];
-});
-
-Server::setResource('certificates', function () {
+$container->set('certificates', function () {
$email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
if (empty($email)) {
throw new Exception('You must set a valid security email address (_APP_EMAIL_CERTIFICATES) to issue a LetsEncrypt SSL certificate.');
}
return new LetsEncrypt($email);
-});
+}, []);
-Server::setResource('logError', function (Registry $register, Document $project) {
- return function (Throwable $error, string $namespace, string $action, ?array $extras = null) use ($register, $project) {
- $logger = $register->get('logger');
-
- if ($logger) {
- $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
-
- $log = new Log();
- $log->setNamespace($namespace);
- $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
- $log->setVersion($version);
- $log->setType(Log::TYPE_ERROR);
- $log->setMessage($error->getMessage());
-
- $log->addTag('code', $error->getCode());
- $log->addTag('verboseType', get_class($error));
- $log->addTag('projectId', $project->getId() ?? '');
-
- $log->addExtra('file', $error->getFile());
- $log->addExtra('line', $error->getLine());
- $log->addExtra('trace', $error->getTraceAsString());
-
- if ($error->getPrevious() !== null) {
- if ($error->getPrevious()->getMessage() != $error->getMessage()) {
- $log->addExtra('previousMessage', $error->getPrevious()->getMessage());
- }
- $log->addExtra('previousFile', $error->getPrevious()->getFile());
- $log->addExtra('previousLine', $error->getPrevious()->getLine());
- }
-
- foreach (($extras ?? []) as $key => $value) {
- $log->addExtra($key, $value);
- }
-
- $log->setAction($action);
-
- $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
- $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
- try {
- $responseCode = $logger->addLog($log);
- Console::info('Error log pushed with status code: ' . $responseCode);
- } catch (Throwable $th) {
- Console::error('Error pushing log: ' . $th->getMessage());
- }
- }
-
- Console::warning("Failed: {$error->getMessage()}");
- Console::warning($error->getTraceAsString());
-
- if ($error->getPrevious() !== null) {
- if ($error->getPrevious()->getMessage() != $error->getMessage()) {
- Console::warning("Previous Failed: {$error->getPrevious()->getMessage()}");
- }
- Console::warning("Previous File: {$error->getPrevious()->getFile()} Line: {$error->getPrevious()->getLine()}");
- }
- };
-}, ['register', 'project']);
-
-Server::setResource('executor', fn () => new Executor());
-
-Server::setResource('getAudit', function (Database $dbForPlatform, callable $getProjectDB) {
- return function (Document $project) use ($dbForPlatform, $getProjectDB) {
- if ($project->isEmpty() || $project->getId() === 'console') {
- $adapter = new AdapterDatabase($dbForPlatform);
-
- return new UtopiaAudit($adapter);
- }
-
- $dbForProject = $getProjectDB($project);
- $adapter = new AdapterDatabase($dbForProject);
-
- return new UtopiaAudit($adapter);
- };
-}, ['dbForPlatform', 'getProjectDB']);
-
-Server::setResource('executionsRetentionCount', function (Document $project, array $plan) {
- if ($project->getId() === 'console' || empty($plan)) {
- return 0;
- }
-
- return (int) ($plan['executionsRetentionCount'] ?? 100);
-}, ['project', 'plan']);
-
-$pools = $register->get('pools');
$platform = new Appwrite();
-$args = $platform->getEnv('argv');
+$args = $_SERVER['argv'] ?? [];
if (! isset($args[1])) {
Console::error('Missing worker name');
@@ -575,38 +79,45 @@ if (\str_starts_with($workerName, 'databases')) {
$queueName = System::getEnv('_APP_QUEUE_NAME', 'v1-' . strtolower($workerName));
}
+/** @var \Utopia\Pools\Group $pools */
+$pools = $container->get('pools');
+
+$adapter = new Swoole(
+ $pools->get('consumer')->pop()->getResource(),
+ System::getEnv('_APP_WORKERS_NUM', 1),
+ $queueName
+);
+
+$worker = new Server($adapter, $container);
+
try {
- /**
- * Any worker can be configured with the following env vars:
- * - _APP_WORKERS_NUM The total number of worker processes
- * - _APP_WORKER_PER_CORE The number of worker processes per core (ignored if _APP_WORKERS_NUM is set)
- * - _APP_QUEUE_NAME The name of the queue to read for database events
- */
+ $worker->init()->action(function () use ($worker, $registerWorkerMessageResources) {
+ $registerWorkerMessageResources($worker->getContainer());
+ });
+
+ $container->set('bus', function ($register) use ($worker) {
+ return $register->get('bus')->setResolver(
+ fn (string $name) => $worker->getContainer()->get($name)
+ );
+ }, ['register']);
+
+ $platform->setWorker($worker);
$platform->init(Service::TYPE_WORKER, [
- 'workersNum' => System::getEnv('_APP_WORKERS_NUM', 1),
- 'connection' => $pools->get('consumer')->pop()->getResource(),
- 'workerName' => strtolower($workerName) ?? null,
- 'queueName' => $queueName,
+ 'workerName' => strtolower($workerName),
]);
} catch (\Throwable $e) {
Console::error($e->getMessage() . ', File: ' . $e->getFile() . ', Line: ' . $e->getLine());
+ Console::exit(1);
}
-$worker = $platform->getWorker();
-
-Server::setResource('bus', function ($register) use ($worker) {
- return $register->get('bus')->setResolver(fn (string $name) => $worker->getResource($name));
-}, ['register']);
-
$worker
->error()
->inject('error')
->inject('logger')
->inject('log')
- ->inject('pools')
->inject('project')
->inject('authorization')
- ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project, Authorization $authorization) use ($queueName) {
+ ->action(function (Throwable $error, ?Logger $logger, Log $log, Document $project, Authorization $authorization) use ($queueName) {
$version = System::getEnv('_APP_VERSION', 'UNKNOWN');
if ($logger) {
diff --git a/composer.json b/composer.json
index 0f4dcfb8db..d3474361e2 100644
--- a/composer.json
+++ b/composer.json
@@ -52,34 +52,34 @@
"appwrite/php-runtimes": "0.19.*",
"appwrite/php-clamav": "2.0.*",
"utopia-php/abuse": "1.2.*",
+ "utopia-php/agents": "1.2.*",
"utopia-php/analytics": "0.15.*",
"utopia-php/audit": "2.2.*",
"utopia-php/auth": "0.5.*",
"utopia-php/cache": "1.0.*",
- "utopia-php/cli": "0.22.*",
+ "utopia-php/cli": "0.23.*",
"utopia-php/compression": "0.1.*",
"utopia-php/config": "1.*",
"utopia-php/console": "0.1.*",
"utopia-php/database": "5.*",
- "utopia-php/agents": "1.*",
"utopia-php/detector": "0.2.*",
"utopia-php/domains": "1.*",
"utopia-php/emails": "0.6.*",
"utopia-php/dns": "1.6.*",
"utopia-php/dsn": "0.2.1",
- "utopia-php/framework": "0.33.*",
+ "utopia-php/framework": "0.34.*",
"utopia-php/fetch": "0.5.*",
"utopia-php/image": "0.8.*",
"utopia-php/locale": "0.8.*",
"utopia-php/logger": "0.6.*",
"utopia-php/messaging": "0.22.*",
"utopia-php/migration": "1.9.*",
- "utopia-php/platform": "0.7.*",
+ "utopia-php/platform": "0.12.*",
"utopia-php/pools": "1.*",
"utopia-php/span": "1.1.*",
"utopia-php/preloader": "0.2.*",
- "utopia-php/queue": "0.15.*",
- "utopia-php/servers": "0.2.5",
+ "utopia-php/queue": "0.17.*",
+ "utopia-php/servers": "0.3.*",
"utopia-php/registry": "0.5.*",
"utopia-php/storage": "1.0.*",
"utopia-php/system": "0.10.*",
@@ -94,8 +94,7 @@
"spomky-labs/otphp": "11.*",
"webonyx/graphql-php": "14.11.*",
"league/csv": "9.14.*",
- "enshrined/svg-sanitize": "0.22.*",
- "utopia-php/di": "0.1.0"
+ "enshrined/svg-sanitize": "0.22.*"
},
"require-dev": {
"ext-fileinfo": "*",
diff --git a/composer.lock b/composer.lock
index 420dddc9a5..d71f78b35d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "4fe91e67f343fbe6deac1fdc7eda949f",
+ "content-hash": "e9c38bbebc60849e70e3640aaa4422cd",
"packages": [
{
"name": "adhocore/jwt",
@@ -3403,16 +3403,16 @@
},
{
"name": "utopia-php/agents",
- "version": "1.3.0",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/agents.git",
- "reference": "06064fd9fb19b77ae45a12ec7bcbc17670912c30"
+ "reference": "052227953678a30ecc4b5467401fcb0b2386471e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/agents/zipball/06064fd9fb19b77ae45a12ec7bcbc17670912c30",
- "reference": "06064fd9fb19b77ae45a12ec7bcbc17670912c30",
+ "url": "https://api.github.com/repos/utopia-php/agents/zipball/052227953678a30ecc4b5467401fcb0b2386471e",
+ "reference": "052227953678a30ecc4b5467401fcb0b2386471e",
"shasum": ""
},
"require": {
@@ -3450,9 +3450,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/agents/issues",
- "source": "https://github.com/utopia-php/agents/tree/1.3.0"
+ "source": "https://github.com/utopia-php/agents/tree/1.2.1"
},
- "time": "2026-03-26T03:51:11+00:00"
+ "time": "2026-02-24T06:03:55+00:00"
},
{
"name": "utopia-php/analytics",
@@ -3658,21 +3658,21 @@
},
{
"name": "utopia-php/cli",
- "version": "0.22.0",
+ "version": "0.23.1",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/cli.git",
- "reference": "a7ac387ee626fd27075a87e836fb72c5be38add4"
+ "reference": "8d1955b8bc4dc631f45d7c7df689ed7b63f70621"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/cli/zipball/a7ac387ee626fd27075a87e836fb72c5be38add4",
- "reference": "a7ac387ee626fd27075a87e836fb72c5be38add4",
+ "url": "https://api.github.com/repos/utopia-php/cli/zipball/8d1955b8bc4dc631f45d7c7df689ed7b63f70621",
+ "reference": "8d1955b8bc4dc631f45d7c7df689ed7b63f70621",
"shasum": ""
},
"require": {
"php": ">=7.4",
- "utopia-php/servers": "0.2.*"
+ "utopia-php/servers": "0.3.*"
},
"require-dev": {
"laravel/pint": "1.2.*",
@@ -3703,9 +3703,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/cli/issues",
- "source": "https://github.com/utopia-php/cli/tree/0.22.0"
+ "source": "https://github.com/utopia-php/cli/tree/0.23.1"
},
- "time": "2025-10-21T10:42:45+00:00"
+ "time": "2026-04-05T15:27:35+00:00"
},
{
"name": "utopia-php/compression",
@@ -3954,25 +3954,26 @@
},
{
"name": "utopia-php/di",
- "version": "0.1.0",
+ "version": "0.3.2",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/di.git",
- "reference": "22490c95f7ac3898ed1c33f1b1b5dd577305ee31"
+ "reference": "07025d721ed5d9be27932e8e640acf1467fc4b9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/di/zipball/22490c95f7ac3898ed1c33f1b1b5dd577305ee31",
- "reference": "22490c95f7ac3898ed1c33f1b1b5dd577305ee31",
+ "url": "https://api.github.com/repos/utopia-php/di/zipball/07025d721ed5d9be27932e8e640acf1467fc4b9d",
+ "reference": "07025d721ed5d9be27932e8e640acf1467fc4b9d",
"shasum": ""
},
"require": {
- "php": ">=8.2"
+ "php": ">=8.2",
+ "psr/container": "^2.0"
},
"require-dev": {
- "laravel/pint": "^1.2",
+ "laravel/pint": "^1.27",
"phpbench/phpbench": "^1.2",
- "phpstan/phpstan": "^1.10",
+ "phpstan/phpstan": "^2.1",
"phpunit/phpunit": "^9.5.25",
"swoole/ide-helper": "4.8.3"
},
@@ -3989,16 +3990,18 @@
],
"description": "A simple and lite library for managing dependency injections",
"keywords": [
- "framework",
- "http",
+ "PSR-11",
+ "container",
+ "dependency-injection",
+ "di",
"php",
- "upf"
+ "utopia"
],
"support": {
"issues": "https://github.com/utopia-php/di/issues",
- "source": "https://github.com/utopia-php/di/tree/0.1.0"
+ "source": "https://github.com/utopia-php/di/tree/0.3.2"
},
- "time": "2024-08-08T14:35:19+00:00"
+ "time": "2026-03-21T07:42:10+00:00"
},
{
"name": "utopia-php/dns",
@@ -4268,30 +4271,34 @@
},
{
"name": "utopia-php/framework",
- "version": "0.33.41",
+ "version": "0.34.17",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/http.git",
- "reference": "0f3bf2377c867e547c929c3733b8224afee6ef06"
+ "reference": "d3e4143b8b06d9823d0c29a06dacefa5a1b93677"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/http/zipball/0f3bf2377c867e547c929c3733b8224afee6ef06",
- "reference": "0f3bf2377c867e547c929c3733b8224afee6ef06",
+ "url": "https://api.github.com/repos/utopia-php/http/zipball/d3e4143b8b06d9823d0c29a06dacefa5a1b93677",
+ "reference": "d3e4143b8b06d9823d0c29a06dacefa5a1b93677",
"shasum": ""
},
"require": {
- "php": ">=8.3",
+ "ext-swoole": "*",
+ "php": ">=8.2",
"utopia-php/compression": "0.1.*",
+ "utopia-php/di": "0.3.*",
+ "utopia-php/servers": "0.3.*",
"utopia-php/telemetry": "0.2.*",
"utopia-php/validators": "0.2.*"
},
"require-dev": {
+ "doctrine/instantiator": "^1.5",
"laravel/pint": "1.*",
- "phpbench/phpbench": "1.*",
+ "phpbench/phpbench": "^1.2",
"phpstan/phpstan": "1.*",
- "phpunit/phpunit": "9.*",
- "swoole/ide-helper": "^6.0"
+ "phpunit/phpunit": "^9.5.25",
+ "swoole/ide-helper": "4.8.3"
},
"type": "library",
"autoload": {
@@ -4303,17 +4310,72 @@
"license": [
"MIT"
],
- "description": "A simple, light and advanced PHP framework",
+ "description": "A simple, light and advanced PHP HTTP framework",
"keywords": [
"framework",
+ "http",
"php",
"upf"
],
"support": {
"issues": "https://github.com/utopia-php/http/issues",
- "source": "https://github.com/utopia-php/http/tree/0.33.41"
+ "source": "https://github.com/utopia-php/http/tree/0.34.17"
},
- "time": "2026-02-24T12:01:28+00:00"
+ "time": "2026-04-06T04:40:23+00:00"
+ },
+ {
+ "name": "utopia-php/http",
+ "version": "0.34.16",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/utopia-php/http.git",
+ "reference": "2b4021ba3f9d476264ce9fd6703d6c79de9add7f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/utopia-php/http/zipball/2b4021ba3f9d476264ce9fd6703d6c79de9add7f",
+ "reference": "2b4021ba3f9d476264ce9fd6703d6c79de9add7f",
+ "shasum": ""
+ },
+ "require": {
+ "ext-swoole": "*",
+ "php": ">=8.2",
+ "utopia-php/compression": "0.1.*",
+ "utopia-php/di": "0.3.*",
+ "utopia-php/servers": "0.3.*",
+ "utopia-php/telemetry": "0.2.*",
+ "utopia-php/validators": "0.2.*"
+ },
+ "require-dev": {
+ "doctrine/instantiator": "^1.5",
+ "laravel/pint": "1.*",
+ "phpbench/phpbench": "^1.2",
+ "phpstan/phpstan": "1.*",
+ "phpunit/phpunit": "^9.5.25",
+ "swoole/ide-helper": "4.8.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Utopia\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "A simple, light and advanced PHP HTTP framework",
+ "keywords": [
+ "framework",
+ "http",
+ "php",
+ "upf"
+ ],
+ "support": {
+ "issues": "https://github.com/utopia-php/http/issues",
+ "source": "https://github.com/utopia-php/http/tree/0.34.16"
+ },
+ "time": "2026-03-20T10:39:07+00:00"
},
{
"name": "utopia-php/image",
@@ -4634,30 +4696,30 @@
},
{
"name": "utopia-php/platform",
- "version": "0.7.16",
+ "version": "0.12.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/platform.git",
- "reference": "34e67e4b80b5741c380071fe765fbc12a132de4f"
+ "reference": "068ee46228f0c3972e6b569f2c86b6c80fe583d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/platform/zipball/34e67e4b80b5741c380071fe765fbc12a132de4f",
- "reference": "34e67e4b80b5741c380071fe765fbc12a132de4f",
+ "url": "https://api.github.com/repos/utopia-php/platform/zipball/068ee46228f0c3972e6b569f2c86b6c80fe583d8",
+ "reference": "068ee46228f0c3972e6b569f2c86b6c80fe583d8",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-redis": "*",
- "php": ">=8.0",
- "utopia-php/cli": "0.22.*",
- "utopia-php/framework": "0.33.*",
- "utopia-php/queue": "0.15.*"
+ "php": ">=8.1",
+ "utopia-php/cli": "0.23.*",
+ "utopia-php/http": "0.34.*",
+ "utopia-php/queue": "0.17.*",
+ "utopia-php/servers": "0.3.*"
},
"require-dev": {
- "laravel/pint": "1.*",
- "phpstan/phpstan": "2.*",
- "phpunit/phpunit": "9.*"
+ "laravel/pint": "1.2.*",
+ "phpunit/phpunit": "^9.3"
},
"type": "library",
"autoload": {
@@ -4679,9 +4741,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/platform/issues",
- "source": "https://github.com/utopia-php/platform/tree/0.7.16"
+ "source": "https://github.com/utopia-php/platform/tree/0.12.0"
},
- "time": "2026-02-11T06:36:48+00:00"
+ "time": "2026-03-31T14:44:23+00:00"
},
{
"name": "utopia-php/pools",
@@ -4791,32 +4853,33 @@
},
{
"name": "utopia-php/queue",
- "version": "0.15.6",
+ "version": "0.17.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/queue.git",
- "reference": "08e361d69610f371382b344c369eef355ca414b4"
+ "reference": "0fbc7d7312f5cf76ec112513fb93317000901f5f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/queue/zipball/08e361d69610f371382b344c369eef355ca414b4",
- "reference": "08e361d69610f371382b344c369eef355ca414b4",
+ "url": "https://api.github.com/repos/utopia-php/queue/zipball/0fbc7d7312f5cf76ec112513fb93317000901f5f",
+ "reference": "0fbc7d7312f5cf76ec112513fb93317000901f5f",
"shasum": ""
},
"require": {
"php": ">=8.3",
"php-amqplib/php-amqplib": "^3.7",
+ "utopia-php/di": "0.3.*",
"utopia-php/fetch": "0.5.*",
"utopia-php/pools": "1.*",
- "utopia-php/servers": "0.2.*",
+ "utopia-php/servers": "0.3.*",
"utopia-php/telemetry": "0.2.*",
"utopia-php/validators": "0.2.*"
},
"require-dev": {
"ext-redis": "*",
- "laravel/pint": "^0.2.3",
+ "laravel/pint": "^1.0",
"phpstan/phpstan": "^1.8",
- "phpunit/phpunit": "^9.5.5",
+ "phpunit/phpunit": "^11.0",
"swoole/ide-helper": "4.8.8",
"workerman/workerman": "^4.0"
},
@@ -4851,9 +4914,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/queue/issues",
- "source": "https://github.com/utopia-php/queue/tree/0.15.6"
+ "source": "https://github.com/utopia-php/queue/tree/0.17.0"
},
- "time": "2026-02-23T13:03:51+00:00"
+ "time": "2026-03-23T16:21:31+00:00"
},
{
"name": "utopia-php/registry",
@@ -4909,21 +4972,21 @@
},
{
"name": "utopia-php/servers",
- "version": "0.2.5",
+ "version": "0.3.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/servers.git",
- "reference": "4770e879a90685af4ba14e7e5d95d0a17c7fdf03"
+ "reference": "235be31200df9437fc96a1c270ffef4c64fafe52"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/servers/zipball/4770e879a90685af4ba14e7e5d95d0a17c7fdf03",
- "reference": "4770e879a90685af4ba14e7e5d95d0a17c7fdf03",
+ "url": "https://api.github.com/repos/utopia-php/servers/zipball/235be31200df9437fc96a1c270ffef4c64fafe52",
+ "reference": "235be31200df9437fc96a1c270ffef4c64fafe52",
"shasum": ""
},
"require": {
- "php": ">=8.0",
- "utopia-php/di": "0.1.*",
+ "php": ">=8.2",
+ "utopia-php/di": "0.3.*",
"utopia-php/validators": "0.*"
},
"require-dev": {
@@ -4957,9 +5020,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/servers/issues",
- "source": "https://github.com/utopia-php/servers/tree/0.2.5"
+ "source": "https://github.com/utopia-php/servers/tree/0.3.0"
},
- "time": "2026-02-10T04:21:53+00:00"
+ "time": "2026-03-13T11:31:42+00:00"
},
{
"name": "utopia-php/span",
diff --git a/docs/references/migrations/migration-json-export.md b/docs/references/migrations/migration-json-export.md
new file mode 100644
index 0000000000..8a955c5990
--- /dev/null
+++ b/docs/references/migrations/migration-json-export.md
@@ -0,0 +1 @@
+Export documents to a JSON file from your Appwrite database. This endpoint allows you to export documents to a JSON file stored in a secure internal bucket. You'll receive an email with a download link when the export is complete.
diff --git a/docs/references/migrations/migration-json-import.md b/docs/references/migrations/migration-json-import.md
new file mode 100644
index 0000000000..2eeeaf5619
--- /dev/null
+++ b/docs/references/migrations/migration-json-import.md
@@ -0,0 +1 @@
+Import documents from a JSON file into your Appwrite database. This endpoint allows you to import documents from a JSON file uploaded to Appwrite Storage bucket.
diff --git a/src/Appwrite/Auth/OAuth2/Yahoo.php b/src/Appwrite/Auth/OAuth2/Yahoo.php
index c70a2fb6c9..1a6c6b860d 100644
--- a/src/Appwrite/Auth/OAuth2/Yahoo.php
+++ b/src/Appwrite/Auth/OAuth2/Yahoo.php
@@ -23,8 +23,9 @@ class Yahoo extends OAuth2
* @var array
*/
protected array $scopes = [
- 'sdct-r',
- 'sdpp-w',
+ 'openid',
+ 'profile',
+ 'email',
];
/**
diff --git a/src/Appwrite/Extend/Exception.php b/src/Appwrite/Extend/Exception.php
index f7c76d3800..c015d2fdcb 100644
--- a/src/Appwrite/Extend/Exception.php
+++ b/src/Appwrite/Extend/Exception.php
@@ -82,6 +82,9 @@ class Exception extends \Exception
public const string USER_PASSWORD_RECENTLY_USED = 'password_recently_used';
public const string USER_PASSWORD_PERSONAL_DATA = 'password_personal_data';
public const string USER_EMAIL_ALREADY_EXISTS = 'user_email_already_exists';
+ public const string USER_EMAIL_DISPOSABLE = 'user_email_disposable';
+ public const string USER_EMAIL_FREE = 'user_email_free';
+ public const string USER_EMAIL_NOT_CANONICAL = 'user_email_not_canonical';
public const string USER_PASSWORD_MISMATCH = 'user_password_mismatch';
public const string USER_SESSION_NOT_FOUND = 'user_session_not_found';
public const string USER_IDENTITY_NOT_FOUND = 'user_identity_not_found';
diff --git a/src/Appwrite/GraphQL/Resolvers.php b/src/Appwrite/GraphQL/Resolvers.php
index e422bcbf96..689724d9f1 100644
--- a/src/Appwrite/GraphQL/Resolvers.php
+++ b/src/Appwrite/GraphQL/Resolvers.php
@@ -26,9 +26,9 @@ class Resolvers
): callable {
return static fn ($type, $args, $context, $info) => new Swoole(
function (callable $resolve, callable $reject) use ($utopia, $route, $args) {
- $utopia = $utopia->getResource('utopia:graphql', true);
- $request = $utopia->getResource('request', true);
- $response = $utopia->getResource('response', true);
+ $utopia = $utopia->getResource('utopia:graphql');
+ $request = $utopia->getResource('request');
+ $response = $utopia->getResource('response');
$path = $route->getPath();
foreach ($args as $key => $value) {
@@ -93,9 +93,9 @@ class Resolvers
): callable {
return static fn ($type, $args, $context, $info) => new Swoole(
function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
- $utopia = $utopia->getResource('utopia:graphql', true);
- $request = $utopia->getResource('request', true);
- $response = $utopia->getResource('response', true);
+ $utopia = $utopia->getResource('utopia:graphql');
+ $request = $utopia->getResource('request');
+ $response = $utopia->getResource('response');
$request->setMethod('GET');
$request->setURI($url($databaseId, $collectionId, $args));
@@ -124,9 +124,9 @@ class Resolvers
): callable {
return static fn ($type, $args, $context, $info) => new Swoole(
function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
- $utopia = $utopia->getResource('utopia:graphql', true);
- $request = $utopia->getResource('request', true);
- $response = $utopia->getResource('response', true);
+ $utopia = $utopia->getResource('utopia:graphql');
+ $request = $utopia->getResource('request');
+ $response = $utopia->getResource('response');
$request->setMethod('GET');
$request->setURI($url($databaseId, $collectionId, $args));
@@ -160,9 +160,9 @@ class Resolvers
): callable {
return static fn ($type, $args, $context, $info) => new Swoole(
function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
- $utopia = $utopia->getResource('utopia:graphql', true);
- $request = $utopia->getResource('request', true);
- $response = $utopia->getResource('response', true);
+ $utopia = $utopia->getResource('utopia:graphql');
+ $request = $utopia->getResource('request');
+ $response = $utopia->getResource('response');
$request->setMethod('POST');
$request->setURI($url($databaseId, $collectionId, $args));
@@ -192,9 +192,9 @@ class Resolvers
): callable {
return static fn ($type, $args, $context, $info) => new Swoole(
function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
- $utopia = $utopia->getResource('utopia:graphql', true);
- $request = $utopia->getResource('request', true);
- $response = $utopia->getResource('response', true);
+ $utopia = $utopia->getResource('utopia:graphql');
+ $request = $utopia->getResource('request');
+ $response = $utopia->getResource('response');
$request->setMethod('PATCH');
$request->setURI($url($databaseId, $collectionId, $args));
@@ -222,9 +222,9 @@ class Resolvers
): callable {
return static fn ($type, $args, $context, $info) => new Swoole(
function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
- $utopia = $utopia->getResource('utopia:graphql', true);
- $request = $utopia->getResource('request', true);
- $response = $utopia->getResource('response', true);
+ $utopia = $utopia->getResource('utopia:graphql');
+ $request = $utopia->getResource('request');
+ $response = $utopia->getResource('response');
$request->setMethod('DELETE');
$request->setURI($url($databaseId, $collectionId, $args));
@@ -266,7 +266,7 @@ class Resolvers
try {
$route = $utopia->match($request, fresh: true);
- $utopia->execute($route, $request, $response);
+ $utopia->execute($route, $request);
} catch (\Throwable $e) {
if ($beforeReject) {
$e = $beforeReject($e);
diff --git a/src/Appwrite/GraphQL/Schema.php b/src/Appwrite/GraphQL/Schema.php
index aa68fd28a1..4ff96fb635 100644
--- a/src/Appwrite/GraphQL/Schema.php
+++ b/src/Appwrite/GraphQL/Schema.php
@@ -32,10 +32,6 @@ class Schema
array $urls,
array $params,
): GQLSchema {
- Http::setResource('utopia:graphql', static function () use ($utopia) {
- return $utopia;
- });
-
if (!empty(self::$schema)) {
return self::$schema;
}
diff --git a/src/Appwrite/Platform/Installer/Server.php b/src/Appwrite/Platform/Installer/Server.php
index 6d9cd5412f..99ec9e65d2 100644
--- a/src/Appwrite/Platform/Installer/Server.php
+++ b/src/Appwrite/Platform/Installer/Server.php
@@ -145,9 +145,20 @@ class Server
$paths = $this->paths;
$state = $this->state;
- Http::setResource('installerState', fn () => $state);
- Http::setResource('installerConfig', fn () => $config);
- Http::setResource('installerPaths', fn () => $paths);
+ $adapter = new class ($host, $port, ['worker_num' => 1]) extends SwooleAdapter {
+ public function getNativeServer(): SwooleServer
+ {
+ return $this->server;
+ }
+ };
+
+ $nativeServer = $adapter->getNativeServer();
+
+ $container = $adapter->getContainer();
+ $container->set('installerState', fn () => $state);
+ $container->set('installerConfig', fn () => $config);
+ $container->set('installerPaths', fn () => $paths);
+ $container->set('swooleServer', fn () => $nativeServer);
// Register routes via Utopia Platform
$platform = new Installer();
@@ -160,17 +171,6 @@ class Server
->inject('response')
->action($errorHandler->action(...));
- $adapter = new class ($host, $port, ['worker_num' => 1]) extends SwooleAdapter {
- public function getNativeServer(): SwooleServer
- {
- return $this->server;
- }
- };
-
- $nativeServer = $adapter->getNativeServer();
-
- Http::setResource('swooleServer', fn () => $nativeServer);
-
$nativeServer->on('start', function () use ($nativeServer, $port, $readyFile) {
\Swoole\Process::signal(SIGTERM, fn () => $nativeServer->shutdown());
\Swoole\Process::signal(SIGINT, fn () => $nativeServer->shutdown());
@@ -180,7 +180,7 @@ class Server
}
});
- $adapter->onRequest(function (Request $request, Response $response) use ($files) {
+ $adapter->onRequest(function (Request $request, Response $response) use ($adapter, $files) {
// Serve static files from memory
$uri = $request->getURI();
if ($files->isFileLoaded($uri)) {
@@ -190,7 +190,7 @@ class Server
return;
}
- $app = new Http('UTC');
+ $app = new Http($adapter, 'UTC');
$app->run($request, $response);
});
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
index 0c8c6a8520..c4d51e6c64 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
@@ -182,19 +182,33 @@ class Update extends Action
$dbForDatabases = $getDatabasesDB($databaseDoc);
try {
- $dbForDatabases->withTransaction(function () use ($dbForDatabases, $dbForProject, $transactionState, $queueForDeletes, $transactionId, &$transaction, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $authorization) {
- $authorization->skip(fn () => $dbForProject->updateDocument('transactions', $transactionId, new Document([
- 'status' => 'committing',
- ])));
+ $transaction = $authorization->skip(fn () => $dbForProject->updateDocument(
+ 'transactions',
+ $transactionId,
+ new Document(['status' => 'committing'])
+ ));
- $operations = $authorization->skip(fn () => $dbForProject->find('transactionLogs', [
- Query::equal('transactionInternalId', [$transaction->getSequence()]),
- Query::orderAsc(),
- Query::limit(PHP_INT_MAX),
- ]));
+ $operations = $authorization->skip(fn () => $dbForProject->find('transactionLogs', [
+ Query::equal('transactionInternalId', [$transaction->getSequence()]),
+ Query::orderAsc(),
+ Query::limit(PHP_INT_MAX),
+ ]));
+ $collections = [];
+ foreach ($operations as $operation) {
+ $databaseInternalId = $operation['databaseInternalId'];
+ $collectionInternalId = $operation['collectionInternalId'];
+ $collectionId = "database_{$databaseInternalId}_collection_{$collectionInternalId}";
+
+ if (!isset($collections[$collectionId])) {
+ $collections[$collectionId] = $authorization->skip(
+ fn () => $dbForProject->getCollection($collectionId)
+ );
+ }
+ }
+
+ $dbForDatabases->withTransaction(function () use ($dbForDatabases, $transactionState, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $collections) {
$state = [];
- $collections = [];
foreach ($operations as $operation) {
$databaseInternalId = $operation['databaseInternalId'];
@@ -210,11 +224,6 @@ class Update extends Action
$data = $data->getArrayCopy();
}
- if (!isset($collections[$collectionId])) {
- $collections[$collectionId] = $authorization->skip(
- fn () => $dbForProject->getCollection($collectionId)
- );
- }
$collection = $collections[$collectionId];
if (\is_array($data) && !empty($data)) {
@@ -276,16 +285,17 @@ class Update extends Action
}
}
- $transaction = $authorization->skip(fn () => $dbForProject->updateDocument(
- 'transactions',
- $transactionId,
- new Document(['status' => 'committed'])
- ));
-
- $queueForDeletes
- ->setType(DELETE_TYPE_DOCUMENT)
- ->setDocument($transaction);
});
+
+ $transaction = $authorization->skip(fn () => $dbForProject->updateDocument(
+ 'transactions',
+ $transactionId,
+ new Document(['status' => 'committed'])
+ ));
+
+ $queueForDeletes
+ ->setType(DELETE_TYPE_DOCUMENT)
+ ->setDocument($transaction);
} catch (NotFoundException $e) {
$authorization->skip(fn () => $dbForProject->updateDocument('transactions', $transactionId, new Document([
'status' => 'failed',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
index a7e2d68eac..58433c7deb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php
@@ -130,10 +130,25 @@ class Create extends CollectionAction
$indexes[] = new Document($index);
}
try {
- if (!$dbForDatabases->exists(null, Database::METADATA)) {
+ // Bootstrap the database metadata without a separate existence
+ // check to avoid races when multiple first collections are created
+ // concurrently for the same VectorsDB database.
+ for ($attempt = 0; $attempt < 5; $attempt++) {
try {
$dbForDatabases->create();
+ break;
} catch (DuplicateException) {
+ break;
+ } catch (\Throwable $e) {
+ if ($dbForDatabases->exists(null, Database::METADATA)) {
+ break;
+ }
+
+ if ($attempt === 4) {
+ throw $e;
+ }
+
+ \usleep(100_000);
}
}
$dbForDatabases->createCollection(
diff --git a/src/Appwrite/Platform/Modules/Projects/Http/Projects/Labels/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/Labels/Update.php
similarity index 60%
rename from src/Appwrite/Platform/Modules/Projects/Http/Projects/Labels/Update.php
rename to src/Appwrite/Platform/Modules/Project/Http/Project/Labels/Update.php
index de11bb0091..24d1c48cf1 100644
--- a/src/Appwrite/Platform/Modules/Projects/Http/Projects/Labels/Update.php
+++ b/src/Appwrite/Platform/Modules/Project/Http/Project/Labels/Update.php
@@ -1,20 +1,15 @@
setHttpMethod(Action::HTTP_REQUEST_METHOD_PUT)
- ->setHttpPath('/v1/projects/:projectId/labels')
+ ->setHttpPath('/v1/project/labels')
+ ->httpAlias('/v1/projects/:projectId/labels')
->desc('Update project labels')
- ->groups(['api', 'projects'])
- ->label('scope', 'projects.write')
+ ->groups(['api', 'project'])
+ ->label('scope', 'project.write')
+ ->label('event', 'labels.*.update')
+ ->label('audits.event', 'project.labels.update')
+ ->label('audits.resource', 'project.labels/{response.$id}')
->label('sdk', new Method(
- namespace: 'projects',
- group: 'projects',
+ namespace: 'project',
+ group: null,
name: 'updateLabels',
description: <<param('projectId', '', new UID(), 'Project unique ID.')
->param('labels', [], new ArrayList(new Text(36, allowList: [...Text::NUMBERS, ...Text::ALPHABET_UPPER, ...Text::ALPHABET_LOWER]), APP_LIMIT_ARRAY_LABELS_SIZE), 'Array of project labels. Replaces the previous labels. Maximum of ' . APP_LIMIT_ARRAY_LABELS_SIZE . ' labels are allowed, each up to 36 alphanumeric characters long.')
->inject('response')
->inject('dbForPlatform')
+ ->inject('project')
->callback($this->action(...));
}
@@ -67,17 +60,11 @@ class Update extends Action
* @param array $labels
*/
public function action(
- string $projectId,
array $labels,
Response $response,
- Database $dbForPlatform
+ Database $dbForPlatform,
+ Document $project
): void {
- $project = $dbForPlatform->getDocument('projects', $projectId);
-
- if ($project->isEmpty()) {
- throw new Exception(Exception::PROJECT_NOT_FOUND);
- }
-
$labels = (array) \array_values(\array_unique($labels));
$project = $dbForPlatform->updateDocument('projects', $project->getId(), new Document(['labels' => $labels]));
diff --git a/src/Appwrite/Platform/Modules/Project/Services/Http.php b/src/Appwrite/Platform/Modules/Project/Services/Http.php
index 949fb2bcd9..4970403032 100644
--- a/src/Appwrite/Platform/Modules/Project/Services/Http.php
+++ b/src/Appwrite/Platform/Modules/Project/Services/Http.php
@@ -3,6 +3,7 @@
namespace Appwrite\Platform\Modules\Project\Services;
use Appwrite\Platform\Modules\Project\Http\Init;
+use Appwrite\Platform\Modules\Project\Http\Project\Labels\Update as UpdateProjectLabels;
use Appwrite\Platform\Modules\Project\Http\Project\Variables\Create as CreateVariable;
use Appwrite\Platform\Modules\Project\Http\Project\Variables\Delete as DeleteVariable;
use Appwrite\Platform\Modules\Project\Http\Project\Variables\Get as GetVariable;
@@ -25,5 +26,7 @@ class Http extends Service
$this->addAction(GetVariable::getName(), new GetVariable());
$this->addAction(DeleteVariable::getName(), new DeleteVariable());
$this->addAction(UpdateVariable::getName(), new UpdateVariable());
+
+ $this->addAction(UpdateProjectLabels::getName(), new UpdateProjectLabels());
}
}
diff --git a/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php b/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
index eb71e5a02f..9070962e7d 100644
--- a/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
+++ b/src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php
@@ -114,6 +114,9 @@ class Create extends Action
'passwordDictionary' => false,
'duration' => TOKEN_EXPIRATION_LOGIN_LONG,
'personalDataCheck' => false,
+ 'disposableEmails' => false,
+ 'canonicalEmails' => false,
+ 'freeEmails' => false,
'mockNumbers' => [],
'sessionAlerts' => false,
'membershipsUserName' => false,
diff --git a/src/Appwrite/Platform/Modules/Projects/Services/Http.php b/src/Appwrite/Platform/Modules/Projects/Services/Http.php
index 8b0d6f87c8..8275e664d5 100644
--- a/src/Appwrite/Platform/Modules/Projects/Services/Http.php
+++ b/src/Appwrite/Platform/Modules/Projects/Services/Http.php
@@ -8,7 +8,6 @@ use Appwrite\Platform\Modules\Projects\Http\DevKeys\Get as GetDevKey;
use Appwrite\Platform\Modules\Projects\Http\DevKeys\Update as UpdateDevKey;
use Appwrite\Platform\Modules\Projects\Http\DevKeys\XList as ListDevKeys;
use Appwrite\Platform\Modules\Projects\Http\Projects\Create as CreateProject;
-use Appwrite\Platform\Modules\Projects\Http\Projects\Labels\Update as UpdateProjectLabels;
use Appwrite\Platform\Modules\Projects\Http\Projects\Team\Update as UpdateProjectTeam;
use Appwrite\Platform\Modules\Projects\Http\Projects\Update as UpdateProject;
use Appwrite\Platform\Modules\Projects\Http\Projects\XList as ListProjects;
@@ -31,7 +30,6 @@ class Http extends Service
$this->addAction(CreateProject::getName(), new CreateProject());
$this->addAction(UpdateProject::getName(), new UpdateProject());
$this->addAction(ListProjects::getName(), new ListProjects());
- $this->addAction(UpdateProjectLabels::getName(), new UpdateProjectLabels());
$this->addAction(UpdateProjectTeam::getName(), new UpdateProjectTeam());
$this->addAction(CreateSchedule::getName(), new CreateSchedule());
diff --git a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
index f863729263..5edc69f445 100644
--- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
+++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
@@ -17,7 +17,6 @@ use Appwrite\Utopia\Database\Documents\User;
use Appwrite\Utopia\Response;
use libphonenumber\NumberParseException;
use libphonenumber\PhoneNumberUtil;
-use Throwable;
use Utopia\Auth\Proofs\Password;
use Utopia\Auth\Proofs\Token;
use Utopia\Database\Database;
@@ -169,14 +168,41 @@ class Create extends Action
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
+ $emailMetadata = [
+ 'emailCanonical' => null,
+ 'emailIsCanonical' => null,
+ 'emailIsCorporate' => null,
+ 'emailIsDisposable' => null,
+ 'emailIsFree' => null,
+ ];
+
try {
- $userId = ID::unique();
- $hash = $proofForPassword->hash($proofForPassword->generate());
- $emailCanonical = new Email($email);
- } catch (Throwable) {
- $emailCanonical = null;
+ $parsedEmail = new Email($email);
+ $canonical = $parsedEmail->getCanonical();
+ $emailMetadata = [
+ 'emailCanonical' => $canonical,
+ 'emailIsCanonical' => $parsedEmail->get() === $canonical,
+ 'emailIsCorporate' => $parsedEmail->isCorporate(),
+ 'emailIsDisposable' => $parsedEmail->isDisposable(),
+ 'emailIsFree' => $parsedEmail->isFree(),
+ ];
+ } catch (\Throwable) {
}
+ if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
+ }
+
+ if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+ throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
+ }
+
+ if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+ throw new Exception(Exception::USER_EMAIL_FREE);
+ }
+
+ $hash = $proofForPassword->hash($proofForPassword->generate());
+
$userId = ID::unique();
$userDocument = new Document([
@@ -209,11 +235,11 @@ class Create extends Action
'tokens' => null,
'memberships' => null,
'search' => implode(' ', [$userId, $email, $name]),
- 'emailCanonical' => $emailCanonical?->getCanonical(),
- 'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
- 'emailIsCorporate' => $emailCanonical?->isCorporate(),
- 'emailIsDisposable' => $emailCanonical?->isDisposable(),
- 'emailIsFree' => $emailCanonical?->isFree(),
+ 'emailCanonical' => $emailMetadata['emailCanonical'],
+ 'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+ 'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+ 'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+ 'emailIsFree' => $emailMetadata['emailIsFree'],
]);
try {
diff --git a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php
index 46b6c3cacf..28bfa769ee 100644
--- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php
+++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php
@@ -74,10 +74,12 @@ class Update extends Action
->inject('queueForEvents')
->inject('store')
->inject('proofForToken')
+ ->inject('domainVerification')
+ ->inject('cookieDomain')
->callback($this->action(...));
}
- public function action(string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Authorization $authorization, $project, Reader $geodb, Event $queueForEvents, Store $store, Token $proofForToken)
+ public function action(string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Authorization $authorization, $project, Reader $geodb, Event $queueForEvents, Store $store, Token $proofForToken, bool $domainVerification, ?string $cookieDomain)
{
$protocol = $request->getProtocol();
@@ -162,7 +164,7 @@ class Update extends Action
->setProperty('secret', $secret)
->encode();
- if (!Config::getParam('domainVerification')) {
+ if (!$domainVerification) {
$response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
}
@@ -172,7 +174,7 @@ class Update extends Action
value: $encoded,
expire: (new \DateTime($expire))->getTimestamp(),
path: '/',
- domain: Config::getParam('cookieDomain'),
+ domain: $cookieDomain,
secure: ('https' === $protocol),
httponly: true
)
@@ -181,7 +183,7 @@ class Update extends Action
value: $encoded,
expire: (new \DateTime($expire))->getTimestamp(),
path: '/',
- domain: Config::getParam('cookieDomain'),
+ domain: $cookieDomain,
secure: ('https' === $protocol),
httponly: true,
sameSite: Config::getParam('cookieSamesite')
diff --git a/src/Appwrite/Platform/Tasks/Migrate.php b/src/Appwrite/Platform/Tasks/Migrate.php
index b952808998..6f9f92435a 100644
--- a/src/Appwrite/Platform/Tasks/Migrate.php
+++ b/src/Appwrite/Platform/Tasks/Migrate.php
@@ -9,7 +9,6 @@ use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception;
use Utopia\Database\Validator\Authorization;
-use Utopia\Http\Http;
use Utopia\Platform\Action;
use Utopia\Registry\Registry;
use Utopia\Validator\Text;
@@ -32,6 +31,7 @@ class Migrate extends Action
->inject('getProjectDB')
->inject('register')
->inject('authorization')
+ ->inject('console')
->callback($this->action(...));
}
@@ -48,7 +48,8 @@ class Migrate extends Action
Database $dbForPlatform,
callable $getProjectDB,
Registry $register,
- Authorization $authorization
+ Authorization $authorization,
+ Document $console
): void {
if (!\array_key_exists($version, Migration::$versions)) {
@@ -125,8 +126,6 @@ class Migrate extends Action
Console::log('Migrated ' . ++$count . '/' . $total . ' projects...');
});
- $console = (new Http('UTC'))->getResource('console');
-
try {
$migration
->setProject($console, $getProjectDB($console), $dbForPlatform, $authorization, $getProjectDB);
diff --git a/src/Appwrite/Platform/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php
index a6a5284fb0..ebc4f6731a 100644
--- a/src/Appwrite/Platform/Tasks/Specs.php
+++ b/src/Appwrite/Platform/Tasks/Specs.php
@@ -2,6 +2,7 @@
namespace Appwrite\Platform\Tasks;
+use Appwrite\Network\Validator\Redirect;
use Appwrite\SDK\AuthType;
use Appwrite\SDK\Method;
use Appwrite\SDK\Specification\Format\OpenAPI3;
@@ -18,6 +19,9 @@ use Utopia\Config\Config;
use Utopia\Console;
use Utopia\Database\Adapter\MySQL;
use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\DI\Container;
+use Utopia\Http\Adapter\FPM\Server as FPMServer;
use Utopia\Http\Http;
use Utopia\Http\Request as UtopiaRequest;
use Utopia\Http\Response as UtopiaResponse;
@@ -336,11 +340,17 @@ class Specs extends Action
$mocks = ($mode === 'mocks');
- // Mock dependencies
- Http::setResource('request', fn () => $this->getRequest());
- Http::setResource('response', fn () => $response);
- Http::setResource('dbForPlatform', fn () => new Database(new MySQL(''), new Cache(new None())));
- Http::setResource('dbForProject', fn () => new Database(new MySQL(''), new Cache(new None())));
+ // Mock dependencies needed by param validator injections in route definitions
+ $specsContainer = new Container();
+ $specsContainer->set('request', fn () => $this->getRequest());
+ $specsContainer->set('response', fn () => $response);
+ $specsContainer->set('dbForPlatform', fn () => new Database(new MySQL(''), new Cache(new None())));
+ $specsContainer->set('dbForProject', fn () => new Database(new MySQL(''), new Cache(new None())));
+ $specsContainer->set('redirectValidator', fn () => new Redirect([], []));
+ $specsContainer->set('project', fn () => new Document([]));
+ $specsContainer->set('passwordsDictionary', fn () => []);
+ $specsContainer->set('localeCodes', fn () => \array_map(fn ($locale) => $locale['code'], Config::getParam('locale-codes', [])));
+ $specsContainer->set('plan', fn () => []);
$platforms = static::getPlatforms();
$authCounts = $this->getAuthCounts();
@@ -438,7 +448,7 @@ class Specs extends Action
}
$arguments = [
- new Http('UTC'),
+ new Http(new FPMServer($specsContainer), 'UTC'),
$services,
$routes,
$models,
diff --git a/src/Appwrite/Promises/Swoole.php b/src/Appwrite/Promises/Swoole.php
index c258ef6a5e..9c06fbda2f 100644
--- a/src/Appwrite/Promises/Swoole.php
+++ b/src/Appwrite/Promises/Swoole.php
@@ -2,10 +2,14 @@
namespace Appwrite\Promises;
+use Swoole\Coroutine;
use Swoole\Coroutine\Channel;
+use Utopia\DI\Container;
class Swoole extends Promise
{
+ private const REQUEST_CONTAINER_CONTEXT_KEY = '__utopia_http_request_container';
+
public function __construct(?callable $executor = null)
{
parent::__construct($executor);
@@ -16,7 +20,14 @@ class Swoole extends Promise
callable $resolve,
callable $reject
): void {
- \go(function () use ($executor, $resolve, $reject) {
+ $parentContainer = (Coroutine::getCid() !== -1)
+ ? (Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY] ?? null)
+ : null;
+
+ \go(function () use ($executor, $resolve, $reject, $parentContainer) {
+ if ($parentContainer !== null) {
+ Coroutine::getContext()[self::REQUEST_CONTAINER_CONTEXT_KEY] = new Container($parentContainer);
+ }
try {
$executor($resolve, $reject);
} catch (\Throwable $exception) {
diff --git a/src/Appwrite/SDK/Specification/Format.php b/src/Appwrite/SDK/Specification/Format.php
index 7a867c5b91..dd4d378345 100644
--- a/src/Appwrite/SDK/Specification/Format.php
+++ b/src/Appwrite/SDK/Specification/Format.php
@@ -210,6 +210,25 @@ abstract class Format
return $this->services;
}
+ protected function getDescriptionContents(?string $description): string
+ {
+ if ($description === null || $description === '') {
+ return '';
+ }
+
+ if (!\str_ends_with($description, '.md')) {
+ return $description;
+ }
+
+ $contents = @\file_get_contents($description);
+
+ if ($contents === false) {
+ throw new \RuntimeException('Documentation file not found or unreadable: ' . $description);
+ }
+
+ return $contents;
+ }
+
protected function getRequestEnumName(string $service, string $method, string $param): ?string
{
/* `$service` is `$namespace` */
diff --git a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
index 753a0dc52f..88f577eac6 100644
--- a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
@@ -125,10 +125,7 @@ class OpenAPI3 extends Format
$namespace = $sdk->getNamespace() ?? 'default';
- if ($desc === null) {
- $desc = '';
- }
- $descContents = \str_ends_with($desc, '.md') ? \file_get_contents($desc) : $desc;
+ $descContents = $this->getDescriptionContents($desc);
$temp = [
'summary' => $route->getDesc(),
@@ -193,7 +190,7 @@ class OpenAPI3 extends Format
'parameters' => [],
'required' => [],
'responses' => [],
- 'description' => ($desc) ? \file_get_contents($desc) : '',
+ 'description' => $this->getDescriptionContents($desc),
'demo' => \strtolower($namespace) . '/' . Template::fromCamelCaseToDash($methodObj->getMethodName()) . '.md',
'public' => $methodObj->isPublic(),
];
diff --git a/src/Appwrite/SDK/Specification/Format/Swagger2.php b/src/Appwrite/SDK/Specification/Format/Swagger2.php
index 3e9ac891fa..f9c79431f0 100644
--- a/src/Appwrite/SDK/Specification/Format/Swagger2.php
+++ b/src/Appwrite/SDK/Specification/Format/Swagger2.php
@@ -126,10 +126,7 @@ class Swagger2 extends Format
$sdkPlatforms = array_values(array_unique($sdkPlatforms));
$namespace = $sdk->getNamespace() ?? 'default';
- if ($desc === null) {
- $desc = '';
- }
- $descContents = \str_ends_with($desc, '.md') ? \file_get_contents($desc) : $desc;
+ $descContents = $this->getDescriptionContents($desc);
$temp = [
'summary' => $route->getDesc(),
@@ -201,7 +198,7 @@ class Swagger2 extends Format
'parameters' => [],
'required' => [],
'responses' => [],
- 'description' => ($desc) ? \file_get_contents($desc) : '',
+ 'description' => $this->getDescriptionContents($desc),
'demo' => \strtolower($namespace) . '/' . Template::fromCamelCaseToDash($methodObj->getMethodName()) . '.md',
'public' => $methodObj->isPublic(),
];
diff --git a/src/Appwrite/Utopia/Request.php b/src/Appwrite/Utopia/Request.php
index 9428ff9d88..ed602ecdd5 100644
--- a/src/Appwrite/Utopia/Request.php
+++ b/src/Appwrite/Utopia/Request.php
@@ -17,7 +17,7 @@ class Request extends UtopiaRequest
* @var array
*/
private array $filters = [];
- private static ?Route $route = null;
+ private ?Route $route = null;
public function __construct(SwooleRequest $request)
{
@@ -34,11 +34,11 @@ class Request extends UtopiaRequest
{
$parameters = parent::getParams();
- if (!$this->hasFilters() || !self::hasRoute()) {
+ if (!$this->hasFilters() || !$this->hasRoute()) {
return $parameters;
}
- $methods = self::getRoute()->getLabel('sdk', null);
+ $methods = $this->getRoute()?->getLabel('sdk', null);
if (empty($methods)) {
return $parameters;
@@ -131,9 +131,9 @@ class Request extends UtopiaRequest
*
* @return void
*/
- public static function setRoute(?Route $route): void
+ public function setRoute(?Route $route): void
{
- self::$route = $route;
+ $this->route = $route;
}
/**
@@ -141,9 +141,9 @@ class Request extends UtopiaRequest
*
* @return Route|null
*/
- public static function getRoute(): ?Route
+ public function getRoute(): ?Route
{
- return self::$route;
+ return $this->route;
}
/**
@@ -151,9 +151,9 @@ class Request extends UtopiaRequest
*
* @return bool
*/
- public static function hasRoute(): bool
+ public function hasRoute(): bool
{
- return self::$route !== null;
+ return $this->route !== null;
}
/**
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index e01dc58bf6..9d0e8abefa 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -299,7 +299,7 @@ class Response extends SwooleResponse
/**
* @var bool
*/
- protected static bool $showSensitive = false;
+ protected bool $showSensitive = false;
/**
* @var array
@@ -509,7 +509,7 @@ class Response extends SwooleResponse
$isPrivilegedUser = $user->isPrivileged($roles);
$isAppUser = $user->isApp($roles);
- if ((!$isPrivilegedUser && !$isAppUser) && !self::$showSensitive) {
+ if ((!$isPrivilegedUser && !$isAppUser) && !$this->showSensitive) {
$data->setAttribute($key, '');
}
}
@@ -659,18 +659,20 @@ class Response extends SwooleResponse
}
/**
- * Static wrapper to show sensitive data in response
+ * Wrapper to show sensitive data in response
*
* @param callable(): array $callback The callback to show sensitive information for
* @return array
*/
- public static function showSensitive(callable $callback): array
+ public function showSensitive(callable $callback): array
{
+ $previous = $this->showSensitive;
+
try {
- self::$showSensitive = true;
+ $this->showSensitive = true;
return $callback();
} finally {
- self::$showSensitive = false;
+ $this->showSensitive = $previous;
}
}
diff --git a/src/Appwrite/Utopia/Response/Model/Project.php b/src/Appwrite/Utopia/Response/Model/Project.php
index cd33a29685..5902902e9e 100644
--- a/src/Appwrite/Utopia/Response/Model/Project.php
+++ b/src/Appwrite/Utopia/Response/Model/Project.php
@@ -137,6 +137,24 @@ class Project extends Model
'default' => false,
'example' => true,
])
+ ->addRule('authDisposableEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to disallow disposable email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
+ ->addRule('authCanonicalEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to require canonical email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
+ ->addRule('authFreeEmails', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to disallow free email addresses during signup and email updates.',
+ 'default' => false,
+ 'example' => true,
+ ])
->addRule('authMockNumbers', [
'type' => Response::MODEL_MOCK_NUMBER,
'description' => 'An array of mock numbers and their corresponding verification codes (OTPs).',
@@ -415,6 +433,9 @@ class Project extends Model
$document->setAttribute('authPasswordHistory', $authValues['passwordHistory'] ?? 0);
$document->setAttribute('authPasswordDictionary', $authValues['passwordDictionary'] ?? false);
$document->setAttribute('authPersonalDataCheck', $authValues['personalDataCheck'] ?? false);
+ $document->setAttribute('authDisposableEmails', $authValues['disposableEmails'] ?? false);
+ $document->setAttribute('authCanonicalEmails', $authValues['canonicalEmails'] ?? false);
+ $document->setAttribute('authFreeEmails', $authValues['freeEmails'] ?? false);
$document->setAttribute('authMockNumbers', $authValues['mockNumbers'] ?? []);
$document->setAttribute('authSessionAlerts', $authValues['sessionAlerts'] ?? false);
$document->setAttribute('authMembershipsUserName', $authValues['membershipsUserName'] ?? true);
diff --git a/tests/e2e/General/UsageTest.php b/tests/e2e/General/UsageTest.php
index eea53d9ea8..f6eb963967 100644
--- a/tests/e2e/General/UsageTest.php
+++ b/tests/e2e/General/UsageTest.php
@@ -1324,8 +1324,8 @@ class UsageTest extends Scope
$this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
$this->validateDates($response['body']['requests']);
// vectordbTotal should reflect only VectorsDB instances, not relational databases.
- $this->assertEquals($vectordbTotal, $response['body']['vectordbDatabasesTotal']);
- $this->assertEquals($documentsTotal, $response['body']['vectordbDocumentsTotal']);
+ $this->assertEquals($vectordbTotal, $response['body']['vectorsdbDatabasesTotal']);
+ $this->assertEquals($documentsTotal, $response['body']['vectorsdbDocumentsTotal']);
});
$response = $this->client->call(
diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php
index af426d5221..42976cda84 100644
--- a/tests/e2e/Services/Functions/FunctionsBase.php
+++ b/tests/e2e/Services/Functions/FunctionsBase.php
@@ -100,6 +100,24 @@ trait FunctionsBase
'x-appwrite-key' => $this->getProject()['apiKey'],
]));
$this->assertNotEquals(401, $function['headers']['status-code'], 'Auth failed while polling function activation');
+
+ if (
+ ($function['body']['deploymentId'] ?? '') !== $deploymentId
+ && ($function['body']['latestDeploymentId'] ?? '') === $deploymentId
+ && ($function['body']['latestDeploymentStatus'] ?? '') === 'ready'
+ ) {
+ $activation = $this->updateFunctionDeployment($functionId, $deploymentId);
+ $this->assertContains(
+ $activation['headers']['status-code'],
+ [200, 409],
+ 'Deployment activation request failed: ' . json_encode($activation['body'], JSON_PRETTY_PRINT)
+ );
+
+ if ($activation['headers']['status-code'] === 200) {
+ $function = $activation;
+ }
+ }
+
$this->assertEquals($deploymentId, $function['body']['deploymentId'] ?? '', 'Deployment is not activated, deployment: ' . json_encode($function['body'], JSON_PRETTY_PRINT));
}, 120000, 500);
}
diff --git a/tests/e2e/Services/Project/LabelsBase.php b/tests/e2e/Services/Project/LabelsBase.php
new file mode 100644
index 0000000000..2b7074ef46
--- /dev/null
+++ b/tests/e2e/Services/Project/LabelsBase.php
@@ -0,0 +1,224 @@
+updateLabels(['frontend', 'backend']);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertIsArray($response['body']['labels']);
+ $this->assertCount(2, $response['body']['labels']);
+ $this->assertContains('frontend', $response['body']['labels']);
+ $this->assertContains('backend', $response['body']['labels']);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ public function testUpdateLabelsReplace(): void
+ {
+ $response = $this->updateLabels(['alpha', 'beta']);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertCount(2, $response['body']['labels']);
+ $this->assertContains('alpha', $response['body']['labels']);
+ $this->assertContains('beta', $response['body']['labels']);
+
+ // Replace with new labels
+ $response = $this->updateLabels(['gamma', 'delta', 'epsilon']);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertCount(3, $response['body']['labels']);
+ $this->assertContains('gamma', $response['body']['labels']);
+ $this->assertContains('delta', $response['body']['labels']);
+ $this->assertContains('epsilon', $response['body']['labels']);
+ $this->assertNotContains('alpha', $response['body']['labels']);
+ $this->assertNotContains('beta', $response['body']['labels']);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ public function testUpdateLabelsEmpty(): void
+ {
+ // Set some labels first
+ $response = $this->updateLabels(['toRemove']);
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertCount(1, $response['body']['labels']);
+
+ // Clear all labels
+ $response = $this->updateLabels([]);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertIsArray($response['body']['labels']);
+ $this->assertCount(0, $response['body']['labels']);
+ }
+
+ public function testUpdateLabelsDeduplicated(): void
+ {
+ $response = $this->updateLabels(['duplicate', 'duplicate', 'unique']);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertCount(2, $response['body']['labels']);
+ $this->assertContains('duplicate', $response['body']['labels']);
+ $this->assertContains('unique', $response['body']['labels']);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ public function testUpdateLabelsSingleLabel(): void
+ {
+ $response = $this->updateLabels(['solo']);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertCount(1, $response['body']['labels']);
+ $this->assertContains('solo', $response['body']['labels']);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ public function testUpdateLabelsWithoutAuthentication(): void
+ {
+ $response = $this->updateLabels(['unauthorized'], false);
+
+ $this->assertSame(401, $response['headers']['status-code']);
+ }
+
+ public function testUpdateLabelsInvalidLabelTooLong(): void
+ {
+ $response = $this->updateLabels([str_repeat('a', 37)]);
+
+ $this->assertSame(400, $response['headers']['status-code']);
+ }
+
+ public function testUpdateLabelsInvalidLabelCharacters(): void
+ {
+ $response = $this->updateLabels(['invalid-label!']);
+
+ $this->assertSame(400, $response['headers']['status-code']);
+ }
+
+ public function testUpdateLabelsAlphanumericOnly(): void
+ {
+ $response = $this->updateLabels(['ABC123', 'lowercase', 'UPPERCASE', '0123456789']);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertCount(4, $response['body']['labels']);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ public function testUpdateLabelsMaxLength(): void
+ {
+ $label = str_repeat('a', 36);
+ $response = $this->updateLabels([$label]);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertCount(1, $response['body']['labels']);
+ $this->assertContains($label, $response['body']['labels']);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ public function testUpdateLabelsIdempotent(): void
+ {
+ $labels = ['stable', 'production'];
+
+ $first = $this->updateLabels($labels);
+ $this->assertSame(200, $first['headers']['status-code']);
+
+ $second = $this->updateLabels($labels);
+ $this->assertSame(200, $second['headers']['status-code']);
+
+ $this->assertSame($first['body']['labels'], $second['body']['labels']);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ public function testUpdateLabelsDeduplicatedOrder(): void
+ {
+ $response = $this->updateLabels(['b', 'a', 'b']);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertCount(2, $response['body']['labels']);
+ $this->assertSame('b', $response['body']['labels'][0]);
+ $this->assertSame('a', $response['body']['labels'][1]);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ public function testUpdateLabelsInvalidHyphen(): void
+ {
+ $response = $this->updateLabels(['my-label']);
+
+ $this->assertSame(400, $response['headers']['status-code']);
+ }
+
+ public function testUpdateLabelsInvalidUnderscore(): void
+ {
+ $response = $this->updateLabels(['my_label']);
+
+ $this->assertSame(400, $response['headers']['status-code']);
+ }
+
+ public function testUpdateLabelsInvalidSpace(): void
+ {
+ $response = $this->updateLabels(['my label']);
+
+ $this->assertSame(400, $response['headers']['status-code']);
+ }
+
+ public function testUpdateLabelsInvalidEmptyString(): void
+ {
+ $response = $this->updateLabels(['']);
+
+ $this->assertSame(400, $response['headers']['status-code']);
+ }
+
+ public function testUpdateLabelsResponseModel(): void
+ {
+ $response = $this->updateLabels(['test']);
+
+ $this->assertSame(200, $response['headers']['status-code']);
+ $this->assertArrayHasKey('$id', $response['body']);
+ $this->assertArrayHasKey('name', $response['body']);
+ $this->assertArrayHasKey('labels', $response['body']);
+ $this->assertIsArray($response['body']['labels']);
+ $this->assertContains('test', $response['body']['labels']);
+
+ // Cleanup
+ $this->updateLabels([]);
+ }
+
+ // Helpers
+
+ /**
+ * @param array $labels
+ */
+ protected function updateLabels(array $labels, bool $authenticated = true): mixed
+ {
+ $headers = [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ];
+
+ if ($authenticated) {
+ $headers = array_merge($headers, $this->getHeaders());
+ }
+
+ return $this->client->call(\Tests\E2E\Client::METHOD_PUT, '/project/labels', $headers, [
+ 'labels' => $labels,
+ ]);
+ }
+}
diff --git a/tests/e2e/Services/Project/LabelsConsoleClientTest.php b/tests/e2e/Services/Project/LabelsConsoleClientTest.php
new file mode 100644
index 0000000000..dd724338d6
--- /dev/null
+++ b/tests/e2e/Services/Project/LabelsConsoleClientTest.php
@@ -0,0 +1,14 @@
+assertArrayHasKey('platforms', $response['body']);
$this->assertArrayHasKey('webhooks', $response['body']);
$this->assertArrayHasKey('keys', $response['body']);
+ $this->assertEquals(false, $response['body']['authDisposableEmails']);
+ $this->assertEquals(false, $response['body']['authCanonicalEmails']);
+ $this->assertEquals(false, $response['body']['authFreeEmails']);
$response = $this->client->call(Client::METHOD_POST, '/projects', array_merge([
'content-type' => 'application/json',
diff --git a/tests/unit/Event/MockPublisher.php b/tests/unit/Event/MockPublisher.php
index a7118d3c09..8363ed4e85 100644
--- a/tests/unit/Event/MockPublisher.php
+++ b/tests/unit/Event/MockPublisher.php
@@ -9,7 +9,7 @@ class MockPublisher implements Publisher
{
private array $events = [];
- public function enqueue(Queue $queue, array $payload): bool
+ public function enqueue(Queue $queue, array $payload, bool $priority = false): bool
{
if (!isset($this->events[$queue->name])) {
$this->events[$queue->name] = [];
diff --git a/tests/unit/Utopia/RequestTest.php b/tests/unit/Utopia/RequestTest.php
index 78a3717c38..d5cd5d800a 100644
--- a/tests/unit/Utopia/RequestTest.php
+++ b/tests/unit/Utopia/RequestTest.php
@@ -147,6 +147,21 @@ class RequestTest extends TestCase
$this->assertSame('unexpected', $params['extra']);
}
+ public function testRouteIsScopedToRequestInstance(): void
+ {
+ $firstRequest = new Request(new SwooleRequest());
+ $secondRequest = new Request(new SwooleRequest());
+
+ $firstRoute = new Route(Request::METHOD_GET, '/first');
+ $secondRoute = new Route(Request::METHOD_GET, '/second');
+
+ $firstRequest->setRoute($firstRoute);
+ $secondRequest->setRoute($secondRoute);
+
+ $this->assertSame($firstRoute, $firstRequest->getRoute());
+ $this->assertSame($secondRoute, $secondRequest->getRoute());
+ }
+
/**
* Helper to attach a route with multiple SDK methods to the request.
*/
diff --git a/tests/unit/Utopia/ResponseTest.php b/tests/unit/Utopia/ResponseTest.php
index 452119fafb..be8cfdc216 100644
--- a/tests/unit/Utopia/ResponseTest.php
+++ b/tests/unit/Utopia/ResponseTest.php
@@ -5,6 +5,7 @@ namespace Tests\Unit\Utopia;
use Appwrite\Utopia\Response;
use Exception;
use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
use Swoole\Http\Response as SwooleResponse;
use Tests\Unit\Utopia\Response\Filters\First;
use Tests\Unit\Utopia\Response\Filters\Second;
@@ -176,4 +177,26 @@ class ResponseTest extends TestCase
$this->assertArrayHasKey('required', $single);
$this->assertArrayNotHasKey('hidden', $singleFromArray);
}
+
+ public function testShowSensitiveRestoresPreviousState(): void
+ {
+ $isShowingSensitive = new ReflectionProperty(Response::class, 'showSensitive');
+
+ $this->assertFalse($isShowingSensitive->getValue($this->response));
+
+ $payload = $this->response->showSensitive(function () use ($isShowingSensitive) {
+ return [
+ 'outer' => $isShowingSensitive->getValue($this->response),
+ 'inner' => $this->response->showSensitive(fn () => [
+ 'state' => $isShowingSensitive->getValue($this->response),
+ ]),
+ 'afterInner' => $isShowingSensitive->getValue($this->response),
+ ];
+ });
+
+ $this->assertTrue($payload['outer']);
+ $this->assertTrue($payload['inner']['state']);
+ $this->assertTrue($payload['afterInner']);
+ $this->assertFalse($isShowingSensitive->getValue($this->response));
+ }
}