mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge pull request #12519 from appwrite/feat/migrate-http-rc5
chore(http): upgrade utopia-php/http to 2.0.0-rc5
This commit is contained in:
27 files changed
+127
-130
No files matched your search
@@ -122,11 +122,11 @@ Http::post('/v1/graphql/mutation')
|
||||
->action(function (Request $request, Response $response, GQLSchema $schema, Adapter $promiseAdapter) {
|
||||
$query = $request->getParams();
|
||||
|
||||
if ($request->getHeader('x-sdk-graphql') == 'true') {
|
||||
if ($request->getHeaderLine('x-sdk-graphql') == 'true') {
|
||||
$query = $query['query'];
|
||||
}
|
||||
|
||||
$type = $request->getHeader('content-type');
|
||||
$type = $request->getHeaderLine('content-type');
|
||||
|
||||
if (\str_starts_with($type, 'application/graphql')) {
|
||||
$query = parseGraphql($request);
|
||||
@@ -173,11 +173,11 @@ Http::post('/v1/graphql')
|
||||
->action(function (Request $request, Response $response, GQLSchema $schema, Adapter $promiseAdapter) {
|
||||
$query = $request->getParams();
|
||||
|
||||
if ($request->getHeader('x-sdk-graphql') == 'true') {
|
||||
if ($request->getHeaderLine('x-sdk-graphql') == 'true') {
|
||||
$query = $query['query'];
|
||||
}
|
||||
|
||||
$type = $request->getHeader('content-type');
|
||||
$type = $request->getHeaderLine('content-type');
|
||||
|
||||
if (\str_starts_with($type, 'application/graphql')) {
|
||||
$query = parseGraphql($request);
|
||||
|
||||
@@ -293,7 +293,12 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
|
||||
$body = $swooleRequest->getContent() ?: '';
|
||||
$method = $swooleRequest->server['request_method'];
|
||||
|
||||
$requestHeaders = $request->getHeaders();
|
||||
// getHeaders() follows PSR-7 and returns each header as a list of values;
|
||||
// collapse to single-line strings for the function/site header map below.
|
||||
$requestHeaders = \array_map(
|
||||
static fn (array $values) => \implode(', ', $values),
|
||||
$request->getHeaders()
|
||||
);
|
||||
|
||||
if ($resource->isEmpty() || !$resource->getAttribute('enabled')) {
|
||||
if ($type === 'function') {
|
||||
@@ -803,7 +808,7 @@ Http::init()
|
||||
->inject('request')
|
||||
->action(function (Document $project, Request $request) {
|
||||
if ($project->getId() === 'console') {
|
||||
$message = empty($request->getHeader('x-appwrite-project')) ?
|
||||
$message = empty($request->getHeaderLine('x-appwrite-project')) ?
|
||||
'No Appwrite project was specified. Please specify your project ID when initializing your Appwrite SDK.' :
|
||||
'This endpoint is not available for the console project. The Appwrite Console is a reserved project ID and cannot be used with the Appwrite SDKs and APIs. Please check if your project ID is correct.';
|
||||
throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, $message);
|
||||
@@ -861,7 +866,7 @@ Http::init()
|
||||
return;
|
||||
}
|
||||
|
||||
$requestFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
|
||||
$requestFormat = $request->getHeaderLine('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
|
||||
if ($requestFormat) {
|
||||
if (version_compare($requestFormat, '1.4.0', '<')) {
|
||||
$request->addFilter(new RequestV16());
|
||||
@@ -899,7 +904,7 @@ Http::init()
|
||||
}
|
||||
}
|
||||
|
||||
$localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
|
||||
$localeParam = (string) $request->getParam('locale', $request->getHeaderLine('x-appwrite-locale', ''));
|
||||
if (\in_array($localeParam, $localeCodes)) {
|
||||
$locale->setDefault($localeParam);
|
||||
}
|
||||
@@ -919,7 +924,7 @@ Http::init()
|
||||
/*
|
||||
* Response format
|
||||
*/
|
||||
$responseFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
|
||||
$responseFormat = $request->getHeaderLine('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
|
||||
if ($responseFormat) {
|
||||
if (version_compare($responseFormat, '1.9.5', '<')) {
|
||||
$response->addFilter(new ResponseV26());
|
||||
@@ -1006,7 +1011,7 @@ Http::init()
|
||||
|
||||
// Application level CSRF protection
|
||||
$origin = $request->getOrigin();
|
||||
if (empty($origin) || !$devKey->isEmpty() || !empty($request->getHeader('x-appwrite-key'))) {
|
||||
if (empty($origin) || !$devKey->isEmpty() || !empty($request->getHeaderLine('x-appwrite-key'))) {
|
||||
return;
|
||||
}
|
||||
$route = $request->getRoute();
|
||||
@@ -1315,7 +1320,7 @@ Http::error()
|
||||
}
|
||||
|
||||
$log->addTag('hostname', $request->getHostname());
|
||||
$log->addTag('locale', (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', '')));
|
||||
$log->addTag('locale', (string)$request->getParam('locale', $request->getHeaderLine('x-appwrite-locale', '')));
|
||||
|
||||
$log->addExtra('file', $error->getFile());
|
||||
$log->addExtra('line', $error->getLine());
|
||||
|
||||
@@ -46,7 +46,7 @@ Http::get('/v1/mock/tests/locale')
|
||||
->inject('request')
|
||||
->inject('response')
|
||||
->action(function (Locale $locale, array $localeCodes, Request $request, Response $response) {
|
||||
$localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
|
||||
$localeParam = (string) $request->getParam('locale', $request->getHeaderLine('x-appwrite-locale', ''));
|
||||
if (\in_array($localeParam, $localeCodes)) {
|
||||
$locale->setDefault($localeParam);
|
||||
}
|
||||
|
||||
@@ -201,19 +201,19 @@ Http::init()
|
||||
if (! empty($apiKey->getProjectId())) {
|
||||
$dbKey = $project->find(
|
||||
key: 'secret',
|
||||
find: $request->getHeader('x-appwrite-key', ''),
|
||||
find: $request->getHeaderLine('x-appwrite-key', ''),
|
||||
subject: 'keys'
|
||||
);
|
||||
} elseif (! empty($apiKey->getUserId())) {
|
||||
$dbKey = $user->find(
|
||||
key: 'secret',
|
||||
find: $request->getHeader('x-appwrite-key', ''),
|
||||
find: $request->getHeaderLine('x-appwrite-key', ''),
|
||||
subject: 'keys'
|
||||
);
|
||||
} elseif (! empty($apiKey->getTeamId())) {
|
||||
$dbKey = $team->find(
|
||||
key: 'secret',
|
||||
find: $request->getHeader('x-appwrite-key', ''),
|
||||
find: $request->getHeaderLine('x-appwrite-key', ''),
|
||||
subject: 'keys'
|
||||
);
|
||||
}
|
||||
@@ -231,7 +231,7 @@ Http::init()
|
||||
}
|
||||
|
||||
$sdkValidator = new WhiteList($servers, true);
|
||||
$sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
|
||||
$sdk = $request->getHeaderLine('x-sdk-name', 'UNKNOWN');
|
||||
|
||||
if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
|
||||
$sdks = $dbKey->getAttribute('sdks', []);
|
||||
|
||||
+1
-1
@@ -578,7 +578,7 @@ $swoole->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swoo
|
||||
$log->addTag('code', $th->getCode());
|
||||
// $log->addTag('projectId', $project->getId()); // TODO: Figure out how to get ProjectID, if it becomes relevant
|
||||
$log->addTag('hostname', $request->getHostname());
|
||||
$log->addTag('locale', (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', '')));
|
||||
$log->addTag('locale', (string)$request->getParam('locale', $request->getHeaderLine('x-appwrite-locale', '')));
|
||||
|
||||
$log->addExtra('file', $th->getFile());
|
||||
$log->addExtra('line', $th->getLine());
|
||||
|
||||
@@ -24,7 +24,7 @@ use Utopia\Validator\WhiteList;
|
||||
*/
|
||||
return function (Container $container): void {
|
||||
$getProjectId = static function (Request $request): string {
|
||||
$projectId = $request->getHeader('x-appwrite-project', '');
|
||||
$projectId = $request->getHeaderLine('x-appwrite-project', '');
|
||||
|
||||
if (!empty($projectId)) {
|
||||
return $projectId;
|
||||
@@ -36,7 +36,7 @@ return function (Container $container): void {
|
||||
};
|
||||
|
||||
$getMode = static function (Request $request, Document $project) use ($getProjectId): string {
|
||||
$mode = $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
|
||||
$mode = $request->getParam('mode', $request->getHeaderLine('x-appwrite-mode', APP_MODE_DEFAULT));
|
||||
$projectId = $getProjectId($request);
|
||||
|
||||
if (!empty($projectId) && $project->getId() !== $projectId) {
|
||||
@@ -113,7 +113,7 @@ return function (Container $container): void {
|
||||
};
|
||||
|
||||
$findDevKey = static function (Request $request, Document $project, array $servers, Authorization $authorization) use ($getDbForPlatform): Document {
|
||||
$devKey = $request->getHeader('x-appwrite-dev-key', $request->getParam('devKey', ''));
|
||||
$devKey = $request->getHeaderLine('x-appwrite-dev-key', $request->getParam('devKey', ''));
|
||||
$key = $project->find('secret', $devKey, 'devKeys');
|
||||
|
||||
if (!$key) {
|
||||
@@ -137,7 +137,7 @@ return function (Container $container): void {
|
||||
}
|
||||
|
||||
$sdkValidator = new WhiteList($servers, true);
|
||||
$sdk = \strtolower($request->getHeader('x-sdk-name', 'UNKNOWN'));
|
||||
$sdk = \strtolower($request->getHeaderLine('x-sdk-name', 'UNKNOWN'));
|
||||
|
||||
if ($sdk !== 'unknown' && $sdkValidator->isValid($sdk)) {
|
||||
$sdks = $key->getAttribute('sdks', []);
|
||||
@@ -233,7 +233,7 @@ return function (Container $container): void {
|
||||
);
|
||||
|
||||
if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
|
||||
$sessionHeader = $request->getHeader('x-appwrite-session', '');
|
||||
$sessionHeader = $request->getHeaderLine('x-appwrite-session', '');
|
||||
|
||||
if (!empty($sessionHeader)) {
|
||||
$store->decode($sessionHeader);
|
||||
@@ -241,7 +241,7 @@ return function (Container $container): void {
|
||||
}
|
||||
|
||||
if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
|
||||
$fallback = \json_decode($request->getHeader('x-fallback-cookies', ''), true);
|
||||
$fallback = \json_decode($request->getHeaderLine('x-fallback-cookies', ''), true);
|
||||
$store->decode((\is_array($fallback) && isset($fallback[$store->getKey()])) ? $fallback[$store->getKey()] : '');
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ return function (Container $container): void {
|
||||
$user = new User([]);
|
||||
}
|
||||
|
||||
$authJWT = $request->getHeader('x-appwrite-jwt', '');
|
||||
$authJWT = $request->getHeaderLine('x-appwrite-jwt', '');
|
||||
if (!empty($authJWT) && !$project->isEmpty()) {
|
||||
if (!$user->isEmpty()) {
|
||||
throw new Exception(Exception::USER_JWT_AND_COOKIE_SET);
|
||||
@@ -300,8 +300,8 @@ return function (Container $container): void {
|
||||
}
|
||||
}
|
||||
|
||||
$accountKey = $request->getHeader('x-appwrite-key', '');
|
||||
$accountKeyUserId = $request->getHeader('x-appwrite-user', '');
|
||||
$accountKey = $request->getHeaderLine('x-appwrite-key', '');
|
||||
$accountKeyUserId = $request->getHeaderLine('x-appwrite-user', '');
|
||||
|
||||
if (!empty($accountKeyUserId) && !empty($accountKey)) {
|
||||
if (!$user->isEmpty()) {
|
||||
@@ -329,9 +329,9 @@ return function (Container $container): void {
|
||||
|
||||
// Query params mirror the header fallback pattern used by ?project= and ?devKey=,
|
||||
// allowing Console to embed impersonation in direct file/image URLs where headers cannot be set.
|
||||
$impersonateUserId = $request->getHeader('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', '')));
|
||||
$impersonateEmail = $request->getHeader('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', '')));
|
||||
$impersonatePhone = $request->getHeader('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', '')));
|
||||
$impersonateUserId = $request->getHeaderLine('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', '')));
|
||||
$impersonateEmail = $request->getHeaderLine('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', '')));
|
||||
$impersonatePhone = $request->getHeaderLine('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', '')));
|
||||
|
||||
if (!$user->isEmpty() && $user->getAttribute('impersonator', false)) {
|
||||
$userDb = ($mode === APP_MODE_ADMIN || $project->getId() === 'console') ? $dbForPlatform : $dbForProject;
|
||||
|
||||
@@ -387,7 +387,7 @@ return function (Container $context): void {
|
||||
|
||||
// Get session from header for SSR clients
|
||||
if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
|
||||
$sessionHeader = $request->getHeader('x-appwrite-session', '');
|
||||
$sessionHeader = $request->getHeaderLine('x-appwrite-session', '');
|
||||
|
||||
if (! empty($sessionHeader)) {
|
||||
$store->decode($sessionHeader);
|
||||
@@ -399,7 +399,7 @@ return function (Container $context): void {
|
||||
|
||||
if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
|
||||
$response->addHeader('X-Debug-Fallback', 'true');
|
||||
$fallback = $request->getHeader('x-fallback-cookies', '');
|
||||
$fallback = $request->getHeaderLine('x-fallback-cookies', '');
|
||||
$fallback = \json_decode($fallback, true);
|
||||
$store->decode(((is_array($fallback) && isset($fallback[$store->getKey()])) ? $fallback[$store->getKey()] : ''));
|
||||
}
|
||||
@@ -432,7 +432,7 @@ return function (Container $context): void {
|
||||
$user = new User([]);
|
||||
}
|
||||
|
||||
$authJWT = $request->getHeader('x-appwrite-jwt', '');
|
||||
$authJWT = $request->getHeaderLine('x-appwrite-jwt', '');
|
||||
if (! empty($authJWT) && ! $project->isEmpty()) { // JWT authentication
|
||||
if (! $user->isEmpty()) {
|
||||
throw new Exception(Exception::USER_JWT_AND_COOKIE_SET);
|
||||
@@ -462,8 +462,8 @@ return function (Container $context): void {
|
||||
}
|
||||
|
||||
// Account based on account API key
|
||||
$accountKey = $request->getHeader('x-appwrite-key', '');
|
||||
$accountKeyUserId = $request->getHeader('x-appwrite-user', '');
|
||||
$accountKey = $request->getHeaderLine('x-appwrite-key', '');
|
||||
$accountKeyUserId = $request->getHeaderLine('x-appwrite-user', '');
|
||||
if (! empty($accountKeyUserId) && ! empty($accountKey)) {
|
||||
if (! $user->isEmpty()) {
|
||||
throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
|
||||
@@ -491,9 +491,9 @@ return function (Container $context): void {
|
||||
// Impersonation: if current user has impersonator capability and headers/params are set, act as another user
|
||||
// Query params mirror the header fallback pattern used by ?project= and ?devKey=,
|
||||
// allowing Console to embed impersonation in direct file/image URLs where headers cannot be set.
|
||||
$impersonateUserId = $request->getHeader('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', '')));
|
||||
$impersonateEmail = $request->getHeader('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', '')));
|
||||
$impersonatePhone = $request->getHeader('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', '')));
|
||||
$impersonateUserId = $request->getHeaderLine('x-appwrite-impersonate-user-id', (string)($request->getParam('impersonateuserid', '') ?: $request->getParam('impersonateUserId', '')));
|
||||
$impersonateEmail = $request->getHeaderLine('x-appwrite-impersonate-user-email', (string)($request->getParam('impersonateemail', '') ?: $request->getParam('impersonateEmail', '')));
|
||||
$impersonatePhone = $request->getHeaderLine('x-appwrite-impersonate-user-phone', (string)($request->getParam('impersonatephone', '') ?: $request->getParam('impersonatePhone', '')));
|
||||
if (!$user->isEmpty() && $user->getAttribute('impersonator', false)) {
|
||||
$userDb = (APP_MODE_ADMIN === $mode || $project->getId() === 'console') ? $dbForPlatform : $dbForProject;
|
||||
$targetUser = null;
|
||||
@@ -525,10 +525,10 @@ return function (Container $context): void {
|
||||
/** @var Appwrite\Utopia\Request $request */
|
||||
/** @var Utopia\Database\Database $dbForPlatform */
|
||||
/** @var Utopia\Database\Document $console */
|
||||
$projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
|
||||
$projectId = $request->getParam('project', $request->getHeaderLine('x-appwrite-project', ''));
|
||||
// Realtime channel "project" can send project=Query array
|
||||
if (! \is_string($projectId)) {
|
||||
$projectId = $request->getHeader('x-appwrite-project', '');
|
||||
$projectId = $request->getHeaderLine('x-appwrite-project', '');
|
||||
}
|
||||
|
||||
// Backwards compatibility for new services, originally project resources
|
||||
@@ -920,9 +920,9 @@ return function (Container $context): void {
|
||||
* - 'default' => Requests for Client and Server Side
|
||||
* - 'admin' => Request from the Console on non-console projects
|
||||
*/
|
||||
$mode = $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
|
||||
$mode = $request->getParam('mode', $request->getHeaderLine('x-appwrite-mode', APP_MODE_DEFAULT));
|
||||
|
||||
$projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
|
||||
$projectId = $request->getParam('project', $request->getHeaderLine('x-appwrite-project', ''));
|
||||
if (!empty($projectId) && $project->getId() !== $projectId) {
|
||||
$mode = APP_MODE_ADMIN;
|
||||
}
|
||||
@@ -932,7 +932,7 @@ return function (Container $context): void {
|
||||
|
||||
$context->set('requestTimestamp', function ($request) {
|
||||
// TODO: Move this to the Request class itself
|
||||
$timestampHeader = $request->getHeader('x-appwrite-timestamp');
|
||||
$timestampHeader = $request->getHeaderLine('x-appwrite-timestamp');
|
||||
$requestTimestamp = null;
|
||||
if (! empty($timestampHeader)) {
|
||||
try {
|
||||
@@ -946,7 +946,7 @@ return function (Container $context): void {
|
||||
}, ['request']);
|
||||
|
||||
$context->set('devKey', function (Request $request, Document $project, array $servers, Database $dbForPlatform, Authorization $authorization) {
|
||||
$devKey = $request->getHeader('x-appwrite-dev-key', $request->getParam('devKey', ''));
|
||||
$devKey = $request->getHeaderLine('x-appwrite-dev-key', $request->getParam('devKey', ''));
|
||||
|
||||
// Check if given key match project's development keys
|
||||
$key = $project->find('secret', $devKey, 'devKeys');
|
||||
@@ -972,7 +972,7 @@ return function (Container $context): void {
|
||||
|
||||
// add sdk to key
|
||||
$sdkValidator = new WhiteList($servers, true);
|
||||
$sdk = \strtolower($request->getHeader('x-sdk-name', 'UNKNOWN'));
|
||||
$sdk = \strtolower($request->getHeaderLine('x-sdk-name', 'UNKNOWN'));
|
||||
|
||||
if ($sdk !== 'unknown' && $sdkValidator->isValid($sdk)) {
|
||||
$sdks = $key->getAttribute('sdks', []);
|
||||
@@ -1001,7 +1001,7 @@ return function (Container $context): void {
|
||||
} else {
|
||||
$route = $utopia->match($request)?->route;
|
||||
$path = ! empty($route) ? $route->getPath() : $request->getURI();
|
||||
$orgHeader = $request->getHeader('x-appwrite-organization', '');
|
||||
$orgHeader = $request->getHeaderLine('x-appwrite-organization', '');
|
||||
if (str_starts_with($path, '/v1/projects/:projectId')) {
|
||||
$uri = $request->getURI();
|
||||
$pid = explode('/', $uri)[3];
|
||||
@@ -1047,7 +1047,7 @@ return function (Container $context): void {
|
||||
}
|
||||
|
||||
if ($allowed) {
|
||||
$host = $request->getQuery('appwrite-hostname', $request->getHeader('x-appwrite-hostname', '')) ?? '';
|
||||
$host = $request->getQuery('appwrite-hostname', $request->getHeaderLine('x-appwrite-hostname', '')) ?? '';
|
||||
if (! empty($host)) {
|
||||
return $host;
|
||||
}
|
||||
@@ -1057,7 +1057,7 @@ return function (Container $context): void {
|
||||
}, ['request', 'apiKey']);
|
||||
|
||||
$context->set('apiKey', function (Request $request, Document $project, Document $team, Document $user): ?Key {
|
||||
$key = $request->getHeader('x-appwrite-key');
|
||||
$key = $request->getHeaderLine('x-appwrite-key');
|
||||
|
||||
if (empty($key)) {
|
||||
return null;
|
||||
@@ -1065,9 +1065,9 @@ return function (Container $context): void {
|
||||
|
||||
$key = Key::decode($project, $team, $user, $key);
|
||||
|
||||
$userHeader = $request->getHeader('x-appwrite-user');
|
||||
$organizationHeader = $request->getHeader('x-appwrite-organization');
|
||||
$projectHeader = $request->getHeader('x-appwrite-project');
|
||||
$userHeader = $request->getHeaderLine('x-appwrite-user');
|
||||
$organizationHeader = $request->getHeaderLine('x-appwrite-organization');
|
||||
$projectHeader = $request->getHeaderLine('x-appwrite-project');
|
||||
|
||||
if (! empty($key->getProjectId())) {
|
||||
if (empty($projectHeader) || $projectHeader !== $key->getProjectId()) {
|
||||
@@ -1170,7 +1170,7 @@ return function (Container $context): void {
|
||||
['host' => \gethostname(), 'project' => $project->getId()]
|
||||
);
|
||||
|
||||
$timeout = \intval($request->getHeader('x-appwrite-timeout'));
|
||||
$timeout = \intval($request->getHeaderLine('x-appwrite-timeout'));
|
||||
if (!empty($timeout) && Http::isDevelopment()) {
|
||||
$database->setTimeout($timeout);
|
||||
}
|
||||
|
||||
Generated
+6
-6
@@ -4106,16 +4106,16 @@
|
||||
},
|
||||
{
|
||||
"name": "utopia-php/http",
|
||||
"version": "2.0.0-rc4",
|
||||
"version": "2.0.0-rc5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/utopia-php/http.git",
|
||||
"reference": "0396a959c6a3be7c16b4b72283347327a75d1f92"
|
||||
"reference": "ec968c1fd7a4281d8febb3ed771207be0b852b14"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/utopia-php/http/zipball/0396a959c6a3be7c16b4b72283347327a75d1f92",
|
||||
"reference": "0396a959c6a3be7c16b4b72283347327a75d1f92",
|
||||
"url": "https://api.github.com/repos/utopia-php/http/zipball/ec968c1fd7a4281d8febb3ed771207be0b852b14",
|
||||
"reference": "ec968c1fd7a4281d8febb3ed771207be0b852b14",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4156,9 +4156,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/utopia-php/http/issues",
|
||||
"source": "https://github.com/utopia-php/http/tree/2.0.0-rc4"
|
||||
"source": "https://github.com/utopia-php/http/tree/2.0.0-rc5"
|
||||
},
|
||||
"time": "2026-06-02T04:17:22+00:00"
|
||||
"time": "2026-06-04T13:35:09+00:00"
|
||||
},
|
||||
{
|
||||
"name": "utopia-php/image",
|
||||
|
||||
@@ -40,8 +40,9 @@ class Resolvers
|
||||
);
|
||||
}
|
||||
|
||||
// Response headers follow PSR-7: keys are lowercased and values are lists.
|
||||
$headers = $from->getHeaders();
|
||||
$fallbackCookies = $headers['X-Fallback-Cookies'] ?? null;
|
||||
$fallbackCookies = $headers['x-fallback-cookies'] ?? null;
|
||||
if ($fallbackCookies === null) {
|
||||
return;
|
||||
}
|
||||
@@ -347,7 +348,7 @@ class Resolvers
|
||||
$request->addHeader('x-appwrite-source', 'graphql');
|
||||
|
||||
// Drop json content type so post args are used directly.
|
||||
if (\str_starts_with($request->getHeader('content-type'), 'application/json')) {
|
||||
if (\str_starts_with($request->getHeaderLine('content-type'), 'application/json')) {
|
||||
$request->removeHeader('content-type');
|
||||
}
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ class Install extends Action
|
||||
Config $config,
|
||||
array $paths
|
||||
): void {
|
||||
$acceptHeader = $request->getHeader('accept');
|
||||
$acceptHeader = $request->getHeaderLine('accept');
|
||||
$wantsStream = stripos($acceptHeader, 'text/event-stream') !== false;
|
||||
|
||||
if ($wantsStream) {
|
||||
|
||||
@@ -38,7 +38,7 @@ class Validate extends Action
|
||||
public static function validateCsrf(Request $request): bool
|
||||
{
|
||||
$cookie = $request->getCookie(Server::CSRF_COOKIE);
|
||||
$header = $request->getHeader('x-appwrite-installer-csrf');
|
||||
$header = $request->getHeaderLine('x-appwrite-installer-csrf');
|
||||
|
||||
return $cookie !== '' && $header !== '' && hash_equals($cookie, $header);
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ class Timeout extends Action
|
||||
->inject('request')
|
||||
->inject('dbForProject')
|
||||
->callback(function (Request $request, Database $dbForProject) {
|
||||
$timeout = \intval($request->getHeader('x-appwrite-timeout'));
|
||||
$timeout = \intval($request->getHeaderLine('x-appwrite-timeout'));
|
||||
|
||||
if (!empty($timeout) && Http::isDevelopment()) {
|
||||
$dbForProject->setTimeout($timeout);
|
||||
|
||||
@@ -166,7 +166,7 @@ class Create extends Action
|
||||
throw new Exception(Exception::STORAGE_FILE_TYPE_UNSUPPORTED);
|
||||
}
|
||||
|
||||
$contentRange = $request->getHeader('content-range');
|
||||
$contentRange = $request->getHeaderLine('content-range');
|
||||
$deploymentId = ID::unique();
|
||||
$chunk = 1;
|
||||
$chunks = 1;
|
||||
@@ -175,7 +175,7 @@ class Create extends Action
|
||||
$start = $request->getContentRangeStart();
|
||||
$end = $request->getContentRangeEnd();
|
||||
$fileSize = $request->getContentRangeSize();
|
||||
$deploymentId = $request->getHeader('x-appwrite-id', $deploymentId);
|
||||
$deploymentId = $request->getHeaderLine('x-appwrite-id', $deploymentId);
|
||||
// TODO make `end >= $fileSize` in next breaking version
|
||||
if (is_null($start) || is_null($end) || is_null($fileSize) || $end > $fileSize) {
|
||||
throw new Exception(Exception::STORAGE_INVALID_CONTENT_RANGE);
|
||||
@@ -237,7 +237,7 @@ class Create extends Action
|
||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed moving file');
|
||||
}
|
||||
|
||||
$type = $request->getHeader('x-sdk-language') === 'cli' ? 'cli' : 'manual';
|
||||
$type = $request->getHeaderLine('x-sdk-language') === 'cli' ? 'cli' : 'manual';
|
||||
|
||||
try {
|
||||
$locks($lockKey, 600, function () use ($activate, &$chunks, $chunksUploaded, $commands, $dbForProject, $deploymentId, $deviceForFunctions, $entrypoint, $fileSize, &$function, $functionId, $path, &$metadata, $platform, $project, $publisherForBuilds, $queueForEvents, $response, $type): void {
|
||||
|
||||
@@ -107,7 +107,7 @@ class Get extends Action
|
||||
->addHeader('Content-Disposition', 'attachment; filename="' . $deploymentId . '-' . $type . '.tar.gz"');
|
||||
|
||||
$size = $device->getFileSize($path);
|
||||
$rangeHeader = $request->getHeader('range');
|
||||
$rangeHeader = $request->getHeaderLine('range');
|
||||
|
||||
if (!empty($rangeHeader)) {
|
||||
$start = $request->getRangeStart();
|
||||
|
||||
@@ -517,7 +517,7 @@ class Create extends Base
|
||||
$execution->setAttribute('responseBody', $executionResponse['body'] ?? '');
|
||||
$execution->setAttribute('responseHeaders', $headers);
|
||||
|
||||
$acceptTypes = \explode(', ', $request->getHeader('accept'));
|
||||
$acceptTypes = \explode(', ', $request->getHeaderLine('accept'));
|
||||
foreach ($acceptTypes as $acceptType) {
|
||||
if (\str_starts_with($acceptType, 'application/json') || \str_starts_with($acceptType, 'application/*')) {
|
||||
$response->setContentType(Response::CONTENT_TYPE_JSON);
|
||||
|
||||
@@ -308,7 +308,7 @@ class Create extends Base
|
||||
]));
|
||||
|
||||
// Backwards compatibility with 1.6 behaviour
|
||||
$requestFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
|
||||
$requestFormat = $request->getHeaderLine('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
|
||||
if ($requestFormat && version_compare($requestFormat, '1.7.0', '<')) {
|
||||
// build from template
|
||||
$template = new Document([]);
|
||||
|
||||
@@ -156,7 +156,7 @@ class Upsert extends PlatformAction
|
||||
if (empty($userInternalId)) {
|
||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to resolve valid user internal ID.');
|
||||
}
|
||||
$isGraphQL = $request->getHeader('x-appwrite-source') === 'graphql';
|
||||
$isGraphQL = $request->getHeaderLine('x-appwrite-source') === 'graphql';
|
||||
|
||||
$presenceData = [
|
||||
'userInternalId' => $userInternalId,
|
||||
|
||||
@@ -166,7 +166,7 @@ class Create extends Action
|
||||
throw new Exception(Exception::STORAGE_FILE_TYPE_UNSUPPORTED);
|
||||
}
|
||||
|
||||
$contentRange = $request->getHeader('content-range');
|
||||
$contentRange = $request->getHeaderLine('content-range');
|
||||
$deploymentId = ID::unique();
|
||||
$chunk = 1;
|
||||
$chunks = 1;
|
||||
@@ -175,7 +175,7 @@ class Create extends Action
|
||||
$start = $request->getContentRangeStart();
|
||||
$end = $request->getContentRangeEnd();
|
||||
$fileSize = $request->getContentRangeSize();
|
||||
$deploymentId = $request->getHeader('x-appwrite-id', $deploymentId);
|
||||
$deploymentId = $request->getHeaderLine('x-appwrite-id', $deploymentId);
|
||||
// TODO make `end >= $fileSize` in next breaking version
|
||||
if (is_null($start) || is_null($end) || is_null($fileSize) || $end > $fileSize) {
|
||||
throw new Exception(Exception::STORAGE_INVALID_CONTENT_RANGE);
|
||||
@@ -237,7 +237,7 @@ class Create extends Action
|
||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed moving file');
|
||||
}
|
||||
|
||||
$type = $request->getHeader('x-sdk-language') === 'cli' ? 'cli' : 'manual';
|
||||
$type = $request->getHeaderLine('x-sdk-language') === 'cli' ? 'cli' : 'manual';
|
||||
|
||||
$commands = [];
|
||||
if (!empty($installCommand)) {
|
||||
|
||||
@@ -100,7 +100,7 @@ class Get extends Action
|
||||
}
|
||||
|
||||
$size = $device->getFileSize($path);
|
||||
$rangeHeader = $request->getHeader('range');
|
||||
$rangeHeader = $request->getHeaderLine('range');
|
||||
|
||||
$response
|
||||
->setContentType('application/gzip')
|
||||
|
||||
@@ -135,7 +135,7 @@ class Create extends Action
|
||||
'status' => 'waiting',
|
||||
'buildPath' => '',
|
||||
'buildLogs' => '',
|
||||
'type' => $request->getHeader('x-sdk-language') === 'cli' ? 'cli' : 'manual'
|
||||
'type' => $request->getHeaderLine('x-sdk-language') === 'cli' ? 'cli' : 'manual'
|
||||
]));
|
||||
|
||||
// Preview deployments for sites
|
||||
|
||||
@@ -187,7 +187,7 @@ class Create extends Action
|
||||
$fileTmpName = (\is_array($file['tmp_name']) && isset($file['tmp_name'][0])) ? $file['tmp_name'][0] : $file['tmp_name'];
|
||||
$fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
|
||||
|
||||
$contentRange = $request->getHeader('content-range');
|
||||
$contentRange = $request->getHeaderLine('content-range');
|
||||
$fileId = $fileId === 'unique()' ? ID::unique() : $fileId;
|
||||
$chunk = 1;
|
||||
$chunks = 1;
|
||||
@@ -196,7 +196,7 @@ class Create extends Action
|
||||
$start = $request->getContentRangeStart();
|
||||
$end = $request->getContentRangeEnd();
|
||||
$fileSize = $request->getContentRangeSize();
|
||||
$fileId = $request->getHeader('x-appwrite-id', $fileId);
|
||||
$fileId = $request->getHeaderLine('x-appwrite-id', $fileId);
|
||||
// TODO make `end >= $fileSize` in next breaking version
|
||||
if (is_null($start) || is_null($end) || is_null($fileSize) || $end > $fileSize) {
|
||||
throw new Exception(Exception::STORAGE_INVALID_CONTENT_RANGE);
|
||||
|
||||
@@ -128,7 +128,7 @@ class Get extends Action
|
||||
|
||||
$size = $file->getAttribute('sizeOriginal', 0);
|
||||
|
||||
$rangeHeader = $request->getHeader('range');
|
||||
$rangeHeader = $request->getHeaderLine('range');
|
||||
if (!empty($rangeHeader)) {
|
||||
$start = $request->getRangeStart();
|
||||
$end = $request->getRangeEnd();
|
||||
|
||||
@@ -119,7 +119,7 @@ class Get extends Action
|
||||
|
||||
$size = $file->getAttribute('sizeOriginal', 0);
|
||||
|
||||
$rangeHeader = $request->getHeader('range');
|
||||
$rangeHeader = $request->getHeaderLine('range');
|
||||
if (!empty($rangeHeader)) {
|
||||
$start = $request->getRangeStart();
|
||||
$end = $request->getRangeEnd();
|
||||
|
||||
@@ -137,7 +137,7 @@ class Get extends Action
|
||||
|
||||
$size = $file->getAttribute('sizeOriginal', 0);
|
||||
|
||||
$rangeHeader = $request->getHeader('range');
|
||||
$rangeHeader = $request->getHeaderLine('range');
|
||||
if (!empty($rangeHeader)) {
|
||||
$start = $request->getRangeStart();
|
||||
$end = $request->getRangeEnd();
|
||||
|
||||
@@ -58,11 +58,11 @@ class Create extends Action
|
||||
) {
|
||||
$this->preprocessEvent($request);
|
||||
|
||||
$event = $request->getHeader('x-github-event', '');
|
||||
$event = $request->getHeaderLine('x-github-event', '');
|
||||
Span::add('vcs.github.event.name', $event);
|
||||
|
||||
$payload = $request->getRawPayload();
|
||||
$signature = $request->getHeader('x-hub-signature-256', '');
|
||||
$signature = $request->getHeaderLine('x-hub-signature-256', '');
|
||||
$secretKey = System::getEnv('_APP_VCS_GITHUB_WEBHOOK_SECRET', '');
|
||||
|
||||
$valid = empty($secretKey) ? true : $github->validateWebhookEvent($payload, $signature, $secretKey);
|
||||
|
||||
@@ -180,53 +180,29 @@ class Request extends UtopiaRequest
|
||||
/**
|
||||
* Get headers
|
||||
*
|
||||
* Method for getting all HTTP header parameters, including cookies.
|
||||
* Method for getting all HTTP headers, including a synthesized `cookie`
|
||||
* header. Swoole parses the incoming Cookie header into its own cookie jar,
|
||||
* so it is absent from the raw header map; rebuild it here so consumers that
|
||||
* forward request headers (e.g. function/site executions) still receive it.
|
||||
*
|
||||
* @return array<string,mixed>
|
||||
* @return array<string, array<int, string>>
|
||||
*/
|
||||
public function getHeaders(): array
|
||||
{
|
||||
try {
|
||||
$headers = $this->generateHeaders();
|
||||
} catch (\Throwable) {
|
||||
$headers = [];
|
||||
}
|
||||
$headers = parent::getHeaders();
|
||||
|
||||
if (empty($this->swoole->cookie)) {
|
||||
return $headers;
|
||||
}
|
||||
|
||||
$cookieHeaders = [];
|
||||
foreach ($this->swoole->cookie as $key => $value) {
|
||||
$cookieHeaders[] = "{$key}={$value}";
|
||||
}
|
||||
|
||||
if (!empty($cookieHeaders)) {
|
||||
$headers['cookie'] = \implode('; ', $cookieHeaders);
|
||||
$cookies = $this->getCookieParams();
|
||||
if (!empty($cookies)) {
|
||||
$pairs = [];
|
||||
foreach ($cookies as $key => $value) {
|
||||
$pairs[] = "{$key}={$value}";
|
||||
}
|
||||
$headers['cookie'] = [\implode('; ', $pairs)];
|
||||
}
|
||||
|
||||
return $headers;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get header
|
||||
*
|
||||
* Method for querying HTTP header parameters. If $key is not found $default value will be returned.
|
||||
*
|
||||
* @param string $key
|
||||
* @param string $default
|
||||
* @return string
|
||||
*/
|
||||
public function getHeader(string $key, string $default = ''): string
|
||||
{
|
||||
$headers = $this->getHeaders();
|
||||
$value = $headers[$key] ?? $default;
|
||||
if (\is_array($value)) {
|
||||
$value = $value[0] ?? $default;
|
||||
}
|
||||
return \is_string($value) ? $value : $default;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get User Agent
|
||||
*
|
||||
@@ -237,7 +213,7 @@ class Request extends UtopiaRequest
|
||||
*/
|
||||
public function getUserAgent(string $default = ''): string
|
||||
{
|
||||
$forwardedUserAgent = $this->getHeader('x-forwarded-user-agent');
|
||||
$forwardedUserAgent = $this->getHeaderLine('x-forwarded-user-agent');
|
||||
if (!empty($forwardedUserAgent)) {
|
||||
$roles = $this->authorization->getRoles();
|
||||
$isAppUser = $this->user?->isKey($roles) ?? false;
|
||||
@@ -264,7 +240,7 @@ class Request extends UtopiaRequest
|
||||
$params = array_intersect_key($params, array_flip($allowedParams));
|
||||
}
|
||||
if (!isset($params['project'])) {
|
||||
$params['project'] = $this->getHeader('x-appwrite-project', '');
|
||||
$params['project'] = $this->getHeaderLine('x-appwrite-project', '');
|
||||
}
|
||||
ksort($params);
|
||||
return md5($this->getURI() . '*' . serialize($params) . '*' . APP_CACHE_BUSTER);
|
||||
|
||||
@@ -165,35 +165,50 @@ final class RequestTest extends TestCase
|
||||
$this->assertSame($secondRoute, $secondRequest->getRoute());
|
||||
}
|
||||
|
||||
public function testGetHeaderReturnsStringValue(): void
|
||||
public function testGetHeaderLineReturnsStringValue(): void
|
||||
{
|
||||
$this->request->addHeader('referer', 'https://example.com');
|
||||
|
||||
$this->assertSame('https://example.com', $this->request->getHeader('referer'));
|
||||
$this->assertSame('https://example.com', $this->request->getHeaderLine('referer'));
|
||||
}
|
||||
|
||||
public function testGetHeaderReturnsDefaultWhenMissing(): void
|
||||
public function testGetHeaderLineReturnsDefaultWhenMissing(): void
|
||||
{
|
||||
$this->assertSame('', $this->request->getHeader('referer'));
|
||||
$this->assertSame('fallback', $this->request->getHeader('referer', 'fallback'));
|
||||
$this->assertSame('', $this->request->getHeaderLine('referer'));
|
||||
$this->assertSame('fallback', $this->request->getHeaderLine('referer', 'fallback'));
|
||||
}
|
||||
|
||||
public function testGetHeaderCoercesArrayToFirstElement(): void
|
||||
public function testGetHeaderLineJoinsMultipleValues(): void
|
||||
{
|
||||
$swoole = new SwooleRequest();
|
||||
$swoole->header = ['referer' => ['https://a.example', 'https://b.example']];
|
||||
$request = new Request($swoole);
|
||||
|
||||
$this->assertSame('https://a.example', $request->getHeader('referer'));
|
||||
$this->assertSame('https://a.example, https://b.example', $request->getHeaderLine('referer'));
|
||||
}
|
||||
|
||||
public function testGetHeaderReturnsDefaultWhenValueNotString(): void
|
||||
public function testGetHeadersSynthesizesCookieHeaderFromCookieJar(): void
|
||||
{
|
||||
// Swoole parses the Cookie header into its cookie jar, so getHeaders()
|
||||
// must rebuild it for consumers that forward request headers onward
|
||||
// (e.g. function/site executions).
|
||||
$swoole = new SwooleRequest();
|
||||
$swoole->header = ['referer' => 123];
|
||||
$swoole->header = ['host' => 'example.com'];
|
||||
$swoole->cookie = ['custom-session-id' => 'abcd123', 'custom-user-id' => 'efgh456'];
|
||||
$request = new Request($swoole);
|
||||
|
||||
$this->assertSame('fallback', $request->getHeader('referer', 'fallback'));
|
||||
$headers = $request->getHeaders();
|
||||
|
||||
$this->assertSame(['custom-session-id=abcd123; custom-user-id=efgh456'], $headers['cookie']);
|
||||
}
|
||||
|
||||
public function testGetHeadersOmitsCookieHeaderWhenNoCookies(): void
|
||||
{
|
||||
$swoole = new SwooleRequest();
|
||||
$swoole->header = ['host' => 'example.com'];
|
||||
$request = new Request($swoole);
|
||||
|
||||
$this->assertArrayNotHasKey('cookie', $request->getHeaders());
|
||||
}
|
||||
|
||||
public function testGetParamsCachesRawParamsWhenFilterThrows4xx(): void
|
||||
|
||||
Reference in new issue
Block a user