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

Refactor Realtime message handling to improve authorization preservation and simplify error handling

Browse Source
This commit is contained in:
shimon
2025-12-03 21:37:41 +02:00
parent 77face0f2d
commit e47802d1e1
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/realtime.php
+11 -13
View File
@@ -614,6 +614,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
$code = 500;
}
$message = $th->getMessage();
// sanitize 0 && 5xx errors
@@ -645,27 +646,15 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
$response = new Response(new SwooleResponse());
$projectId = $realtime->connections[$connection]['projectId'] ?? null;
if (empty($projectId)) {
throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing project ID in connection');
}
// Get authorization from connection (stored during onOpen)
$authorization = $realtime->connections[$connection]['authorization'] ?? null;
if (empty($projectId)) {
throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Aurhorization not found in connection');
}
$database = getConsoleDB();
$database->setAuthorization($authorization);
if ($projectId !== 'console') {
$project = $authorization->skip(fn () => $database->getDocument('projects', $projectId));
if ($project->isEmpty()) {
throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Project not found: ' . $projectId);
}
$database = getProjectDB($project);
$database->setAuthorization($authorization);
} else {
@@ -677,7 +666,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
*
* Abuse limits are sending 32 times per minute and connection.
*/
$timeLimit = new TimeLimitRedis('url:{url},connection:{connection}', 32, 60, getRedis());
$timeLimit = getTimelimit('url:{url},connection:{connection}', 32, 60);
$timeLimit
->setParam('{connection}', $connection)
@@ -733,7 +722,16 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
$roles = $user->getRoles($database->getAuthorization());
$channels = Realtime::convertChannels(array_flip($realtime->connections[$connection]['channels']), $user->getId());
// Preserve authorization before subscribe overwrites the connection array
$authorization = $realtime->connections[$connection]['authorization'] ?? null;
$realtime->subscribe($realtime->connections[$connection]['projectId'], $connection, $roles, $channels);
// Restore authorization after subscribe
if ($authorization !== null) {
$realtime->connections[$connection]['authorization'] = $authorization;
}
$user = $response->output($user, Response::MODEL_ACCOUNT);
$server->send([$connection], json_encode([