CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-01 10:29:48 +12:00
Code Issues Projects Releases Wiki Activity

All headers converted to lowercase

Browse source
This commit is contained in:
Eldad Fux 2020-07-05 01:22:22 +03:00
parent 54ffc89291
commit c104498e38
4 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/app.php
View file

@ -46,7 +46,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
Authorization::$roles = ['*'];
$localeParam = (string)$request->getParam('locale', $request->getHeader('X-Appwrite-Locale', ''));
$localeParam = (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
if (\in_array($localeParam, Config::getParam('locale-codes'))) {
$locale->setDefault($localeParam);
@ -136,7 +136,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
if(!$originValidator->isValid($origin)
&& \in_array($request->getMethod(), [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_DELETE])
&& $route->getLabel('origin', false) !== '*'
&& empty($request->getHeader('X-Appwrite-Key', ''))) {
&& empty($request->getHeader('x-appwrite-key', ''))) {
throw new Exception($originValidator->getDescription(), 403);
}
@ -169,7 +169,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
$scopes = $roles[$role]['scopes']; // Allowed scopes for user role
// Check if given key match project API keys
$key = $project->search('secret', $request->getHeader('X-Appwrite-Key', ''), $project->getAttribute('keys', []));
$key = $project->search('secret', $request->getHeader('x-appwrite-key', ''), $project->getAttribute('keys', []));
/*
* Try app auth when we have project key and no user

8
app/init.php
View file

@ -319,14 +319,14 @@ App::setResource('user', function($mode, $project, $console, $request, $response
$session = Auth::decodeSession(
$request->getCookie(Auth::$cookieName, // Get sessions
$request->getCookie(Auth::$cookieName.'_legacy', // Get fallback session from old clients (no SameSite support)
$request->getHeader('X-Appwrite-Key', '')))); // Get API Key
$request->getHeader('x-appwrite-key', '')))); // Get API Key
// Get fallback session from clients who block 3rd-party cookies
$response->addHeader('X-Debug-Fallback', 'false');
if(empty($session['id']) && empty($session['secret'])) {
$response->addHeader('X-Debug-Fallback', 'true');
$fallback = $request->getHeader('X-Fallback-Cookies', '');
$fallback = $request->getHeader('x-fallback-cookies', '');
$fallback = \json_decode($fallback, true);
$session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : ''));
}
@ -369,7 +369,7 @@ App::setResource('project', function($consoleDB, $request) {
Authorization::disable();
$project = $consoleDB->getDocument($request->getParam('project',
$request->getHeader('X-Appwrite-Project', '')));
$request->getHeader('x-appwrite-project', '')));
Authorization::reset();
@ -401,7 +401,7 @@ App::setResource('projectDB', function($register, $project) {
App::setResource('mode', function($request) {
/** @var Utopia\Request $request */
return $request->getParam('mode', $request->getHeader('X-Appwrite-Mode', 'default'));
return $request->getParam('mode', $request->getHeader('x-appwrite-mode', 'default'));
}, ['request']);
App::setResource('geodb', function($request) {

2
composer.json
View file

@ -33,7 +33,7 @@
"appwrite/php-clamav": "1.0.*",
"utopia-php/framework": "0.7.6",
"utopia-php/framework": "0.8.0",
"utopia-php/abuse": "0.2.*",
"utopia-php/audit": "0.3.*",
"utopia-php/cache": "0.2.*",

6
src/Appwrite/Utopia/Request.php
View file

@ -117,11 +117,6 @@ class Request extends UtopiaRequest
return (isset($this->swoole->server) && isset($this->swoole->server[$key])) ? $this->swoole->server[$key] : $default;
}
public function debug()
{
return $this->swoole->header;
}
/**
* Get IP
*
@ -288,7 +283,6 @@ class Request extends UtopiaRequest
*/
public function getHeader(string $key, string $default = ''): string
{
$key = strtolower($key);
return (isset($this->swoole->header[$key])) ? $this->swoole->header[$key] : $default;
}