perf(geo): fetch geo records lazily behind a shared cache

The geoRecord DI resource resolved on every API request via the usage
and router init hooks, costing a synchronous call to the geo service
(3s timeout) per request with no caching.

Replace it with a Geo service injected as 'geo': callers fetch a
GeoRecord on demand with $geo->get($ip), backed by a fixed-size
Swoole\Table created before the server forks, so lookups are shared
across all HTTP workers and each IP is fetched once.

Also drop the dead 'geodb' container resource.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
loks0nandClaude Fable 5 committed 2026-08-25 14:05:53 +01:00
1 parent e75d5c3f13
commit 74398766a4
11 files changed
+225 -134

No files matched your search

+17 -13
View File
@@ -21,7 +21,7 @@ use Appwrite\Event\Publisher\Mail as MailPublisher;
use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
use Appwrite\Extend\Exception;
use Appwrite\Hooks\Hooks;
use Appwrite\Locale\GeoRecord;
use Appwrite\Locale\Geo;
use Appwrite\Network\Validator\Redirect;
use Appwrite\OpenSSL\OpenSSL;
use Appwrite\SDK\AuthType;
@@ -82,7 +82,7 @@ $legacyConsolePaths = System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'r
$oauthDefaultSuccess = $legacyConsolePaths ? '/console/auth/oauth2/success' : '/auth/oauth2/success';
$oauthDefaultFailure = $legacyConsolePaths ? '/console/auth/oauth2/failure' : '/auth/oauth2/failure';
$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, GeoRecord $geoRecord, Event $queueForEvents, Bus $bus, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Geo $geo, Event $queueForEvents, Bus $bus, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
// Attempt to decode secret as a JWT (used by OAuth2 token flow to carry provider info)
$oauthProvider = null;
@@ -161,6 +161,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
}
}
$geoRecord = $geo->get($request->getIP());
$session = new Document(array_merge(
[
'$id' => ID::unique(),
@@ -964,7 +965,7 @@ Http::post('/v1/account/sessions/email')
->inject('project')
->inject('platform')
->inject('locale')
->inject('geoRecord')
->inject('geo')
->inject('queueForEvents')
->inject('bus')
->inject('hooks')
@@ -974,7 +975,7 @@ Http::post('/v1/account/sessions/email')
->inject('domainVerification')
->inject('cookieDomain')
->inject('authorization')
->action(function (string $email, string $password, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, GeoRecord $geoRecord, Event $queueForEvents, Bus $bus, Hooks $hooks, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
->action(function (string $email, string $password, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Geo $geo, Event $queueForEvents, Bus $bus, Hooks $hooks, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
$email = \strtolower($email);
$protocol = $request->getProtocol();
@@ -999,6 +1000,7 @@ Http::post('/v1/account/sessions/email')
$duration = $project->getAttribute('auths', [])['duration'] ?? TOKEN_EXPIRATION_LOGIN_LONG;
$detector = new Detector($request->getUserAgent('UNKNOWN'));
$secret = $proofForToken->generate();
$geoRecord = $geo->get($request->getIP());
$session = new Document(array_merge(
[
'$id' => ID::unique(),
@@ -1125,7 +1127,7 @@ Http::post('/v1/account/sessions/anonymous')
->inject('user')
->inject('project')
->inject('dbForProject')
->inject('geoRecord')
->inject('geo')
->inject('queueForEvents')
->inject('store')
->inject('proofForPassword')
@@ -1133,7 +1135,7 @@ Http::post('/v1/account/sessions/anonymous')
->inject('domainVerification')
->inject('cookieDomain')
->inject('authorization')
->action(function (Request $request, Response $response, Locale $locale, User $user, Document $project, Database $dbForProject, GeoRecord $geoRecord, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
->action(function (Request $request, Response $response, Locale $locale, User $user, Document $project, Database $dbForProject, Geo $geo, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
$protocol = $request->getProtocol();
if ('console' === $project->getId()) {
@@ -1185,6 +1187,7 @@ Http::post('/v1/account/sessions/anonymous')
$detector = new Detector($request->getUserAgent('UNKNOWN'));
$secret = $proofForToken->generate();
$geoRecord = $geo->get($request->getIP());
$session = new Document(array_merge(
[
'$id' => ID::unique(),
@@ -1292,7 +1295,7 @@ Http::post('/v1/account/sessions/token')
->inject('project')
->inject('platform')
->inject('locale')
->inject('geoRecord')
->inject('geo')
->inject('queueForEvents')
->inject('bus')
->inject('store')
@@ -1493,7 +1496,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
->inject('devKey')
->inject('user')
->inject('dbForProject')
->inject('geoRecord')
->inject('geo')
->inject('dbForPlatform')
->inject('queueForEvents')
->inject('store')
@@ -1503,7 +1506,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
->inject('domainVerification')
->inject('cookieDomain')
->inject('authorization')
->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Validator $redirectValidator, Document $devKey, User $user, Database $dbForProject, GeoRecord $geoRecord, Database $dbForPlatform, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, array $plan, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) use ($oauthDefaultSuccess, $oauthDefaultFailure) {
->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Validator $redirectValidator, Document $devKey, User $user, Database $dbForProject, Geo $geo, Database $dbForPlatform, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, array $plan, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) use ($oauthDefaultSuccess, $oauthDefaultFailure) {
$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
$port = $request->getPort();
$callbackBase = $protocol . '://' . $request->getHostname();
@@ -2108,6 +2111,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
$detector = new Detector($request->getUserAgent('UNKNOWN'));
$secret = $proofForToken->generate();
$geoRecord = $geo->get($request->getIP());
$session = new Document(array_merge([
'$id' => ID::unique(),
'userId' => $user->getId(),
@@ -3016,7 +3020,7 @@ Http::put('/v1/account/sessions/magic-url')
->inject('project')
->inject('platform')
->inject('locale')
->inject('geoRecord')
->inject('geo')
->inject('queueForEvents')
->inject('bus')
->inject('store')
@@ -3024,10 +3028,10 @@ Http::put('/v1/account/sessions/magic-url')
->inject('domainVerification')
->inject('cookieDomain')
->inject('authorization')
->action(function ($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geoRecord, $queueForEvents, $bus, $store, $proofForCode, $domainVerification, $cookieDomain, $authorization) use ($createSession) {
->action(function ($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geo, $queueForEvents, $bus, $store, $proofForCode, $domainVerification, $cookieDomain, $authorization) use ($createSession) {
$proofForToken = new ProofsToken(TOKEN_LENGTH_MAGIC_URL);
$proofForToken->setHash(new Sha());
$createSession($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geoRecord, $queueForEvents, $bus, $store, $proofForToken, $proofForCode, $domainVerification, $cookieDomain, $authorization);
$createSession($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geo, $queueForEvents, $bus, $store, $proofForToken, $proofForCode, $domainVerification, $cookieDomain, $authorization);
});
Http::put('/v1/account/sessions/phone')
@@ -3067,7 +3071,7 @@ Http::put('/v1/account/sessions/phone')
->inject('project')
->inject('platform')
->inject('locale')
->inject('geoRecord')
->inject('geo')
->inject('queueForEvents')
->inject('bus')
->inject('store')
+4 -3
View File
@@ -1,6 +1,6 @@
<?php
use Appwrite\Locale\GeoRecord;
use Appwrite\Locale\Geo;
use Appwrite\SDK\AuthType;
use Appwrite\SDK\Method;
use Appwrite\SDK\Response as SDKResponse;
@@ -31,8 +31,9 @@ Http::get('/v1/locale')
->inject('request')
->inject('response')
->inject('locale')
->inject('geoRecord')
->action(function (Request $request, Response $response, Locale $locale, GeoRecord $geoRecord) {
->inject('geo')
->action(function (Request $request, Response $response, Locale $locale, Geo $geo) {
$geoRecord = $geo->get($request->getIP());
$response->dynamic(new Document([
'ip' => $geoRecord->getIp(),
'countryCode' => $geoRecord->getCountryCode(),
+24 -20
View File
@@ -14,7 +14,7 @@ use Appwrite\Event\Message\Delete as DeleteMessage;
use Appwrite\Event\Publisher\Certificate;
use Appwrite\Event\Publisher\Delete as DeletePublisher;
use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Locale\GeoRecord;
use Appwrite\Locale\Geo;
use Appwrite\Locking\Lock;
use Appwrite\Network\Cors;
use Appwrite\Platform\Appwrite;
@@ -82,7 +82,7 @@ use Utopia\Validator\Text;
Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, Bus $bus, Executor $executor, GeoRecord $geoRecord, callable $getIsResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock)
function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, Bus $bus, Executor $executor, Geo $geo, callable $getIsResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock)
{
$host = $request->getHostname();
if (!empty($previewHostname)) {
@@ -417,10 +417,13 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
$headers['x-appwrite-trigger'] = 'http';
$headers['x-appwrite-user-jwt'] = '';
if (!empty($ip) && !$geoRecord->isEmpty()) {
$headers['x-appwrite-country-code'] = $geoRecord->getCountryCode();
$headers['x-appwrite-continent-code'] = $geoRecord->getContinentCode();
$headers['x-appwrite-continent-eu'] = $geoRecord->isEu() ? 'true' : 'false';
if (!empty($ip)) {
$geoRecord = $geo->get($ip);
if (!$geoRecord->isEmpty()) {
$headers['x-appwrite-country-code'] = $geoRecord->getCountryCode();
$headers['x-appwrite-continent-code'] = $geoRecord->getContinentCode();
$headers['x-appwrite-continent-eu'] = $geoRecord->isEu() ? 'true' : 'false';
}
}
$headersFiltered = [];
@@ -814,10 +817,11 @@ Http::init()
->groups(['api'])
->inject('usage')
->inject('request')
->inject('geoRecord')
->action(function (Context $usage, Request $request, GeoRecord $geoRecord) {
->inject('geo')
->action(function (Context $usage, Request $request, Geo $geo) {
$uri = $request->getURI();
$parts = explode('/', trim($uri, '/'));
$geoRecord = $geo->get($request->getIP());
$country = $geoRecord->isEmpty() ? '' : strtolower($geoRecord->getCountryCode());
$usage
@@ -884,7 +888,7 @@ Http::init()
->inject('getProjectDB')
->inject('locale')
->inject('localeCodes')
->inject('geoRecord')
->inject('geo')
->inject('queueForEvents')
->inject('bus')
->inject('executor')
@@ -899,7 +903,7 @@ Http::init()
->inject('executionsRetentionCount')
->inject('lock')
->inject('params')
->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, GeoRecord $geoRecord, Event $queueForEvents, Bus $bus, Executor $executor, array $platform, callable $getIsResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock, array $params) {
->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, Geo $geo, Event $queueForEvents, Bus $bus, Executor $executor, array $platform, callable $getIsResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock, array $params) {
/*
* Appwrite Router
*/
@@ -907,7 +911,7 @@ Http::init()
$platformHostnames = $platform['hostnames'] ?? [];
// Only run Router when external domain
if (!\in_array($hostname, $platformHostnames) || !empty($previewHostname)) {
if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geoRecord, $getIsResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount, $lock)) {
if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geo, $getIsResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount, $lock)) {
$utopia->match($request)?->route->label('router', true);
}
}
@@ -1207,7 +1211,7 @@ Http::options()
->inject('queueForEvents')
->inject('bus')
->inject('executor')
->inject('geoRecord')
->inject('geo')
->inject('getIsResourceBlocked')
->inject('platform')
->inject('previewHostname')
@@ -1219,14 +1223,14 @@ Http::options()
->inject('publisherForDeletes')
->inject('executionsRetentionCount')
->inject('lock')
->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, GeoRecord $geoRecord, callable $getIsResourceBlocked, array $platform, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock) {
->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Geo $geo, callable $getIsResourceBlocked, array $platform, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock) {
/*
* Appwrite Router
*/
$platformHostnames = $platform['hostnames'] ?? [];
// Only run Router when external domain
if (!in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geoRecord, $getIsResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount, $lock)) {
if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geo, $getIsResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount, $lock)) {
$utopia->match($request)?->route->label('router', true);
}
}
@@ -1614,7 +1618,7 @@ Http::get('/robots.txt')
->inject('queueForEvents')
->inject('bus')
->inject('executor')
->inject('geoRecord')
->inject('geo')
->inject('getIsResourceBlocked')
->inject('platform')
->inject('previewHostname')
@@ -1623,13 +1627,13 @@ Http::get('/robots.txt')
->inject('publisherForDeletes')
->inject('executionsRetentionCount')
->inject('lock')
->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, GeoRecord $geoRecord, callable $getIsResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock) {
->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Geo $geo, callable $getIsResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock) {
$platformHostnames = $platform['hostnames'] ?? [];
if (in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
$template = new View(__DIR__ . '/../views/general/robots.phtml');
$response->text($template->render(false));
} else {
if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geoRecord, $getIsResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount, $lock)) {
if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geo, $getIsResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount, $lock)) {
$utopia->match($request)?->route->label('router', true);
}
}
@@ -1649,7 +1653,7 @@ Http::get('/humans.txt')
->inject('queueForEvents')
->inject('bus')
->inject('executor')
->inject('geoRecord')
->inject('geo')
->inject('getIsResourceBlocked')
->inject('platform')
->inject('previewHostname')
@@ -1658,13 +1662,13 @@ Http::get('/humans.txt')
->inject('publisherForDeletes')
->inject('executionsRetentionCount')
->inject('lock')
->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, GeoRecord $geoRecord, callable $getIsResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock) {
->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Geo $geo, callable $getIsResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, Lock $lock) {
$platformHostnames = $platform['hostnames'] ?? [];
if (in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
$template = new View(__DIR__ . '/../views/general/humans.phtml');
$response->text($template->render(false));
} else {
if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geoRecord, $getIsResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount, $lock)) {
if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geo, $getIsResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount, $lock)) {
$utopia->match($request)?->route->label('router', true);
}
}
+4 -4
View File
@@ -1,7 +1,7 @@
<?php
use Appwrite\Extend\Exception;
use Appwrite\Locale\GeoRecord;
use Appwrite\Locale\Geo;
use Appwrite\Utopia\Database\Documents\User;
use Appwrite\Utopia\Request;
use Utopia\Config\Config;
@@ -36,16 +36,16 @@ Http::init()
->inject('route')
->inject('request')
->inject('project')
->inject('geoRecord')
->inject('geo')
->inject('user')
->inject('authorization')
->action(function (Route $route, Request $request, Document $project, GeoRecord $geoRecord, User $user, Authorization $authorization) {
->action(function (Route $route, Request $request, Document $project, Geo $geo, User $user, Authorization $authorization) {
$denylist = System::getEnv('_APP_CONSOLE_COUNTRIES_DENYLIST', '');
if (!empty($denylist) && $project->getId() === 'console') {
// A missing or unknown geo lookup ("--") is treated as allowed and falls
// through to the membership check below, matching the pre-geo-service behavior.
$countries = \array_map('strtoupper', \array_map('trim', explode(',', $denylist)));
$country = \strtoupper($geoRecord->getCountryCode());
$country = \strtoupper($geo->get($request->getIP())->getCountryCode());
if (in_array($country, $countries, true)) {
throw new Exception(Exception::GENERAL_REGION_ACCESS_DENIED);
}
+6
View File
@@ -5,6 +5,7 @@ require_once __DIR__ . '/init/span.php';
$setRequestContext = require __DIR__ . '/init/resources/request.php';
use Appwrite\Locale\Geo;
use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response;
use Swoole\Constant;
@@ -45,9 +46,14 @@ $certifiedDomains = new Table(100_000);
$certifiedDomains->column('value', Table::TYPE_INT, 1);
$certifiedDomains->create();
$geoRecords = new Table(Geo::CACHE_SIZE);
$geoRecords->column('value', Table::TYPE_STRING, Geo::CACHE_VALUE_SIZE);
$geoRecords->create();
global $container;
$container->set('riskyDomains', fn () => $riskyDomains);
$container->set('certifiedDomains', fn () => $certifiedDomains);
$container->set('geoRecords', fn () => $geoRecords);
$container->set('pools', function ($register) {
return $register->get('pools');
}, ['register']);
-2
View File
@@ -361,8 +361,6 @@ function getDevice(string $root, string $connection = ''): Device
}
}
$container->set('geodb', fn ($register) => $register->get('geodb'), ['register']);
$container->set('passwordsDictionary', fn ($register) => $register->get('passwordsDictionary'), ['register']);
$container->set('servers', function () {
+8 -77
View File
@@ -15,7 +15,7 @@ use Appwrite\Event\Webhook;
use Appwrite\Extend\Exception;
use Appwrite\Functions\EventProcessor;
use Appwrite\GraphQL\Schema;
use Appwrite\Locale\GeoRecord;
use Appwrite\Locale\Geo;
use Appwrite\Locking\Lock;
use Appwrite\Network\Cors;
use Appwrite\Network\Platform;
@@ -28,6 +28,7 @@ use Appwrite\Utopia\Database\Documents\User;
use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response;
use OpenRuntimes\Orchestrator\Jobs;
use Swoole\Table;
use Utopia\Agents\Adapters\Appwrite as AppwriteAdapter;
use Utopia\Agents\Agent;
use Utopia\Audit\Adapter\Database as AdapterDatabase;
@@ -40,7 +41,6 @@ use Utopia\Auth\Proofs\Token;
use Utopia\Auth\Store;
use Utopia\Cache\Cache;
use Utopia\Config\Config;
use Utopia\Console;
use Utopia\Database\Database;
use Utopia\Database\DateTime as DatabaseDateTime;
use Utopia\Database\Document;
@@ -48,7 +48,6 @@ use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\DI\Container;
use Utopia\Domains\Domain;
use Utopia\Fetch\Client;
use Utopia\Http\Http;
use Utopia\Locale\Locale;
use Utopia\Lock\Distributed as DistributedLock;
@@ -1215,78 +1214,10 @@ return function (Container $context): void {
return new Agent($adapter);
}, ['register']);
$context->set('geoRecord', function ($request, Locale $locale, callable $getGeoForIp) {
$ip = $request->getIp();
if (!filter_var($ip, FILTER_VALIDATE_IP)) {
Console::warning("Invalid IP address: {$ip}");
$ip = '0.0.0.0';
}
return $getGeoForIp($locale, $ip);
}, ['request', 'locale', 'getGeoForIp']);
$context->set('getGeoForIp', function () {
return function (Locale $locale, string $ip): GeoRecord {
$record = null;
$geoEndpoint = System::getEnv('_APP_GEO_ENDPOINT', '');
$geoSecret = System::getEnv('_APP_GEO_SECRET', '');
if (!empty($geoEndpoint) && !empty($geoSecret) && filter_var($ip, FILTER_VALIDATE_IP)) {
try {
$client = new Client();
$client->addHeader('Authorization', 'Bearer ' . $geoSecret);
$client->setTimeout(3000);
$response = $client->fetch(\rtrim($geoEndpoint, '/') . "/ips/{$ip}", Client::METHOD_GET);
if ($response->getStatusCode() === 200) {
$body = $response->json();
if (\is_array($body)) {
$record = $body;
}
}
} catch (\Throwable $th) {
Console::warning('Geo service unavailable: ' . $th->getMessage());
}
}
$countryCode = \strtoupper($record['countryCode'] ?? '--');
$continentCode = \strtoupper($record['continentCode'] ?? '--');
$eu = \array_map('strtoupper', Config::getParam('locale-eu'));
$currencies = Config::getParam('locale-currencies');
$currency = null;
if ($countryCode !== '--') {
foreach ($currencies as $element) {
if (isset($element['locations'], $element['code']) && \in_array($countryCode, $element['locations'], true)) {
$currency = $element['code'];
break;
}
}
}
$autonomousSystemNumber = $record['autonomousSystemNumber'] ?? null;
return (new GeoRecord([
'ip' => $ip,
'countryCode' => $countryCode,
'continentCode' => $continentCode,
'eu' => $countryCode !== '--' && \in_array($countryCode, $eu, true),
'currency' => $currency,
'latitude' => $record['latitude'] ?? null,
'longitude' => $record['longitude'] ?? null,
'timeZone' => $record['timeZone'] ?? null,
'weatherCode' => $record['weatherCode'] ?? null,
'postalCode' => $record['postalCode'] ?? null,
'autonomousSystemNumber' => $autonomousSystemNumber === null ? null : (string) $autonomousSystemNumber,
'autonomousSystemOrganization' => $record['autonomousSystemOrganization'] ?? null,
'connectionType' => $record['connection'] ?? null,
'connectionUsageType' => $record['user'] ?? $record['type'] ?? null,
'connectionOrganization' => $record['organization'] ?? null,
'isp' => $record['isp'] ?? null,
]))
->setLocale($locale);
};
}, []);
$context->set('geo', fn (Locale $locale, Table $geoRecords) => new Geo(
System::getEnv('_APP_GEO_ENDPOINT', ''),
System::getEnv('_APP_GEO_SECRET', ''),
$locale,
$geoRecords
), ['locale', 'geoRecords']);
};
+144
View File
@@ -0,0 +1,144 @@
<?php
namespace Appwrite\Locale;
use Swoole\Table;
use Utopia\Config\Config;
use Utopia\Console;
use Utopia\Fetch\Client;
use Utopia\Locale\Locale;
class Geo
{
public const CACHE_SIZE = 10_000;
public const CACHE_VALUE_SIZE = 512;
public function __construct(
private string $endpoint,
private string $secret,
private Locale $locale,
private ?Table $cache = null,
) {
}
public function get(string $ip): GeoRecord
{
if (!\filter_var($ip, FILTER_VALIDATE_IP)) {
Console::warning("Invalid IP address: {$ip}");
$ip = '0.0.0.0';
}
$record = $this->cached($ip);
if ($record === null) {
$record = $this->fetch($ip);
if ($record !== null) {
$this->store($ip, $record);
}
}
$countryCode = \strtoupper($record['countryCode'] ?? '--');
$continentCode = \strtoupper($record['continentCode'] ?? '--');
$eu = \array_map('strtoupper', Config::getParam('locale-eu'));
$currencies = Config::getParam('locale-currencies');
$currency = null;
if ($countryCode !== '--') {
foreach ($currencies as $element) {
if (isset($element['locations'], $element['code']) && \in_array($countryCode, $element['locations'], true)) {
$currency = $element['code'];
break;
}
}
}
$autonomousSystemNumber = $record['autonomousSystemNumber'] ?? null;
return (new GeoRecord([
'ip' => $ip,
'countryCode' => $countryCode,
'continentCode' => $continentCode,
'eu' => $countryCode !== '--' && \in_array($countryCode, $eu, true),
'currency' => $currency,
'latitude' => $record['latitude'] ?? null,
'longitude' => $record['longitude'] ?? null,
'timeZone' => $record['timeZone'] ?? null,
'weatherCode' => $record['weatherCode'] ?? null,
'postalCode' => $record['postalCode'] ?? null,
'autonomousSystemNumber' => $autonomousSystemNumber === null ? null : (string) $autonomousSystemNumber,
'autonomousSystemOrganization' => $record['autonomousSystemOrganization'] ?? null,
'connectionType' => $record['connection'] ?? null,
'connectionUsageType' => $record['user'] ?? $record['type'] ?? null,
'connectionOrganization' => $record['organization'] ?? null,
'isp' => $record['isp'] ?? null,
]))
->setLocale($this->locale);
}
/**
* @return array<string, mixed>|null
*/
private function cached(string $ip): ?array
{
$value = $this->cache?->get($ip, 'value');
if (!\is_string($value) || $value === '') {
return null;
}
$record = \json_decode($value, true);
return \is_array($record) ? $record : null;
}
/**
* @param array<string, mixed> $record
*/
private function store(string $ip, array $record): void
{
if ($this->cache === null) {
return;
}
$value = \json_encode($record);
if ($value === false || \strlen($value) > self::CACHE_VALUE_SIZE) {
return;
}
if (!$this->cache->set($ip, ['value' => $value])) {
// Table full — flush so the cache keeps tracking current traffic.
foreach ($this->cache as $key => $row) {
$this->cache->del($key);
}
$this->cache->set($ip, ['value' => $value]);
}
}
/**
* @return array<string, mixed>|null
*/
private function fetch(string $ip): ?array
{
if (empty($this->endpoint) || empty($this->secret)) {
return null;
}
try {
$client = new Client();
$client->addHeader('Authorization', 'Bearer ' . $this->secret);
$client->setTimeout(3000);
$response = $client->fetch(\rtrim($this->endpoint, '/') . "/ips/{$ip}", Client::METHOD_GET);
if ($response->getStatusCode() === 200) {
$body = $response->json();
if (\is_array($body)) {
return $body;
}
}
} catch (\Throwable $th) {
Console::warning('Geo service unavailable: ' . $th->getMessage());
}
return null;
}
}
@@ -14,7 +14,7 @@ use Appwrite\Event\Publisher\Func as FunctionPublisher;
use Appwrite\Extend\Exception;
use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Functions\Validator\Headers;
use Appwrite\Locale\GeoRecord;
use Appwrite\Locale\Geo;
use Appwrite\Platform\Modules\Compute\Base;
use Appwrite\SDK\AuthType;
use Appwrite\SDK\Method;
@@ -101,7 +101,7 @@ class Create extends Base
->inject('user')
->inject('queueForEvents')
->inject('publisherForFunctions')
->inject('geoRecord')
->inject('geo')
->inject('store')
->inject('proofForToken')
->inject('executor')
@@ -129,7 +129,7 @@ class Create extends Base
User $user,
Event $queueForEvents,
FunctionPublisher $publisherForFunctions,
GeoRecord $geoRecord,
Geo $geo,
Store $store,
Token $proofForToken,
Executor $executor,
@@ -251,10 +251,13 @@ class Create extends Base
$ip = $request->getIP();
$headers['x-appwrite-client-ip'] = $ip;
if (!empty($ip) && !$geoRecord->isEmpty()) {
$headers['x-appwrite-country-code'] = $geoRecord->getCountryCode();
$headers['x-appwrite-continent-code'] = $geoRecord->getContinentCode();
$headers['x-appwrite-continent-eu'] = $geoRecord->isEu() ? 'true' : 'false';
if (!empty($ip)) {
$geoRecord = $geo->get($ip);
if (!$geoRecord->isEmpty()) {
$headers['x-appwrite-country-code'] = $geoRecord->getCountryCode();
$headers['x-appwrite-continent-code'] = $geoRecord->getContinentCode();
$headers['x-appwrite-continent-eu'] = $geoRecord->isEu() ? 'true' : 'false';
}
}
$headersFiltered = [];
@@ -5,7 +5,7 @@ namespace Appwrite\Platform\Modules\Teams\Http\Memberships\Status;
use Appwrite\Detector\Detector;
use Appwrite\Event\Event;
use Appwrite\Extend\Exception;
use Appwrite\Locale\GeoRecord;
use Appwrite\Locale\Geo;
use Appwrite\Platform\Action;
use Appwrite\SDK\AuthType;
use Appwrite\SDK\Method;
@@ -70,7 +70,7 @@ class Update extends Action
->inject('dbForProject')
->inject('authorization')
->inject('project')
->inject('geoRecord')
->inject('geo')
->inject('queueForEvents')
->inject('store')
->inject('proofForToken')
@@ -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 $targetUser, Database $dbForProject, Authorization $authorization, $project, GeoRecord $geoRecord, 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, Geo $geo, Event $queueForEvents, Store $store, Token $proofForToken, bool $domainVerification, ?string $cookieDomain)
{
$protocol = $request->getProtocol();
@@ -151,7 +151,7 @@ class Update extends Action
'userAgent' => $request->getUserAgent('UNKNOWN'),
'ip' => $request->getIP(),
'factors' => ['email'],
'countryCode' => \strtolower($geoRecord->getCountryCode()),
'countryCode' => \strtolower($geo->get($request->getIP())->getCountryCode()),
'expire' => DateTime::addSeconds(new \DateTime(), $authDuration)
], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
@@ -5,7 +5,7 @@ namespace Appwrite\Platform\Modules\Users\Http\Users\Sessions;
use Appwrite\Detector\Detector;
use Appwrite\Event\Event;
use Appwrite\Extend\Exception;
use Appwrite\Locale\GeoRecord;
use Appwrite\Locale\Geo;
use Appwrite\Platform\Action;
use Appwrite\SDK\AuthType;
use Appwrite\SDK\Method;
@@ -64,14 +64,14 @@ class Create extends Action
->inject('dbForProject')
->inject('project')
->inject('locale')
->inject('geoRecord')
->inject('geo')
->inject('queueForEvents')
->inject('store')
->inject('proofForToken')
->callback($this->action(...));
}
public function action(string $userId, Request $request, Response $response, Database $dbForProject, Document $project, Locale $locale, GeoRecord $geoRecord, Event $queueForEvents, Store $store, Token $proofForToken): void
public function action(string $userId, Request $request, Response $response, Database $dbForProject, Document $project, Locale $locale, Geo $geo, Event $queueForEvents, Store $store, Token $proofForToken): void
{
$user = $dbForProject->getDocument('users', $userId);
if ($user->isEmpty()) {
@@ -93,7 +93,7 @@ class Create extends Action
'userAgent' => $request->getUserAgent('UNKNOWN'),
'factors' => ['server'],
'ip' => $request->getIP(),
'countryCode' => \strtolower($geoRecord->getCountryCode()),
'countryCode' => \strtolower($geo->get($request->getIP())->getCountryCode()),
'expire' => $expire,
],
$detector->getOS(),