mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
refactor: move getEnv outside of the class
This commit is contained in:
1 parent
cc6ddc5dcd
commit
100097eb77
4 files changed
+5
-9
No files matched your search
+1
-1
@@ -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");
|
||||
|
||||
@@ -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) {
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user