diff --git a/app/http.php b/app/http.php index 4f04eb9a8c..8946e7e624 100644 --- a/app/http.php +++ b/app/http.php @@ -478,7 +478,7 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool if (isset($user) && !$user->isEmpty()) { $log->setUser(new User($user->getId())); } else { - $log->setUser(new User('guest-' . hash('sha256', TrustedIp::extract($request)))); + $log->setUser(new User('guest-' . hash('sha256', TrustedIp::extract($request, System::getEnv('_APP_TRUSTED_HEADERS', 'x-forwarded-for'))))); } $log->setNamespace("http"); diff --git a/app/init/resources.php b/app/init/resources.php index f8c4de6566..9bc4502348 100644 --- a/app/init/resources.php +++ b/app/init/resources.php @@ -861,7 +861,7 @@ App::setResource('servers', function () { }); App::setResource('trustedIp', function (Request $request) { - return TrustedIp::extract($request); + return TrustedIp::extract($request, System::getEnv('_APP_TRUSTED_HEADERS', 'x-forwarded-for')); }, ['request']); App::setResource('promiseAdapter', function ($register) { diff --git a/app/realtime.php b/app/realtime.php index 039563466e..cc4b3df3e4 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -552,7 +552,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, */ $timelimit = $timelimit('url:{url},ip:{ip}', 128, 60); $timelimit - ->setParam('{ip}', TrustedIp::extract($request)) + ->setParam('{ip}', TrustedIp::extract($request, System::getEnv('_APP_TRUSTED_HEADERS', 'x-forwarded-for'))) ->setParam('{url}', $request->getURI()); $abuse = new Abuse($timelimit); diff --git a/src/Appwrite/Network/TrustedIp.php b/src/Appwrite/Network/TrustedIp.php index 59fa35beda..bc84acb3a0 100644 --- a/src/Appwrite/Network/TrustedIp.php +++ b/src/Appwrite/Network/TrustedIp.php @@ -3,7 +3,6 @@ namespace Appwrite\Network; use Appwrite\Utopia\Request; -use Utopia\System\System; class TrustedIp { @@ -17,15 +16,12 @@ class TrustedIp * @return string The trusted client IP address * */ - public static function extract(Request $request): string + public static function extract(Request $request, string $trustedHeaders): string { // Fallback to remote address $remoteAddr = $request->getServer('remote_addr') ?? '0.0.0.0'; - // Fetch and parse the list of trusted headers from configuration - $trustedHeadersConfig = System::getEnv('_APP_TRUSTED_HEADERS', 'x-forwarded-for'); - - $trustedHeaders = explode(',', $trustedHeadersConfig); + $trustedHeaders = explode(',', $trustedHeaders); $trustedHeaders = array_map('trim', $trustedHeaders); $trustedHeaders = array_map('strtolower', $trustedHeaders); $trustedHeaders = array_filter($trustedHeaders);