From 80d81867e9392be126bce3a5dd6c18a9c8242f5d Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 22 Jun 2026 11:53:00 +0530 Subject: [PATCH 01/21] fix: use sparse Document when updating user emailVerification on membership confirm --- .../Platform/Modules/Teams/Http/Memberships/Status/Update.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 28bfa769ee..f305ca8216 100644 --- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php +++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php @@ -125,7 +125,8 @@ class Update extends Action ->setAttribute('confirm', true) ; - $authorization->skip(fn () => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true))); + $user->setAttribute('emailVerification', true); + $authorization->skip(fn () => $dbForProject->updateDocument('users', $user->getId(), new Document(['emailVerification' => true]))); // Create session for the user if not logged in if (!$hasSession) { From d74f4040c88f1bafb2fa60022941de02fb4807f7 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 22 Jun 2026 12:17:43 +0530 Subject: [PATCH 02/21] fix: store impersonator context as dedicated DI resource instead of user attributes --- app/controllers/shared/api.php | 12 +++++++----- app/init/realtime/connection.php | 14 ++++++-------- app/init/resources/request.php | 13 +++++-------- src/Appwrite/Event/Context/Audit.php | 2 ++ src/Appwrite/Event/Message/Audit.php | 4 ++++ src/Appwrite/Platform/Workers/Audits.php | 19 +++++++------------ 6 files changed, 31 insertions(+), 33 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 4b5f7170ff..bc79bfcfe9 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -99,7 +99,8 @@ Http::init() ->inject('team') ->inject('apiKey') ->inject('authorization') - ->action(function (Route $route, Request $request, Database $dbForPlatform, Database $dbForProject, AuditContext $auditContext, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) { + ->inject('impersonatorUser') + ->action(function (Route $route, Request $request, Database $dbForPlatform, Database $dbForProject, AuditContext $auditContext, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization, Document $impersonatorUser) { /** * Handle user authentication and session validation. @@ -353,7 +354,7 @@ Http::init() !$user->isEmpty() && ( $user->getAttribute('impersonator', false) - || $user->getAttribute('impersonatorUserId') + || !$impersonatorUser->isEmpty() ) ) { $scopes[] = 'users.read'; @@ -391,11 +392,10 @@ Http::init() } if (! empty($user->getId())) { - $impersonatorUserId = $user->getAttribute('impersonatorUserId'); $accessedAt = $user->getAttribute('accessedAt', 0); // Skip updating accessedAt for impersonated requests so we don't attribute activity to the target user. - if (! $impersonatorUserId && DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) { + if ($impersonatorUser->isEmpty() && DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) { $user->setAttribute('accessedAt', DateTime::now()); if ($project->getId() !== 'console' && $mode !== APP_MODE_ADMIN) { @@ -566,7 +566,8 @@ Http::init() ->inject('platform') ->inject('authorization') ->inject('cacheControlForStorage') - ->action(function (Route $route, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Context $usage, FunctionPublisher $publisherForFunctions, Database $dbForProject, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage) { + ->inject('impersonatorUser') + ->action(function (Route $route, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Context $usage, FunctionPublisher $publisherForFunctions, Database $dbForProject, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage, Document $impersonatorUser) { $response->setUser($user); $request->setUser($user); @@ -596,6 +597,7 @@ Http::init() $auditContext->hostname = $request->getHostname(); $auditContext->event = $route->getLabel('audits.event', ''); $auditContext->project = $project; + $auditContext->impersonatorUser = $impersonatorUser->isEmpty() ? null : $impersonatorUser; /* If a session exists, use the user associated with the session */ if (! $user->isEmpty()) { diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index 397d077aa7..bd47dd4458 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -209,7 +209,9 @@ return function (Container $container): void { return new Origin(\array_unique($allowedHostnames), \array_unique($allowedSchemes)); }, ['platform', 'request', 'project', 'servers', 'authorization']); - $container->set('user', function (Request $request, Document $project, Document $console, Authorization $authorization) use ($getMode, $getDbForPlatform, $getDbForProject) { + $container->set('impersonatorUser', fn () => new Document(), []); + + $container->set('user', function (Request $request, Document $project, Document $console, Authorization $authorization, Document $impersonatorUser) use ($getMode, $getDbForPlatform, $getDbForProject) { $mode = $getMode($request, $project); $store = new Store(); $proofForToken = new Token(); @@ -350,13 +352,9 @@ return function (Container $container): void { } if ($targetUser !== null && !$targetUser->isEmpty()) { - $impersonator = clone $user; + $impersonatorUser->setAttributes((clone $user)->getArrayCopy()); $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)); + $user->setAttribute('impersonatorUserId', $impersonatorUser->getId()); } } @@ -364,5 +362,5 @@ return function (Container $container): void { $dbForProject->setMetadata('user', $user->getId()); return $user; - }, ['request', 'project', 'console', 'authorization']); + }, ['request', 'project', 'console', 'authorization', 'impersonatorUser']); }; diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 958f1a211a..6378451a55 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -110,6 +110,7 @@ return function (Container $context): void { $context->set('queueForRealtime', fn () => new Realtime(), []); $context->set('usage', fn () => new UsageContext(), []); $context->set('auditContext', fn () => new AuditContext(), []); + $context->set('impersonatorUser', fn () => new Document(), []); $context->set('publisherForFunctions', fn (Publisher $publisher) => new FunctionPublisher( $publisher, new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL) @@ -350,7 +351,7 @@ return function (Container $context): void { ['devKey', 'allowedHostnames', 'allowedSchemes'] ); - $context->set('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken, $authorization) { + $context->set('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken, $authorization, Document $impersonatorUser) { /** * Handles user authentication and session validation. * @@ -505,13 +506,9 @@ return function (Container $context): void { $targetUser = $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); } if ($targetUser !== null && !$targetUser->isEmpty()) { - $impersonator = clone $user; + $impersonatorUser->setAttributes((clone $user)->getArrayCopy()); $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)); + $user->setAttribute('impersonatorUserId', $impersonatorUser->getId()); } } @@ -519,7 +516,7 @@ return function (Container $context): void { $dbForPlatform->setMetadata('user', $user->getId()); return $user; - }, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken', 'authorization']); + }, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken', 'authorization', 'impersonatorUser']); $context->set('project', function ($dbForPlatform, $request, $console, $authorization, Http $utopia) { /** @var Appwrite\Utopia\Request $request */ diff --git a/src/Appwrite/Event/Context/Audit.php b/src/Appwrite/Event/Context/Audit.php index 1d41890476..cb2eab2a1a 100644 --- a/src/Appwrite/Event/Context/Audit.php +++ b/src/Appwrite/Event/Context/Audit.php @@ -9,6 +9,7 @@ class Audit public function __construct( public ?Document $project = null, public ?Document $user = null, + public ?Document $impersonatorUser = null, public string $mode = '', public string $userAgent = '', public string $ip = '', @@ -23,6 +24,7 @@ class Audit { return $this->project === null && $this->user === null + && $this->impersonatorUser === null && $this->mode === '' && $this->userAgent === '' && $this->ip === '' diff --git a/src/Appwrite/Event/Message/Audit.php b/src/Appwrite/Event/Message/Audit.php index ae5831c3b9..20cac964cb 100644 --- a/src/Appwrite/Event/Message/Audit.php +++ b/src/Appwrite/Event/Message/Audit.php @@ -12,6 +12,7 @@ final class Audit extends Base public readonly array $payload, public readonly Document $project = new Document(), public readonly Document $user = new Document(), + public readonly Document $impersonatorUser = new Document(), public readonly string $resource = '', public readonly string $mode = '', public readonly string $ip = '', @@ -29,6 +30,7 @@ final class Audit extends Base 'database' => $this->project->getAttribute('database', ''), ], 'user' => $this->user->getArrayCopy(), + 'impersonatorUser' => $this->impersonatorUser->getArrayCopy(), 'payload' => $this->payload, 'resource' => $this->resource, 'mode' => $this->mode, @@ -46,6 +48,7 @@ final class Audit extends Base payload: $data['payload'] ?? [], project: new Document($data['project'] ?? []), user: new Document($data['user'] ?? []), + impersonatorUser: new Document($data['impersonatorUser'] ?? []), resource: $data['resource'] ?? '', mode: $data['mode'] ?? '', ip: $data['ip'] ?? '', @@ -61,6 +64,7 @@ final class Audit extends Base payload: $context->payload, project: $context->project ?? new Document(), user: $context->user ?? new Document(), + impersonatorUser: $context->impersonatorUser ?? new Document(), resource: $context->resource, mode: $context->mode, ip: $context->ip, diff --git a/src/Appwrite/Platform/Workers/Audits.php b/src/Appwrite/Platform/Workers/Audits.php index 6c45aa63f3..211ecc3924 100644 --- a/src/Appwrite/Platform/Workers/Audits.php +++ b/src/Appwrite/Platform/Workers/Audits.php @@ -74,18 +74,13 @@ class Audits extends Action $userAgent = $auditMessage->userAgent; $ip = $auditMessage->ip; $user = $auditMessage->user; + $impersonatorUser = $auditMessage->impersonatorUser; - $impersonatorUserId = $user->getAttribute('impersonatorUserId'); - $actorUserId = $impersonatorUserId ?: $user->getId(); - $actorUserInternalId = $impersonatorUserId - ? $user->getAttribute('impersonatorUserInternalId') - : $user->getSequence(); - $actorUserName = $impersonatorUserId - ? $user->getAttribute('impersonatorUserName', '') - : $user->getAttribute('name', ''); - $actorUserEmail = $impersonatorUserId - ? $user->getAttribute('impersonatorUserEmail', '') - : $user->getAttribute('email', ''); + $isImpersonated = !$impersonatorUser->isEmpty(); + $actorUserId = $isImpersonated ? $impersonatorUser->getId() : $user->getId(); + $actorUserInternalId = $isImpersonated ? $impersonatorUser->getSequence() : $user->getSequence(); + $actorUserName = $isImpersonated ? $impersonatorUser->getAttribute('name', '') : $user->getAttribute('name', ''); + $actorUserEmail = $isImpersonated ? $impersonatorUser->getAttribute('email', '') : $user->getAttribute('email', ''); $userType = $user->getAttribute('type', ACTOR_TYPE_USER); // Create event data @@ -106,7 +101,7 @@ class Audits extends Action 'time' => date("Y-m-d H:i:s", $message->getTimestamp()), ]; - if (!empty($impersonatorUserId)) { + if ($isImpersonated) { $eventData['data']['data'] = \is_array($auditPayload) ? \array_merge($auditPayload, [ 'impersonatedUserId' => $user->getId(), From 00b3f31ab48be6c3f20c7bef476275a1ca7f351a Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 22 Jun 2026 12:39:00 +0530 Subject: [PATCH 03/21] fix: remove impersonatorUserId from user document, inject via response layer only --- app/controllers/shared/api.php | 1 + app/init/realtime/connection.php | 1 - app/init/resources/request.php | 1 - src/Appwrite/Utopia/Response.php | 19 +++++++++++++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index bc79bfcfe9..c63c353297 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -570,6 +570,7 @@ Http::init() ->action(function (Route $route, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Context $usage, FunctionPublisher $publisherForFunctions, Database $dbForProject, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage, Document $impersonatorUser) { $response->setUser($user); + $response->setImpersonatorUser($impersonatorUser); $request->setUser($user); $path = $route->getPath(); diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index bd47dd4458..4cdb4cdec1 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -354,7 +354,6 @@ return function (Container $container): void { if ($targetUser !== null && !$targetUser->isEmpty()) { $impersonatorUser->setAttributes((clone $user)->getArrayCopy()); $user = clone $targetUser; - $user->setAttribute('impersonatorUserId', $impersonatorUser->getId()); } } diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 6378451a55..b30b07eb7d 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -508,7 +508,6 @@ return function (Container $context): void { if ($targetUser !== null && !$targetUser->isEmpty()) { $impersonatorUser->setAttributes((clone $user)->getArrayCopy()); $user = clone $targetUser; - $user->setAttribute('impersonatorUserId', $impersonatorUser->getId()); } } diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php index d6b57990a4..e5991531e8 100644 --- a/src/Appwrite/Utopia/Response.php +++ b/src/Appwrite/Utopia/Response.php @@ -471,6 +471,14 @@ class Response extends SwooleResponse */ public function dynamic(Document $document, string $model): void { + if ( + $this->impersonatorUser !== null + && ($model === self::MODEL_ACCOUNT || $model === self::MODEL_USER) + ) { + $document = clone $document; + $document->setAttribute('impersonatorUserId', $this->impersonatorUser->getId()); + } + $output = $this->output(clone $document, $model); $output = $this->applyFilters($output, $model, raw: clone $document); @@ -775,6 +783,7 @@ class Response extends SwooleResponse private ?Authorization $authorization = null; private ?DBUser $user = null; + private ?Document $impersonatorUser = null; public function setAuthorization(Authorization $authorization): void { @@ -785,4 +794,14 @@ class Response extends SwooleResponse { $this->user = $user; } + + public function setImpersonatorUser(Document $impersonatorUser): void + { + $this->impersonatorUser = $impersonatorUser->isEmpty() ? null : $impersonatorUser; + } + + public function getImpersonatorUser(): ?Document + { + return $this->impersonatorUser; + } } From 822d280b23562fee75d64f76a86bad2566076ebe Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 22 Jun 2026 12:40:52 +0530 Subject: [PATCH 04/21] fix: set impersonatorUserId model default to null to match previous behaviour --- src/Appwrite/Utopia/Response/Model/Account.php | 2 +- src/Appwrite/Utopia/Response/Model/User.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Appwrite/Utopia/Response/Model/Account.php b/src/Appwrite/Utopia/Response/Model/Account.php index fb03bdb155..769284d714 100644 --- a/src/Appwrite/Utopia/Response/Model/Account.php +++ b/src/Appwrite/Utopia/Response/Model/Account.php @@ -155,7 +155,7 @@ class Account extends Model 'type' => self::TYPE_STRING, 'description' => 'ID of the original actor performing the impersonation. Present only when the current request is impersonating another user. Internal audit logs attribute the action to this user, while the impersonated target is recorded only in internal audit payload data.', 'required' => false, - 'default' => '', + 'default' => null, 'example' => '5e5ea5c16897e', ]) ; diff --git a/src/Appwrite/Utopia/Response/Model/User.php b/src/Appwrite/Utopia/Response/Model/User.php index f255519bfd..da1f7fe5fc 100644 --- a/src/Appwrite/Utopia/Response/Model/User.php +++ b/src/Appwrite/Utopia/Response/Model/User.php @@ -185,7 +185,7 @@ class User extends Model 'type' => self::TYPE_STRING, 'description' => 'ID of the original actor performing the impersonation. Present only when the current request is impersonating another user. Internal audit logs attribute the action to this user, while the impersonated target is recorded only in internal audit payload data.', 'required' => false, - 'default' => '', + 'default' => null, 'example' => '5e5ea5c16897e', ]) ; From 25646661726dc3466d6be5ba15b494a35fe2019d Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 22 Jun 2026 12:54:48 +0530 Subject: [PATCH 05/21] fix: sparse impersonator payload, legacy audit fallback, realtime attribution --- app/init/realtime/connection.php | 7 ++++++- app/init/resources/request.php | 7 ++++++- app/realtime.php | 4 ++++ src/Appwrite/Platform/Workers/Audits.php | 20 +++++++++++++++----- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index 4cdb4cdec1..25f1c73252 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -352,7 +352,12 @@ return function (Container $container): void { } if ($targetUser !== null && !$targetUser->isEmpty()) { - $impersonatorUser->setAttributes((clone $user)->getArrayCopy()); + $impersonatorUser->setAttributes([ + '$id' => $user->getId(), + '$sequence' => $user->getSequence(), + 'name' => $user->getAttribute('name', ''), + 'email' => $user->getAttribute('email', ''), + ]); $user = clone $targetUser; } } diff --git a/app/init/resources/request.php b/app/init/resources/request.php index b30b07eb7d..7397b7a5ec 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -506,7 +506,12 @@ return function (Container $context): void { $targetUser = $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); } if ($targetUser !== null && !$targetUser->isEmpty()) { - $impersonatorUser->setAttributes((clone $user)->getArrayCopy()); + $impersonatorUser->setAttributes([ + '$id' => $user->getId(), + '$sequence' => $user->getSequence(), + 'name' => $user->getAttribute('name', ''), + 'email' => $user->getAttribute('email', ''), + ]); $user = clone $targetUser; } } diff --git a/app/realtime.php b/app/realtime.php index 39bdf103fe..acd871bfa2 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -867,6 +867,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $timelimit = $connectionContainer->get('timelimit'); $user = $connectionContainer->get('user'); /** @var User $user */ + $impersonatorUser = $connectionContainer->get('impersonatorUser'); /** @var Document $impersonatorUser */ + if (!$impersonatorUser->isEmpty()) { + $user->setAttribute('impersonatorUserId', $impersonatorUser->getId()); + } $logUser = $user; $apis = $project->getAttribute('apis', []); diff --git a/src/Appwrite/Platform/Workers/Audits.php b/src/Appwrite/Platform/Workers/Audits.php index 211ecc3924..40d8f12ea1 100644 --- a/src/Appwrite/Platform/Workers/Audits.php +++ b/src/Appwrite/Platform/Workers/Audits.php @@ -76,11 +76,21 @@ class Audits extends Action $user = $auditMessage->user; $impersonatorUser = $auditMessage->impersonatorUser; - $isImpersonated = !$impersonatorUser->isEmpty(); - $actorUserId = $isImpersonated ? $impersonatorUser->getId() : $user->getId(); - $actorUserInternalId = $isImpersonated ? $impersonatorUser->getSequence() : $user->getSequence(); - $actorUserName = $isImpersonated ? $impersonatorUser->getAttribute('name', '') : $user->getAttribute('name', ''); - $actorUserEmail = $isImpersonated ? $impersonatorUser->getAttribute('email', '') : $user->getAttribute('email', ''); + // Fall back to legacy fields on $user for messages queued before this deploy. + $legacyImpersonatorId = $user->getAttribute('impersonatorUserId', ''); + $isImpersonated = !$impersonatorUser->isEmpty() || !empty($legacyImpersonatorId); + $actorUserId = !$impersonatorUser->isEmpty() + ? $impersonatorUser->getId() + : ($legacyImpersonatorId ?: $user->getId()); + $actorUserInternalId = !$impersonatorUser->isEmpty() + ? $impersonatorUser->getSequence() + : ($user->getAttribute('impersonatorUserInternalId') ?: $user->getSequence()); + $actorUserName = !$impersonatorUser->isEmpty() + ? $impersonatorUser->getAttribute('name', '') + : ($user->getAttribute('impersonatorUserName', '') ?: $user->getAttribute('name', '')); + $actorUserEmail = !$impersonatorUser->isEmpty() + ? $impersonatorUser->getAttribute('email', '') + : ($user->getAttribute('impersonatorUserEmail', '') ?: $user->getAttribute('email', '')); $userType = $user->getAttribute('type', ACTOR_TYPE_USER); // Create event data From 836952e2a22e50e2fc6d2e4d5e4714e9514d45e3 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 22 Jun 2026 12:59:29 +0530 Subject: [PATCH 06/21] fix: remove legacy audit fallback --- src/Appwrite/Platform/Workers/Audits.php | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/Appwrite/Platform/Workers/Audits.php b/src/Appwrite/Platform/Workers/Audits.php index 40d8f12ea1..211ecc3924 100644 --- a/src/Appwrite/Platform/Workers/Audits.php +++ b/src/Appwrite/Platform/Workers/Audits.php @@ -76,21 +76,11 @@ class Audits extends Action $user = $auditMessage->user; $impersonatorUser = $auditMessage->impersonatorUser; - // Fall back to legacy fields on $user for messages queued before this deploy. - $legacyImpersonatorId = $user->getAttribute('impersonatorUserId', ''); - $isImpersonated = !$impersonatorUser->isEmpty() || !empty($legacyImpersonatorId); - $actorUserId = !$impersonatorUser->isEmpty() - ? $impersonatorUser->getId() - : ($legacyImpersonatorId ?: $user->getId()); - $actorUserInternalId = !$impersonatorUser->isEmpty() - ? $impersonatorUser->getSequence() - : ($user->getAttribute('impersonatorUserInternalId') ?: $user->getSequence()); - $actorUserName = !$impersonatorUser->isEmpty() - ? $impersonatorUser->getAttribute('name', '') - : ($user->getAttribute('impersonatorUserName', '') ?: $user->getAttribute('name', '')); - $actorUserEmail = !$impersonatorUser->isEmpty() - ? $impersonatorUser->getAttribute('email', '') - : ($user->getAttribute('impersonatorUserEmail', '') ?: $user->getAttribute('email', '')); + $isImpersonated = !$impersonatorUser->isEmpty(); + $actorUserId = $isImpersonated ? $impersonatorUser->getId() : $user->getId(); + $actorUserInternalId = $isImpersonated ? $impersonatorUser->getSequence() : $user->getSequence(); + $actorUserName = $isImpersonated ? $impersonatorUser->getAttribute('name', '') : $user->getAttribute('name', ''); + $actorUserEmail = $isImpersonated ? $impersonatorUser->getAttribute('email', '') : $user->getAttribute('email', ''); $userType = $user->getAttribute('type', ACTOR_TYPE_USER); // Create event data From 31cfe16774e17ac9f856610cf4eca973c3a8e78b Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 22 Jun 2026 20:15:10 +0530 Subject: [PATCH 07/21] refactor: reverse impersonatorUser DI dependency --- app/init/realtime/connection.php | 70 +++++++++++++++++--------------- app/init/resources/request.php | 69 +++++++++++++++++-------------- 2 files changed, 77 insertions(+), 62 deletions(-) diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index 25f1c73252..ceddca0830 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -209,9 +209,7 @@ return function (Container $container): void { return new Origin(\array_unique($allowedHostnames), \array_unique($allowedSchemes)); }, ['platform', 'request', 'project', 'servers', 'authorization']); - $container->set('impersonatorUser', fn () => new Document(), []); - - $container->set('user', function (Request $request, Document $project, Document $console, Authorization $authorization, Document $impersonatorUser) use ($getMode, $getDbForPlatform, $getDbForProject) { + $container->set('user', function (Request $request, Document $project, Document $console, Authorization $authorization) use ($getMode, $getDbForPlatform, $getDbForProject) { $mode = $getMode($request, $project); $store = new Store(); $proofForToken = new Token(); @@ -329,42 +327,50 @@ return function (Container $container): void { } } + $dbForPlatform->setMetadata('user', $user->getId()); + $dbForProject->setMetadata('user', $user->getId()); + + return $user; + }, ['request', 'project', 'console', 'authorization']); + + $container->set('impersonatorUser', function (Request $request, Document $project, Document $user, Authorization $authorization) use ($getMode, $getDbForPlatform, $getDbForProject) { + if ($user->isEmpty() || !$user->getAttribute('impersonator', false)) { + return new Document(); + } + // Query params mirror the header fallback pattern used by ?project= and ?devKey=, // allowing Console to embed impersonation in direct file/image URLs where headers cannot be set. $impersonateUserId = $request->getHeaderLine('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', ''))); $impersonateEmail = $request->getHeaderLine('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', ''))); $impersonatePhone = $request->getHeaderLine('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', ''))); - if (!$user->isEmpty() && $user->getAttribute('impersonator', false)) { - $userDb = ($mode === APP_MODE_ADMIN || $project->getId() === 'console') ? $dbForPlatform : $dbForProject; - $targetUser = null; - - if (!empty($impersonateUserId)) { - $targetUser = $authorization->skip(fn () => $userDb->getDocument('users', $impersonateUserId)); - } elseif (!empty($impersonateEmail)) { - $targetUser = $authorization->skip(fn () => $userDb->findOne('users', [ - Query::equal('email', [\strtolower($impersonateEmail)]), - ])); - } elseif (!empty($impersonatePhone)) { - $targetUser = $authorization->skip(fn () => $userDb->findOne('users', [ - Query::equal('phone', [$impersonatePhone]), - ])); - } - - if ($targetUser !== null && !$targetUser->isEmpty()) { - $impersonatorUser->setAttributes([ - '$id' => $user->getId(), - '$sequence' => $user->getSequence(), - 'name' => $user->getAttribute('name', ''), - 'email' => $user->getAttribute('email', ''), - ]); - $user = clone $targetUser; - } + if (empty($impersonateUserId) && empty($impersonateEmail) && empty($impersonatePhone)) { + return new Document(); } - $dbForPlatform->setMetadata('user', $user->getId()); - $dbForProject->setMetadata('user', $user->getId()); + $mode = $getMode($request, $project); + $dbForPlatform = $getDbForPlatform($authorization); + $dbForProject = $getDbForProject($project, $authorization); + $userDb = ($mode === APP_MODE_ADMIN || $project->getId() === 'console') ? $dbForPlatform : $dbForProject; - return $user; - }, ['request', 'project', 'console', 'authorization', 'impersonatorUser']); + $targetUser = null; + if (!empty($impersonateUserId)) { + $targetUser = $authorization->skip(fn () => $userDb->getDocument('users', $impersonateUserId)); + } elseif (!empty($impersonateEmail)) { + $targetUser = $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])])); + } elseif (!empty($impersonatePhone)) { + $targetUser = $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); + } + + if ($targetUser === null || $targetUser->isEmpty()) { + return new Document(); + } + + return new Document([ + '$id' => $user->getId(), + '$sequence' => $user->getSequence(), + 'name' => $user->getAttribute('name', ''), + 'email' => $user->getAttribute('email', ''), + ]); + }, ['request', 'project', 'user', 'authorization']); }; diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 7397b7a5ec..56e8262fde 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -110,7 +110,43 @@ return function (Container $context): void { $context->set('queueForRealtime', fn () => new Realtime(), []); $context->set('usage', fn () => new UsageContext(), []); $context->set('auditContext', fn () => new AuditContext(), []); - $context->set('impersonatorUser', fn () => new Document(), []); + + $context->set('impersonatorUser', function (string $mode, Document $project, Document $user, Request $request, Database $dbForProject, Database $dbForPlatform) { + if ($user->isEmpty() || !$user->getAttribute('impersonator', false)) { + return new Document(); + } + + // Query params mirror the header fallback pattern used by ?project= and ?devKey=, + // allowing Console to embed impersonation in direct file/image URLs where headers cannot be set. + $impersonateUserId = $request->getHeaderLine('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', ''))); + $impersonateEmail = $request->getHeaderLine('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', ''))); + $impersonatePhone = $request->getHeaderLine('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', ''))); + + if (empty($impersonateUserId) && empty($impersonateEmail) && empty($impersonatePhone)) { + return new Document(); + } + + $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()) { + return new Document(); + } + + return new Document([ + '$id' => $user->getId(), + '$sequence' => $user->getSequence(), + 'name' => $user->getAttribute('name', ''), + 'email' => $user->getAttribute('email', ''), + ]); + }, ['mode', 'project', 'user', 'request', 'dbForProject', 'dbForPlatform']); $context->set('publisherForFunctions', fn (Publisher $publisher) => new FunctionPublisher( $publisher, new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL) @@ -351,7 +387,7 @@ return function (Container $context): void { ['devKey', 'allowedHostnames', 'allowedSchemes'] ); - $context->set('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken, $authorization, Document $impersonatorUser) { + $context->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. * @@ -489,38 +525,11 @@ return function (Container $context): void { } } - // Impersonation: if current user has impersonator capability and headers/params are set, act as another user - // Query params mirror the header fallback pattern used by ?project= and ?devKey=, - // allowing Console to embed impersonation in direct file/image URLs where headers cannot be set. - $impersonateUserId = $request->getHeaderLine('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', ''))); - $impersonateEmail = $request->getHeaderLine('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', ''))); - $impersonatePhone = $request->getHeaderLine('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', ''))); - 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()) { - $impersonatorUser->setAttributes([ - '$id' => $user->getId(), - '$sequence' => $user->getSequence(), - 'name' => $user->getAttribute('name', ''), - 'email' => $user->getAttribute('email', ''), - ]); - $user = clone $targetUser; - } - } - $dbForProject->setMetadata('user', $user->getId()); $dbForPlatform->setMetadata('user', $user->getId()); return $user; - }, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken', 'authorization', 'impersonatorUser']); + }, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken', 'authorization']); $context->set('project', function ($dbForPlatform, $request, $console, $authorization, Http $utopia) { /** @var Appwrite\Utopia\Request $request */ From 466f2c42609e673a97400f99a3a967125b475c48 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 11:06:16 +0530 Subject: [PATCH 08/21] add target user back --- app/controllers/api/account.php | 8 ++++---- app/init/realtime/connection.php | 25 +++++++++++++++++++++++++ app/init/resources/request.php | 22 ++++++++++++++++++++++ app/realtime.php | 15 ++++++++------- 4 files changed, 59 insertions(+), 11 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 5ecae9c635..06d68b4fbf 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -447,13 +447,13 @@ Http::get('/v1/account') contentType: ContentType::JSON )) ->inject('response') - ->inject('user') - ->action(function (Response $response, Document $user) { - if ($user->isEmpty()) { + ->inject('targetUser') + ->action(function (Response $response, Document $targetUser) { + if ($targetUser->isEmpty()) { throw new Exception(Exception::USER_NOT_FOUND); } - $response->dynamic($user, Response::MODEL_ACCOUNT); + $response->dynamic($targetUser, Response::MODEL_ACCOUNT); }); Http::delete('/v1/account') diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index ceddca0830..c58f55afa1 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -373,4 +373,29 @@ return function (Container $container): void { 'email' => $user->getAttribute('email', ''), ]); }, ['request', 'project', 'user', 'authorization']); + + $container->set('targetUser', function (Request $request, Document $project, Document $user, Document $impersonatorUser, Authorization $authorization) use ($getMode, $getDbForPlatform, $getDbForProject) { + if ($impersonatorUser->isEmpty()) { + return $user; + } + + $impersonateUserId = $request->getHeaderLine('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', ''))); + $impersonateEmail = $request->getHeaderLine('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', ''))); + $impersonatePhone = $request->getHeaderLine('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', ''))); + + $mode = $getMode($request, $project); + $dbForPlatform = $getDbForPlatform($authorization); + $dbForProject = $getDbForProject($project, $authorization); + $userDb = ($mode === APP_MODE_ADMIN || $project->getId() === 'console') ? $dbForPlatform : $dbForProject; + + if (!empty($impersonateUserId)) { + return $authorization->skip(fn () => $userDb->getDocument('users', $impersonateUserId)); + } elseif (!empty($impersonateEmail)) { + return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])])); + } elseif (!empty($impersonatePhone)) { + return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); + } + + return $user; + }, ['request', 'project', 'user', 'impersonatorUser', 'authorization']); }; diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 56e8262fde..70354da320 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -147,6 +147,28 @@ return function (Container $context): void { 'email' => $user->getAttribute('email', ''), ]); }, ['mode', 'project', 'user', 'request', 'dbForProject', 'dbForPlatform']); + + $context->set('targetUser', function (Document $user, Document $impersonatorUser, string $mode, Document $project, Request $request, Database $dbForProject, Database $dbForPlatform) { + if ($impersonatorUser->isEmpty()) { + return $user; + } + + $impersonateUserId = $request->getHeaderLine('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', ''))); + $impersonateEmail = $request->getHeaderLine('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', ''))); + $impersonatePhone = $request->getHeaderLine('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', ''))); + + $userDb = (APP_MODE_ADMIN === $mode || $project->getId() === 'console') ? $dbForPlatform : $dbForProject; + if (!empty($impersonateUserId)) { + return $userDb->getAuthorization()->skip(fn () => $userDb->getDocument('users', $impersonateUserId)); + } elseif (!empty($impersonateEmail)) { + return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])])); + } elseif (!empty($impersonatePhone)) { + return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); + } + + return $user; + }, ['user', 'impersonatorUser', 'mode', 'project', 'request', 'dbForProject', 'dbForPlatform']); + $context->set('publisherForFunctions', fn (Publisher $publisher) => new FunctionPublisher( $publisher, new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL) diff --git a/app/realtime.php b/app/realtime.php index acd871bfa2..ae5b8248a3 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -868,8 +868,9 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $timelimit = $connectionContainer->get('timelimit'); $user = $connectionContainer->get('user'); /** @var User $user */ $impersonatorUser = $connectionContainer->get('impersonatorUser'); /** @var Document $impersonatorUser */ + $targetUser = $connectionContainer->get('targetUser'); /** @var Document $targetUser */ if (!$impersonatorUser->isEmpty()) { - $user->setAttribute('impersonatorUserId', $impersonatorUser->getId()); + $targetUser->setAttribute('impersonatorUserId', $impersonatorUser->getId()); } $logUser = $user; @@ -921,9 +922,9 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $originValidator->getDescription()); } - $roles = $user->getRoles($authorization); + $roles = $targetUser->getRoles($authorization); - $channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId()); + $channels = Realtime::convertChannels($request->getQuery('channels', []), $targetUser->getId()); $channelCount = \count($channels); $updateStats = static function (string $projectId, ?string $teamId) use ($register, $stats): void { @@ -948,7 +949,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, */ if (empty($channels)) { // in case of message based 'subscribe' channels will be empty at first and only projectId and roles will be available - $sanitizedUser = empty($user->getId()) ? null : $response->output($user, Response::MODEL_ACCOUNT); + $sanitizedUser = empty($targetUser->getId()) ? null : $response->output($targetUser, Response::MODEL_ACCOUNT); $connectedPayloadJson = json_encode([ 'type' => 'connected', 'data' => [ @@ -958,7 +959,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, ] ]); - $realtime->subscribe($project->getId(), $connection, '', $roles, [], [], $user->getId()); + $realtime->subscribe($project->getId(), $connection, '', $roles, [], [], $targetUser->getId()); $realtime->connections[$connection]['authorization'] = $authorization; $updateStats($project->getId(), $project->getAttribute('teamId')); $server->send([$connection], $connectedPayloadJson); @@ -983,7 +984,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $e->getMessage()); } - $sanitizedUser = empty($user->getId()) ? null : $response->output($user, Response::MODEL_ACCOUNT); + $sanitizedUser = empty($targetUser->getId()) ? null : $response->output($targetUser, Response::MODEL_ACCOUNT); $mapping = []; foreach ($subscriptions as $index => $subscription) { @@ -996,7 +997,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $roles, $subscription['channels'], $subscription['queries'], - $user->getId() + $targetUser->getId() ); $mapping[$index] = $subscriptionId; From d76d0c0fc64327385599a7ec0bd8ae7f01c470dd Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 11:11:59 +0530 Subject: [PATCH 09/21] fix check error --- app/realtime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/realtime.php b/app/realtime.php index ae5b8248a3..22930cc18d 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -868,7 +868,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $timelimit = $connectionContainer->get('timelimit'); $user = $connectionContainer->get('user'); /** @var User $user */ $impersonatorUser = $connectionContainer->get('impersonatorUser'); /** @var Document $impersonatorUser */ - $targetUser = $connectionContainer->get('targetUser'); /** @var Document $targetUser */ + $targetUser = $connectionContainer->get('targetUser'); /** @var User $targetUser */ if (!$impersonatorUser->isEmpty()) { $targetUser->setAttribute('impersonatorUserId', $impersonatorUser->getId()); } From 68e02f0037b3c6cb96ed1e98dd6e8ef211662c17 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 11:30:33 +0530 Subject: [PATCH 10/21] refactor: reverse impersonatorUser DI dependency --- app/controllers/api/account.php | 2 +- app/controllers/shared/api.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 06d68b4fbf..2271acdef8 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -448,7 +448,7 @@ Http::get('/v1/account') )) ->inject('response') ->inject('targetUser') - ->action(function (Response $response, Document $targetUser) { + ->action(function (Response $response, User $targetUser) { if ($targetUser->isEmpty()) { throw new Exception(Exception::USER_NOT_FOUND); } diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index c63c353297..d23cc36c7a 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -100,7 +100,8 @@ Http::init() ->inject('apiKey') ->inject('authorization') ->inject('impersonatorUser') - ->action(function (Route $route, Request $request, Database $dbForPlatform, Database $dbForProject, AuditContext $auditContext, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization, Document $impersonatorUser) { + ->inject('targetUser') + ->action(function (Route $route, Request $request, Database $dbForPlatform, Database $dbForProject, AuditContext $auditContext, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization, Document $impersonatorUser, User $targetUser) { /** * Handle user authentication and session validation. @@ -362,7 +363,8 @@ Http::init() } $authorization->addRole($role); - foreach ($user->getRoles($authorization) as $authRole) { + $rolesSource = $impersonatorUser->isEmpty() ? $user : $targetUser; + foreach ($rolesSource->getRoles($authorization) as $authRole) { $authorization->addRole($authRole); } From 6d0d378a9bde3edd30d43bf1010ff341a8db9703 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 11:37:03 +0530 Subject: [PATCH 11/21] fix: use targetUser for impersonation context in auth, audit and membership confirmation --- app/controllers/shared/api.php | 15 +++---- .../Teams/Http/Memberships/Status/Update.php | 42 +++++++++---------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index d23cc36c7a..0c45cc999e 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -569,11 +569,12 @@ Http::init() ->inject('authorization') ->inject('cacheControlForStorage') ->inject('impersonatorUser') - ->action(function (Route $route, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Context $usage, FunctionPublisher $publisherForFunctions, Database $dbForProject, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage, Document $impersonatorUser) { + ->inject('targetUser') + ->action(function (Route $route, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Context $usage, FunctionPublisher $publisherForFunctions, Database $dbForProject, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage, Document $impersonatorUser, User $targetUser) { - $response->setUser($user); + $response->setUser($targetUser); $response->setImpersonatorUser($impersonatorUser); - $request->setUser($user); + $request->setUser($targetUser); $path = $route->getPath(); $databaseType = match (true) { @@ -602,11 +603,11 @@ Http::init() $auditContext->project = $project; $auditContext->impersonatorUser = $impersonatorUser->isEmpty() ? null : $impersonatorUser; - /* If a session exists, use the user associated with the session */ - if (! $user->isEmpty()) { - $userClone = clone $user; + /* If a session exists, use the target user (impersonated target or actor) for audit */ + if (! $targetUser->isEmpty()) { + $userClone = clone $targetUser; // $user doesn't support `type` and can cause unintended effects. - if (empty($user->getAttribute('type'))) { + if (empty($targetUser->getAttribute('type'))) { $userClone->setAttribute('type', $mode === APP_MODE_ADMIN ? ACTOR_TYPE_ADMIN : ACTOR_TYPE_USER); } $auditContext->user = $userClone; 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 f305ca8216..35297710af 100644 --- a/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php +++ b/src/Appwrite/Platform/Modules/Teams/Http/Memberships/Status/Update.php @@ -66,7 +66,7 @@ class Update extends Action ->param('secret', '', new Text(256), 'Secret key.') ->inject('request') ->inject('response') - ->inject('user') + ->inject('targetUser') ->inject('dbForProject') ->inject('authorization') ->inject('project') @@ -79,7 +79,7 @@ class Update extends Action ->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, bool $domainVerification, ?string $cookieDomain) + public function action(string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $targetUser, Database $dbForProject, Authorization $authorization, $project, Reader $geodb, Event $queueForEvents, Store $store, Token $proofForToken, bool $domainVerification, ?string $cookieDomain) { $protocol = $request->getProtocol(); @@ -104,16 +104,16 @@ class Update extends Action } if ($userId !== $membership->getAttribute('userId')) { - throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $user->getAttribute('email') . ')'); + throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $targetUser->getAttribute('email') . ')'); } - $hasSession = !$user->isEmpty(); + $hasSession = !$targetUser->isEmpty(); if (!$hasSession) { - $user->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user + $targetUser->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user } - if ($membership->getAttribute('userInternalId') !== $user->getSequence()) { - throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $user->getAttribute('email') . ')'); + if ($membership->getAttribute('userInternalId') !== $targetUser->getSequence()) { + throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $targetUser->getAttribute('email') . ')'); } if ($membership->getAttribute('confirm') === true) { @@ -125,12 +125,12 @@ class Update extends Action ->setAttribute('confirm', true) ; - $user->setAttribute('emailVerification', true); - $authorization->skip(fn () => $dbForProject->updateDocument('users', $user->getId(), new Document(['emailVerification' => true]))); + $targetUser->setAttribute('emailVerification', true); + $authorization->skip(fn () => $dbForProject->updateDocument('users', $targetUser->getId(), new Document(['emailVerification' => true]))); // Create session for the user if not logged in if (!$hasSession) { - $authorization->addRole(Role::user($user->getId())->toString()); + $authorization->addRole(Role::user($targetUser->getId())->toString()); $detector = new Detector($request->getUserAgent('UNKNOWN')); $record = $geodb->get($request->getIP()); @@ -140,14 +140,14 @@ class Update extends Action $session = new Document(array_merge([ '$id' => ID::unique(), '$permissions' => [ - Permission::read(Role::user($user->getId())), - Permission::update(Role::user($user->getId())), - Permission::delete(Role::user($user->getId())), + Permission::read(Role::user($targetUser->getId())), + Permission::update(Role::user($targetUser->getId())), + Permission::delete(Role::user($targetUser->getId())), ], - 'userId' => $user->getId(), - 'userInternalId' => $user->getSequence(), + 'userId' => $targetUser->getId(), + 'userInternalId' => $targetUser->getSequence(), 'provider' => SESSION_PROVIDER_EMAIL, - 'providerUid' => $user->getAttribute('email'), + 'providerUid' => $targetUser->getAttribute('email'), 'secret' => $proofForToken->hash($secret), // One way hash encryption to protect DB leak 'userAgent' => $request->getUserAgent('UNKNOWN'), 'ip' => $request->getIP(), @@ -161,7 +161,7 @@ class Update extends Action $authorization->addRole(Role::user($userId)->toString()); $encoded = $store - ->setProperty('id', $user->getId()) + ->setProperty('id', $targetUser->getId()) ->setProperty('secret', $secret) ->encode(); @@ -194,12 +194,12 @@ class Update extends Action $membership = $dbForProject->updateDocument('memberships', $membership->getId(), new Document(['joined' => $membership->getAttribute('joined'), 'confirm' => true])); - $dbForProject->purgeCachedDocument('users', $user->getId()); + $dbForProject->purgeCachedDocument('users', $targetUser->getId()); $authorization->skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1)); $queueForEvents - ->setParam('userId', $user->getId()) + ->setParam('userId', $targetUser->getId()) ->setParam('teamId', $team->getId()) ->setParam('membershipId', $membership->getId()) ; @@ -207,8 +207,8 @@ class Update extends Action $response->dynamic( $membership ->setAttribute('teamName', $team->getAttribute('name')) - ->setAttribute('userName', $user->getAttribute('name')) - ->setAttribute('userEmail', $user->getAttribute('email')), + ->setAttribute('userName', $targetUser->getAttribute('name')) + ->setAttribute('userEmail', $targetUser->getAttribute('email')), Response::MODEL_MEMBERSHIP ); } From ec078ad85df3235a295ad5a69ebd43d5fbaca986 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 11:46:52 +0530 Subject: [PATCH 12/21] fix: align event dispatch, audit user and DB metadata to targetUser during impersonation --- app/controllers/shared/api.php | 18 ++++++++++++------ app/realtime.php | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 0c45cc999e..cdde102926 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -368,6 +368,11 @@ Http::init() $authorization->addRole($authRole); } + if (!$impersonatorUser->isEmpty() && !$targetUser->isEmpty()) { + $dbForProject->setMetadata('user', $targetUser->getId()); + $dbForPlatform->setMetadata('user', $targetUser->getId()); + } + /** * We disable authorization checks above to ensure other endpoints (list teams, members, etc.) will continue working. * But, for actions on resources (sites, functions, etc.) in a non-console project, we explicitly check @@ -593,7 +598,7 @@ Http::init() $queueForEvents ->setEvent($route->getLabel('event', '')) ->setProject($project) - ->setUser($user); + ->setUser($targetUser); $auditContext->mode = $mode; $auditContext->userAgent = $request->getUserAgent(''); @@ -909,24 +914,25 @@ Http::shutdown() ->inject('response') ->inject('project') ->inject('user') + ->inject('targetUser') ->inject('auditContext') ->inject('publisherForAudits') ->inject('mode') - ->action(function (Route $route, array $params, Request $request, Response $response, Document $project, User $user, AuditContext $auditContext, Audit $publisherForAudits, string $mode) use ($parseLabel) { + ->action(function (Route $route, array $params, Request $request, Response $response, Document $project, User $user, User $targetUser, AuditContext $auditContext, Audit $publisherForAudits, string $mode) use ($parseLabel) { $responsePayload = $response->getPayload(); $pattern = $route->getLabel('audits.resource', null); if (! empty($pattern)) { - $resource = $parseLabel($pattern, $responsePayload, $params, $user, $project); + $resource = $parseLabel($pattern, $responsePayload, $params, $targetUser, $project); if (! empty($resource) && $resource !== $pattern) { $auditContext->resource = $resource; } } - if (! $user->isEmpty()) { - $userClone = clone $user; + if (! $targetUser->isEmpty()) { + $userClone = clone $targetUser; // $user doesn't support `type` and can cause unintended effects. - if (empty($user->getAttribute('type'))) { + if (empty($targetUser->getAttribute('type'))) { $userClone->setAttribute('type', $mode === APP_MODE_ADMIN ? ACTOR_TYPE_ADMIN : ACTOR_TYPE_USER); } $auditContext->user = $userClone; diff --git a/app/realtime.php b/app/realtime.php index 22930cc18d..214bdea735 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -871,6 +871,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $targetUser = $connectionContainer->get('targetUser'); /** @var User $targetUser */ if (!$impersonatorUser->isEmpty()) { $targetUser->setAttribute('impersonatorUserId', $impersonatorUser->getId()); + getConsoleDB()->setMetadata('user', $targetUser->getId()); + getProjectDB($project)->setMetadata('user', $targetUser->getId()); } $logUser = $user; From f815ed6f4b02aa74c76e31553de104f3bcf2414a Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 12:00:24 +0530 Subject: [PATCH 13/21] fix: check target account state, carry actor type in impersonatorUser, propagate impersonated user metadata to realtime message coroutines --- app/controllers/api/account.php | 16 ++++++++-------- app/controllers/shared/api.php | 13 +++++++------ app/init/realtime/connection.php | 1 + app/init/resources/request.php | 1 + app/realtime.php | 10 ++++++++++ 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 2271acdef8..36ff0256a2 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -476,20 +476,20 @@ Http::delete('/v1/account') ], contentType: ContentType::NONE )) - ->inject('user') + ->inject('targetUser') ->inject('project') ->inject('response') ->inject('dbForProject') ->inject('queueForEvents') ->inject('publisherForDeletes') ->inject('authorization') - ->action(function (Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, DeletePublisher $publisherForDeletes, Authorization $authorization) { - if ($user->isEmpty()) { + ->action(function (User $targetUser, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, DeletePublisher $publisherForDeletes, Authorization $authorization) { + if ($targetUser->isEmpty()) { throw new Exception(Exception::USER_NOT_FOUND); } if ($project->getId() === 'console') { - $memberships = $user->getAttribute('memberships', []); + $memberships = $targetUser->getAttribute('memberships', []); foreach ($memberships as $membership) { if (!$membership->getAttribute('confirm', false)) { continue; @@ -505,17 +505,17 @@ Http::delete('/v1/account') } } - $dbForProject->deleteDocument('users', $user->getId()); + $dbForProject->deleteDocument('users', $targetUser->getId()); $publisherForDeletes->enqueue(new DeleteMessage( project: $project, type: DELETE_TYPE_DOCUMENT, - document: $user, + document: $targetUser, )); $queueForEvents - ->setParam('userId', $user->getId()) - ->setPayload($response->output($user, Response::MODEL_USER)); + ->setParam('userId', $targetUser->getId()) + ->setPayload($response->output($targetUser, Response::MODEL_USER)); $response->noContent(); }); diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index cdde102926..57db3c063d 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -454,20 +454,21 @@ Http::init() } // Step 10: Check if user is blocked - if ($user->getAttribute('status') === false) { // Account is blocked + $currentAccount = $impersonatorUser->isEmpty() ? $user : $targetUser; + if ($currentAccount->getAttribute('status') === false) { // Account is blocked throw new Exception(Exception::USER_BLOCKED); } // Step 11: Verify password status - if ($user->getAttribute('reset')) { + if ($currentAccount->getAttribute('reset')) { throw new Exception(Exception::USER_PASSWORD_RESET_REQUIRED); } // Step 12: Validate MFA requirements - $mfaEnabled = $user->getAttribute('mfa', false); - $hasVerifiedEmail = $user->getAttribute('emailVerification', false); - $hasVerifiedPhone = $user->getAttribute('phoneVerification', false); - $hasVerifiedAuthenticator = TOTP::getAuthenticatorFromUser($user)?->getAttribute('verified') ?? false; + $mfaEnabled = $currentAccount->getAttribute('mfa', false); + $hasVerifiedEmail = $currentAccount->getAttribute('emailVerification', false); + $hasVerifiedPhone = $currentAccount->getAttribute('phoneVerification', false); + $hasVerifiedAuthenticator = TOTP::getAuthenticatorFromUser($currentAccount)?->getAttribute('verified') ?? false; $hasMoreFactors = $hasVerifiedEmail || $hasVerifiedPhone || $hasVerifiedAuthenticator; $minimumFactors = ($mfaEnabled && $hasMoreFactors) ? 2 : 1; diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index c58f55afa1..068cc5801c 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -371,6 +371,7 @@ return function (Container $container): void { '$sequence' => $user->getSequence(), 'name' => $user->getAttribute('name', ''), 'email' => $user->getAttribute('email', ''), + 'type' => $user->getAttribute('type', ACTOR_TYPE_USER), ]); }, ['request', 'project', 'user', 'authorization']); diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 70354da320..3e7c047b40 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -145,6 +145,7 @@ return function (Container $context): void { '$sequence' => $user->getSequence(), 'name' => $user->getAttribute('name', ''), 'email' => $user->getAttribute('email', ''), + 'type' => $user->getAttribute('type', ACTOR_TYPE_USER), ]); }, ['mode', 'project', 'user', 'request', 'dbForProject', 'dbForPlatform']); diff --git a/app/realtime.php b/app/realtime.php index 214bdea735..613a9443a2 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -963,6 +963,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $realtime->subscribe($project->getId(), $connection, '', $roles, [], [], $targetUser->getId()); $realtime->connections[$connection]['authorization'] = $authorization; + $realtime->connections[$connection]['impersonatedUserId'] = $impersonatorUser->isEmpty() ? null : $targetUser->getId(); $updateStats($project->getId(), $project->getAttribute('teamId')); $server->send([$connection], $connectedPayloadJson); $outboundBytes += \strlen($connectedPayloadJson); @@ -1006,6 +1007,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, } $realtime->connections[$connection]['authorization'] = $authorization; + $realtime->connections[$connection]['impersonatedUserId'] = $impersonatorUser->isEmpty() ? null : $targetUser->getId(); $updateStats($project->getId(), $project->getAttribute('teamId')); $subscriptionCount = \count($subscriptions); @@ -1130,8 +1132,13 @@ $server->onMessage(function (int $connection, string $message) use ($container, $authorization->addRole($role); } + $impersonatedUserId = $realtime->connections[$connection]['impersonatedUserId'] ?? null; + $database = getConsoleDB(); $database->setAuthorization($authorization); + if ($impersonatedUserId !== null) { + $database->setMetadata('user', $impersonatedUserId); + } if (!empty($projectId) && $projectId !== 'console') { // Negative-cache race: if any prior code path queried projects:$projectId @@ -1152,6 +1159,9 @@ $server->onMessage(function (int $connection, string $message) use ($container, $database = getProjectDB($project); $database->setAuthorization($authorization); + if ($impersonatedUserId !== null) { + $database->setMetadata('user', $impersonatedUserId); + } } else { $project = null; } From ced3d4be9a559f1aec3f1f9be9997353d1e88a1a Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 12:14:02 +0530 Subject: [PATCH 14/21] =?UTF-8?q?fix:=20revert=20account-state=20checks=20?= =?UTF-8?q?to=20actor=20user=20=E2=80=94=20session-bound=20protections=20m?= =?UTF-8?q?ust=20validate=20actor=20not=20target?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shared/api.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 57db3c063d..cdde102926 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -454,21 +454,20 @@ Http::init() } // Step 10: Check if user is blocked - $currentAccount = $impersonatorUser->isEmpty() ? $user : $targetUser; - if ($currentAccount->getAttribute('status') === false) { // Account is blocked + if ($user->getAttribute('status') === false) { // Account is blocked throw new Exception(Exception::USER_BLOCKED); } // Step 11: Verify password status - if ($currentAccount->getAttribute('reset')) { + if ($user->getAttribute('reset')) { throw new Exception(Exception::USER_PASSWORD_RESET_REQUIRED); } // Step 12: Validate MFA requirements - $mfaEnabled = $currentAccount->getAttribute('mfa', false); - $hasVerifiedEmail = $currentAccount->getAttribute('emailVerification', false); - $hasVerifiedPhone = $currentAccount->getAttribute('phoneVerification', false); - $hasVerifiedAuthenticator = TOTP::getAuthenticatorFromUser($currentAccount)?->getAttribute('verified') ?? false; + $mfaEnabled = $user->getAttribute('mfa', false); + $hasVerifiedEmail = $user->getAttribute('emailVerification', false); + $hasVerifiedPhone = $user->getAttribute('phoneVerification', false); + $hasVerifiedAuthenticator = TOTP::getAuthenticatorFromUser($user)?->getAttribute('verified') ?? false; $hasMoreFactors = $hasVerifiedEmail || $hasVerifiedPhone || $hasVerifiedAuthenticator; $minimumFactors = ($mfaEnabled && $hasMoreFactors) ? 2 : 1; From 939e9f29654b0d29a1a5ec910f75c1c7c4df7764 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 15:48:51 +0530 Subject: [PATCH 15/21] fix: scope impersonatorUserId to current account response, fix actor userType in audit, preserve impersonatedUserId on realtime resubscribe, remove transient setAttribute --- app/realtime.php | 3 ++- src/Appwrite/Platform/Workers/Audits.php | 2 +- src/Appwrite/Utopia/Response.php | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/realtime.php b/app/realtime.php index 613a9443a2..e37db4f3db 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -675,6 +675,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, foreach (\array_keys($connections) as $connection) { $subscriptionsBefore = \count($realtime->getSubscriptionMetadata($connection)); $authorization = $realtime->connections[$connection]['authorization'] ?? null; + $impersonatedUserId = $realtime->connections[$connection]['impersonatedUserId'] ?? null; $previousUserId = $realtime->connections[$connection]['userId'] ?? ''; $meta = $realtime->getSubscriptionMetadata($connection); @@ -709,6 +710,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, } if ($authorization !== null && isset($realtime->connections[$connection])) { $realtime->connections[$connection]['authorization'] = $authorization; + $realtime->connections[$connection]['impersonatedUserId'] = $impersonatedUserId; } $subscriptionsAfter = \count($realtime->getSubscriptionMetadata($connection)); @@ -870,7 +872,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $impersonatorUser = $connectionContainer->get('impersonatorUser'); /** @var Document $impersonatorUser */ $targetUser = $connectionContainer->get('targetUser'); /** @var User $targetUser */ if (!$impersonatorUser->isEmpty()) { - $targetUser->setAttribute('impersonatorUserId', $impersonatorUser->getId()); getConsoleDB()->setMetadata('user', $targetUser->getId()); getProjectDB($project)->setMetadata('user', $targetUser->getId()); } diff --git a/src/Appwrite/Platform/Workers/Audits.php b/src/Appwrite/Platform/Workers/Audits.php index 211ecc3924..27d2629ce6 100644 --- a/src/Appwrite/Platform/Workers/Audits.php +++ b/src/Appwrite/Platform/Workers/Audits.php @@ -81,7 +81,7 @@ class Audits extends Action $actorUserInternalId = $isImpersonated ? $impersonatorUser->getSequence() : $user->getSequence(); $actorUserName = $isImpersonated ? $impersonatorUser->getAttribute('name', '') : $user->getAttribute('name', ''); $actorUserEmail = $isImpersonated ? $impersonatorUser->getAttribute('email', '') : $user->getAttribute('email', ''); - $userType = $user->getAttribute('type', ACTOR_TYPE_USER); + $userType = $isImpersonated ? $impersonatorUser->getAttribute('type', ACTOR_TYPE_USER) : $user->getAttribute('type', ACTOR_TYPE_USER); // Create event data $eventData = [ diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php index e5991531e8..45d0b5dc25 100644 --- a/src/Appwrite/Utopia/Response.php +++ b/src/Appwrite/Utopia/Response.php @@ -473,7 +473,9 @@ class Response extends SwooleResponse { if ( $this->impersonatorUser !== null - && ($model === self::MODEL_ACCOUNT || $model === self::MODEL_USER) + && $model === self::MODEL_ACCOUNT + && $this->user !== null + && $document->getId() === $this->user->getId() ) { $document = clone $document; $document->setAttribute('impersonatorUserId', $this->impersonatorUser->getId()); From 65dc3bc9676bc1cd11732ad544808e6e4cd59a5a Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 15:56:18 +0530 Subject: [PATCH 16/21] fix: preserve impersonatedUserId across realtime re-authentication --- src/Appwrite/Realtime/Message/Handlers/Authentication.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Appwrite/Realtime/Message/Handlers/Authentication.php b/src/Appwrite/Realtime/Message/Handlers/Authentication.php index 9065e586d3..f9fa15c4d2 100644 --- a/src/Appwrite/Realtime/Message/Handlers/Authentication.php +++ b/src/Appwrite/Realtime/Message/Handlers/Authentication.php @@ -69,6 +69,7 @@ class Authentication extends Action $roles = $user->getRoles($database->getAuthorization()); $authorization = $realtime->connections[$connectionId]['authorization'] ?? null; + $impersonatedUserId = $realtime->connections[$connectionId]['impersonatedUserId'] ?? null; $projectId = $realtime->connections[$connectionId]['projectId'] ?? null; // Capture the pre-auth userId before unsubscribe() clears the connection entry, // so we can rebind any account channels that were stored under it. @@ -102,6 +103,7 @@ class Authentication extends Action if ($authorization !== null) { $realtime->connections[$connectionId]['authorization'] = $authorization; + $realtime->connections[$connectionId]['impersonatedUserId'] = $impersonatedUserId; } $subscriptionsAfter = \count($realtime->getSubscriptionMetadata($connectionId)); From 111637a93a49063da57d8b457db09e84cdc77f26 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 16:06:56 +0530 Subject: [PATCH 17/21] fix: check target account state, carry actor type in impersonatorUser, propagate impersonated user metadata to realtime message coroutines --- app/controllers/shared/api.php | 10 ++++++---- app/realtime.php | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index cdde102926..a2db4c0283 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -417,6 +417,8 @@ Http::init() } } + $rolesSource = $impersonatorUser->isEmpty() ? $user : $targetUser; + // Steps 7-9: Access Control - Method, Namespace and Scope Validation $method = $route->getLabel('sdk', false); @@ -432,7 +434,7 @@ Http::init() if ( array_key_exists($namespace, $project->getAttribute('services', [])) && ! $project->getAttribute('services', [])[$namespace] - && ! ($user->isPrivileged($authorization->getRoles()) || $user->isKey($authorization->getRoles())) + && ! ($rolesSource->isPrivileged($authorization->getRoles()) || $rolesSource->isKey($authorization->getRoles())) ) { throw new Exception(Exception::GENERAL_SERVICE_DISABLED); } @@ -442,7 +444,7 @@ Http::init() if ( array_key_exists('rest', $project->getAttribute('apis', [])) && ! $project->getAttribute('apis', [])['rest'] - && ! ($user->isPrivileged($authorization->getRoles()) || $user->isKey($authorization->getRoles())) + && ! ($rolesSource->isPrivileged($authorization->getRoles()) || $rolesSource->isKey($authorization->getRoles())) ) { throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED); } @@ -454,12 +456,12 @@ Http::init() } // Step 10: Check if user is blocked - if ($user->getAttribute('status') === false) { // Account is blocked + if ($rolesSource->getAttribute('status') === false) { // Account is blocked throw new Exception(Exception::USER_BLOCKED); } // Step 11: Verify password status - if ($user->getAttribute('reset')) { + if ($rolesSource->getAttribute('reset')) { throw new Exception(Exception::USER_PASSWORD_RESET_REQUIRED); } diff --git a/app/realtime.php b/app/realtime.php index e37db4f3db..15e48e967a 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -880,9 +880,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $apis = $project->getAttribute('apis', []); // Websocket is what to check, but realtime is checked too for backwards compatibility $websocketEnabled = $apis['websocket'] ?? $apis['realtime'] ?? true; + $effectiveUser = $impersonatorUser->isEmpty() ? $user : $targetUser; if ( !$websocketEnabled - && !($user->isPrivileged($authorization->getRoles()) || $user->isKey($authorization->getRoles())) + && !($effectiveUser->isPrivileged($authorization->getRoles()) || $effectiveUser->isKey($authorization->getRoles())) ) { throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED); } From 5a005b5bf110bb5258c34320bcfa572c8ab0ddce Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 16:26:58 +0530 Subject: [PATCH 18/21] fix: guard findOne null return in targetUser DI resource for email/phone impersonation --- app/init/realtime/connection.php | 4 ++-- app/init/resources/request.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index 068cc5801c..a03152b7d9 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -392,9 +392,9 @@ return function (Container $container): void { if (!empty($impersonateUserId)) { return $authorization->skip(fn () => $userDb->getDocument('users', $impersonateUserId)); } elseif (!empty($impersonateEmail)) { - return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])])); + return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])]) ?? new Document()); } elseif (!empty($impersonatePhone)) { - return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); + return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])]) ?? new Document()); } return $user; diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 3e7c047b40..588ed0472e 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -162,9 +162,9 @@ return function (Container $context): void { if (!empty($impersonateUserId)) { return $userDb->getAuthorization()->skip(fn () => $userDb->getDocument('users', $impersonateUserId)); } elseif (!empty($impersonateEmail)) { - return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])])); + return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])]) ?? new Document()); } elseif (!empty($impersonatePhone)) { - return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); + return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])]) ?? new Document()); } return $user; From 33f9069ad6a586ce0a20838bab32684c2506de1b Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 16:28:39 +0530 Subject: [PATCH 19/21] =?UTF-8?q?revert:=20remove=20unnecessary=20null=20g?= =?UTF-8?q?uards=20on=20findOne=20=E2=80=94=20impersonatorUser=20already?= =?UTF-8?q?=20verifies=20target=20exists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/init/realtime/connection.php | 4 ++-- app/init/resources/request.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index a03152b7d9..068cc5801c 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -392,9 +392,9 @@ return function (Container $container): void { if (!empty($impersonateUserId)) { return $authorization->skip(fn () => $userDb->getDocument('users', $impersonateUserId)); } elseif (!empty($impersonateEmail)) { - return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])]) ?? new Document()); + return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])])); } elseif (!empty($impersonatePhone)) { - return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])]) ?? new Document()); + return $authorization->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); } return $user; diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 588ed0472e..3e7c047b40 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -162,9 +162,9 @@ return function (Container $context): void { if (!empty($impersonateUserId)) { return $userDb->getAuthorization()->skip(fn () => $userDb->getDocument('users', $impersonateUserId)); } elseif (!empty($impersonateEmail)) { - return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])]) ?? new Document()); + return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('email', [\strtolower($impersonateEmail)])])); } elseif (!empty($impersonatePhone)) { - return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])]) ?? new Document()); + return $userDb->getAuthorization()->skip(fn () => $userDb->findOne('users', [Query::equal('phone', [$impersonatePhone])])); } return $user; From 84d93042799be70cf2ad966518627661244eb0f6 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 16:47:27 +0530 Subject: [PATCH 20/21] fix: derive actor type from mode in impersonatorUser, reject re-auth on impersonated realtime connections --- app/init/realtime/connection.php | 2 +- app/init/resources/request.php | 2 +- src/Appwrite/Realtime/Message/Handlers/Authentication.php | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/init/realtime/connection.php b/app/init/realtime/connection.php index 068cc5801c..f7b1375616 100644 --- a/app/init/realtime/connection.php +++ b/app/init/realtime/connection.php @@ -371,7 +371,7 @@ return function (Container $container): void { '$sequence' => $user->getSequence(), 'name' => $user->getAttribute('name', ''), 'email' => $user->getAttribute('email', ''), - 'type' => $user->getAttribute('type', ACTOR_TYPE_USER), + 'type' => $user->getAttribute('type', $mode === APP_MODE_ADMIN ? ACTOR_TYPE_ADMIN : ACTOR_TYPE_USER), ]); }, ['request', 'project', 'user', 'authorization']); diff --git a/app/init/resources/request.php b/app/init/resources/request.php index 3e7c047b40..ded4f735a6 100644 --- a/app/init/resources/request.php +++ b/app/init/resources/request.php @@ -145,7 +145,7 @@ return function (Container $context): void { '$sequence' => $user->getSequence(), 'name' => $user->getAttribute('name', ''), 'email' => $user->getAttribute('email', ''), - 'type' => $user->getAttribute('type', ACTOR_TYPE_USER), + 'type' => $user->getAttribute('type', $mode === APP_MODE_ADMIN ? ACTOR_TYPE_ADMIN : ACTOR_TYPE_USER), ]); }, ['mode', 'project', 'user', 'request', 'dbForProject', 'dbForPlatform']); diff --git a/src/Appwrite/Realtime/Message/Handlers/Authentication.php b/src/Appwrite/Realtime/Message/Handlers/Authentication.php index f9fa15c4d2..cf46f7ccb7 100644 --- a/src/Appwrite/Realtime/Message/Handlers/Authentication.php +++ b/src/Appwrite/Realtime/Message/Handlers/Authentication.php @@ -71,6 +71,10 @@ class Authentication extends Action $authorization = $realtime->connections[$connectionId]['authorization'] ?? null; $impersonatedUserId = $realtime->connections[$connectionId]['impersonatedUserId'] ?? null; $projectId = $realtime->connections[$connectionId]['projectId'] ?? null; + + if ($impersonatedUserId !== null) { + throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Cannot re-authenticate on an impersonated connection.'); + } // Capture the pre-auth userId before unsubscribe() clears the connection entry, // so we can rebind any account channels that were stored under it. $previousUserId = $realtime->connections[$connectionId]['userId'] ?? ''; From ed740d6b7c0d9c4a25da139b2308b7575e64d4f5 Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Tue, 23 Jun 2026 16:54:59 +0530 Subject: [PATCH 21/21] fix: use effective user for MFA and cache privilege checks during impersonation --- app/controllers/shared/api.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index a2db4c0283..30377334d0 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -466,10 +466,10 @@ Http::init() } // Step 12: Validate MFA requirements - $mfaEnabled = $user->getAttribute('mfa', false); - $hasVerifiedEmail = $user->getAttribute('emailVerification', false); - $hasVerifiedPhone = $user->getAttribute('phoneVerification', false); - $hasVerifiedAuthenticator = TOTP::getAuthenticatorFromUser($user)?->getAttribute('verified') ?? false; + $mfaEnabled = $rolesSource->getAttribute('mfa', false); + $hasVerifiedEmail = $rolesSource->getAttribute('emailVerification', false); + $hasVerifiedPhone = $rolesSource->getAttribute('phoneVerification', false); + $hasVerifiedAuthenticator = TOTP::getAuthenticatorFromUser($rolesSource)?->getAttribute('verified') ?? false; $hasMoreFactors = $hasVerifiedEmail || $hasVerifiedPhone || $hasVerifiedAuthenticator; $minimumFactors = ($mfaEnabled && $hasMoreFactors) ? 2 : 1; @@ -620,13 +620,15 @@ Http::init() $auditContext->user = $userClone; } + $rolesSource = $impersonatorUser->isEmpty() ? $user : $targetUser; + $useCache = $route->getLabel('cache', false); $storageCacheOperationsCounter = $telemetry->createCounter('storage.cache.operations.load'); if ($useCache) { $roles = $authorization->getRoles(); - $isAppUser = $user->isKey($roles); + $isAppUser = $rolesSource->isKey($roles); $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview'; - $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && ! $user->isPrivileged($roles); + $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && ! $rolesSource->isPrivileged($roles); $key = $request->cacheIdentifier(); Span::add('storage.cache.key', $key);