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

Log abuse timelimit fail-open errors

Browse Source
This commit is contained in:
Chirag Aggarwal
2026-05-12 13:31:33 +05:30
parent 728298d2f5
commit d523c7425a
2 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/shared/api.php
+5 -2
View File
@@ -499,8 +499,9 @@ Http::init()
->inject('telemetry')
->inject('platform')
->inject('authorization')
->inject('logError')
->inject('cacheControlForStorage')
->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Delete $queueForDeletes, EventDatabase $queueForDatabase, Context $usage, Func $queueForFunctions, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage) {
->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Delete $queueForDeletes, EventDatabase $queueForDatabase, Context $usage, Func $queueForFunctions, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization, callable $logError, callable $cacheControlForStorage) {
$response->setUser($user);
$request->setUser($user);
@@ -580,7 +581,9 @@ Http::init()
if ($shouldCheckAbuse) {
$isRateLimited = $abuse->check();
}
} catch (\Throwable) {
} catch (\Throwable $th) {
\call_user_func($logError, $th, 'http', 'api.abuse.timelimit');
continue;
}
app/init/resources/request.php
+45
View File
@@ -34,6 +34,7 @@ use Utopia\Auth\Proofs\Token;
use Utopia\Auth\Store;
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 as DatabaseDateTime;
@@ -48,6 +49,7 @@ use Utopia\Locale\Locale;
use Utopia\Logger\Log;
use Utopia\Pools\Group;
use Utopia\Queue\Publisher;
use Utopia\Registry\Registry;
use Utopia\Storage\Device;
use Utopia\System\System;
use Utopia\Telemetry\Adapter as Telemetry;
@@ -70,6 +72,49 @@ return function (Container $container): void {
return $register->get('logger');
}, ['register']);
$container->set('logError', function (Registry $register, Request $request, Document $project, Authorization $authorization) {
return function (Throwable $error, string $namespace, string $action, ?array $extras = null) use ($register, $request, $project, $authorization) {
$logger = $register->get('logger');
if (!$logger) {
return;
}
$log = new Log();
$log->setNamespace($namespace);
$log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
$log->setVersion(System::getEnv('_APP_VERSION', 'UNKNOWN'));
$log->setType(Log::TYPE_ERROR);
$log->setMessage($error->getMessage());
$log->setAction($action);
$log->addTag('code', $error->getCode());
$log->addTag('verboseType', \get_class($error));
$log->addTag('projectId', $project->getId());
$log->addTag('method', $request->getMethod());
$log->addTag('url', $request->getURI());
$log->addExtra('file', $error->getFile());
$log->addExtra('line', $error->getLine());
$log->addExtra('trace', $error->getTraceAsString());
$log->addExtra('roles', $authorization->getRoles());
foreach (($extras ?? []) as $key => $value) {
$log->addExtra($key, $value);
}
$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());
}
};
}, ['register', 'request', 'project', 'authorization']);
$container->set('authorization', function () {
return new Authorization();
}, []);