From b01819afc983e9aa251040c8c16e901563649975 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 29 Oct 2020 23:54:54 +0200 Subject: [PATCH 1/2] Check for user ID before granting user role --- app/controllers/general.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 805aa32ab6..0c36815dea 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -183,7 +183,10 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo Authorization::setDefaultStatus(false); // Cancel security segmentation for API keys. } - Authorization::setRole('user:'.$user->getId()); + if($user->getId()) { + Authorization::setRole('user:'.$user->getId()); + } + Authorization::setRole('role:'.$role); \array_map(function ($node) { From 788db3d7941e29dfada8f5bc65d0061c673abd99 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Fri, 30 Oct 2020 00:04:53 +0200 Subject: [PATCH 2/2] Better error logs --- app/controllers/general.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 0c36815dea..389e179e6d 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -16,6 +16,7 @@ use Appwrite\Database\Validator\Authorization; use Appwrite\Network\Validator\Origin; use Appwrite\Storage\Device\Local; use Appwrite\Storage\Storage; +use Utopia\CLI\Console; Config::setParam('domainVerification', false); Config::setParam('cookieDomain', 'localhost'); @@ -308,11 +309,16 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) { /** @var Utopia\View $layout */ /** @var Appwrite\Database\Document $project */ + $route = $utopia->match($request); + $template = ($route) ? $route->getLabel('error', null) : null; + if(php_sapi_name() === 'cli') { - var_dump(get_class($error)); - var_dump($error->getMessage()); - var_dump($error->getFile()); - var_dump($error->getLine()); + Console::error('[Error] Method: '.$route->getMethod()); + Console::error('[Error] URL: '.$route->getURL()); + Console::error('[Error] Type: '.get_class($error)); + Console::error('[Error] Message: '.$error->getMessage()); + Console::error('[Error] File: '.$error->getFile()); + Console::error('[Error] Line: '.$error->getLine()); } $version = App::getEnv('_APP_VERSION', 'UNKNOWN');