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

Update hooks

Browse Source
This commit is contained in:
Jake Barnby
2025-01-28 22:10:00 +13:00
parent 3b71215b4f
commit 3d0884aaec
2 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+1 -1
View File
@@ -111,5 +111,5 @@ _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=10
_APP_PROJECT_REGIONS=default
_APP_FUNCTIONS_CREATION_ABUSE_LIMIT=5000
_APP_SLOW_QUERIES_MAX_HITS=5
_APP_SLOW_QUERIES_TIMEOUT=1000
_APP_SLOW_QUERIES_TIMEOUT=15000
_APP_SLOW_QUERIES_BLOCK=enabled
app/controllers/api/databases.php
+54 -43
View File
@@ -460,9 +460,14 @@ App::init()
$request->getURI(), // Contains databaseId & collectionId
$request->getParam('queries')
]));
/** @var Document $document */
$document = Authorization::skip(fn () => $dbForProject->getDocument('slowQueries', $key));
if ($document->getAttribute('blocked') === true) {
$document = Authorization::skip(fn () => $dbForProject->getDocument(
'slowQueries',
$key
));
if ($document->getAttribute('blocked')) {
throw new Exception(Exception::QUERY_BLOCKED);
}
});
@@ -473,51 +478,57 @@ App::error()
->inject('request')
->inject('dbForProject')
->action(function (Throwable $error, Request $request, Database $dbForProject) {
if ($error instanceof TimeoutException) {
$route = Request::getRoute();
$collectionId = $route->getParamValue('collectionId');
$databaseId = $route->getParamValue('databaseId');
$queries = $request->getParam('queries', []);
if (!$error instanceof TimeoutException) {
return;
}
$queriesValidator = new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE);
if (!$queriesValidator->isValid($queries)) {
App::setResource('error', fn () => new Exception(Exception::GENERAL_SERVER_ERROR));
return;
$route = Request::getRoute();
$collectionId = $route->getParamValue('collectionId');
$databaseId = $route->getParamValue('databaseId');
$queries = $request->getParam('queries', []);
$key = md5(json_encode([
$request->getMethod(),
$request->getURI(),
$queries
]));
/** @var Document $document */
$document = Authorization::skip(fn () => $dbForProject->getDocument(
'slowQueries',
$key
));
if ($document->isEmpty()) {
$document = Authorization::skip(fn () => $dbForProject->createDocument('slowQueries', new Document([
'$id' => $key,
'blocked' => false,
'count' => 1,
'queries' => $queries,
'databaseId' => $databaseId,
'collectionId' => $collectionId,
'path' => $request->getURI()
])));
} else {
$document->setAttribute('count', $document->getAttribute('count') + 1);
$max = intval(App::getEnv('_APP_SLOW_QUERIES_MAX_HITS', 5));
if ($document->getAttribute('count') >= $max) {
$document->setAttribute('blocked', true);
}
$key = md5(json_encode([
$request->getMethod(),
$request->getURI(), // Contains databaseId & collectionId
$request->getParam('queries')
]));
$document = Authorization::skip(fn () => $dbForProject->updateDocument(
'slowQueries',
$document->getId(),
$document
));
}
/** @var Document $document */
$document = Authorization::skip(fn () => $dbForProject->getDocument('slowQueries', $key));
if ($document->isEmpty()) {
$document = Authorization::skip(fn () => $dbForProject->createDocument('slowQueries', new Document([
'$id' => $key,
'blocked' => false,
'count' => 1,
'queries' => $queries,
'databaseId' => $databaseId,
'collectionId' => $collectionId,
'path' => $request->getURI()
])));
} else {
$document->setAttribute('count', $document->getAttribute('count') + 1);
$max = intval(App::getEnv('_APP_SLOW_QUERIES_MAX_HITS', 5));
if ($document->getAttribute('count') >= $max) {
$document->setAttribute('blocked', true);
}
$document = Authorization::skip(fn () => $dbForProject->updateDocument('slowQueries', $document->getId(), $document));
}
if ($document->getAttribute('blocked') === true) {
App::setResource('error', fn () => new Exception(Exception::QUERY_BLOCKED));
return;
}
App::setResource('error', fn () => new Exception(Exception::QUERY_TIMEOUT));
// Set the correct exception to pass to the next shutdown hook
if ($document->getAttribute('blocked')) {
App::setResource('error', fn () => new Exception(Exception::QUERY_BLOCKED));
} else {
App::setResource('error', fn() => new Exception(Exception::QUERY_TIMEOUT));
}
});