From 5462b83d3c918c89e0b881b4c630d7910c2479ab Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Thu, 23 May 2024 14:47:59 +0530 Subject: [PATCH 1/2] fix: don't override `robots.txt` for other domains. --- app/controllers/general.php | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 7ee521336f..9c9d8cdf56 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -793,10 +793,25 @@ App::get('/robots.txt') ->desc('Robots.txt File') ->label('scope', 'public') ->label('docs', false) + ->inject('utopia') + ->inject('swooleRequest') + ->inject('request') ->inject('response') - ->action(function (Response $response) { - $template = new View(__DIR__ . '/../views/general/robots.phtml'); - $response->text($template->render(false)); + ->inject('dbForConsole') + ->inject('getProjectDB') + ->inject('queueForEvents') + ->inject('queueForUsage') + ->inject('geodb') + ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) { + $host = $request->getHostname() ?? ''; + $mainDomain = System::getEnv('_APP_DOMAIN', ''); + + if ($host === $mainDomain) { + $template = new View(__DIR__ . '/../views/general/robots.phtml'); + $response->text($template->render(false)); + } else { + router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb); + } }); App::get('/humans.txt') From 81e8502a782f3bbfbc9db38c7f318f1aadce04dc Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Thu, 23 May 2024 15:54:12 +0530 Subject: [PATCH 2/2] fix: dont override `humans.txt` too. --- app/controllers/general.php | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 9c9d8cdf56..07e16c3896 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -818,10 +818,25 @@ App::get('/humans.txt') ->desc('Humans.txt File') ->label('scope', 'public') ->label('docs', false) + ->inject('utopia') + ->inject('swooleRequest') + ->inject('request') ->inject('response') - ->action(function (Response $response) { - $template = new View(__DIR__ . '/../views/general/humans.phtml'); - $response->text($template->render(false)); + ->inject('dbForConsole') + ->inject('getProjectDB') + ->inject('queueForEvents') + ->inject('queueForUsage') + ->inject('geodb') + ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) { + $host = $request->getHostname() ?? ''; + $mainDomain = System::getEnv('_APP_DOMAIN', ''); + + if ($host === $mainDomain) { + $template = new View(__DIR__ . '/../views/general/humans.phtml'); + $response->text($template->render(false)); + } else { + router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb); + } }); App::get('/.well-known/acme-challenge/*')