From 35b76c1aee5f3fe3b87e9fa092e9e935bc3f14ae Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Tue, 11 May 2021 16:32:02 +0545
Subject: [PATCH] refactoring moving ssl generation to init function

---
 app/controllers/general.php | 54 +++++++++++++++++++++++++++++++++++--
 app/http.php                | 31 ---------------------
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/app/controllers/general.php b/app/controllers/general.php
index 1f7d4ebaeb..9b0a6e7fde 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -23,15 +23,65 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-App::init(function ($utopia, $request, $response, $console, $project, $user, $locale, $clients) {
+App::init(function ($utopia, $request, $response, $console, $project, $consoleDB, $user, $locale, $clients) {
     /** @var Utopia\Swoole\Request $request */
     /** @var Appwrite\Utopia\Response $response */
+    /** @var Appwrite\Database\Database $consoleDB */
     /** @var Appwrite\Database\Document $console */
     /** @var Appwrite\Database\Document $project */
     /** @var Appwrite\Database\Document $user */
     /** @var Utopia\Locale\Locale $locale */
     /** @var bool $mode */
     /** @var array $clients */
+    
+    $domain = $request->getHostname();
+    $checkedDomains = Config::getParam('checkedDomains', []);
+    if (!array_key_exists($domain, $checkedDomains)) {
+        $domain = new Domain(!empty($domain) ? $domain : '');
+
+        if (empty($domain->get()) || !$domain->isKnown() || $domain->isTest()()) {
+            $checkedDomains[$domain->get()] = false;
+            Console::info($domain->get() . ' is not a valid domain. Skipping certificate generation.');
+        } else {
+            Console::info($domain->get() . ' is a valid domain.');
+
+            $dbDomain = $consoleDB->getCollectionFirst([
+                'limit' => 1,
+                'offset' => 0,
+                'filters' => [
+                    '$collection=' . Database::SYSTEM_COLLECTION_CERTIFICATES,
+                    'domain=' . $domain->get(),
+                ],
+            ]);
+
+            if (empty($dbDomain)) {
+                $dbDomain = [
+                    '$collection' => Database::SYSTEM_COLLECTION_CERTIFICATES,
+                    '$permissions' => [
+                        'read' => [],
+                        'write' => [],
+                    ],
+                    'domain' => $domain->get(),
+                ];
+                $dbDomain = $consoleDB->createDocument($dbDomain);
+
+                Console::info('Issuing a TLS certificate for the master domain (' . $domain->get() . ') in 30 seconds.
+                    Make sure your domain points to your server IP or restart your Appwrite server to try again.'); // TODO move this to installation script
+
+                ResqueScheduler::enqueueAt(\time() + 30, 'v1-certificates', 'CertificatesV1', [
+                    'document' => [],
+                    'domain' => $domain->get(),
+                    'validateTarget' => false,
+                    'validateCNAME' => false,
+                ]);
+            }
+
+            $checkedDomains[$domain] = true;
+
+        }
+        Console::info('adding ' . $domain->get() . ' to list of domains already checked');
+        Config::setParam('checkedDomains', $checkedDomains);
+    }
 
     $localeParam = (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
 
@@ -226,7 +276,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
         throw new Exception('Password reset is required', 412);
     }
 
-}, ['utopia', 'request', 'response', 'console', 'project', 'user', 'locale', 'clients']);
+}, ['utopia', 'request', 'response', 'console', 'project', 'consoleDB', 'user', 'locale', 'clients']);
 
 App::options(function ($request, $response) {
     /** @var Utopia\Swoole\Request $request */
diff --git a/app/http.php b/app/http.php
index d38d33b7c8..efa47ffbd1 100644
--- a/app/http.php
+++ b/app/http.php
@@ -71,37 +71,6 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
     $request = new Request($swooleRequest);
     $response = new Response($swooleResponse);
 
-    $domain = $request->getHostname();
-    $validDomains = Config::getParam('validDomains', []);
-    if (!array_key_exists($domain, $validDomains)) {
-        $domainCheck = new Domain(!empty($domain) ? $domain : '');
-        if (empty($domainCheck->get()) || !$domainCheck->isKnown() || $domainCheck->isTest()()) {
-            $validDomains[$domain] = false;
-        } else {
-            $validDomains[$domain] = true;
-        }
-        Config::setParam('validDomains', $validDomains);
-    }
-    if ($validDomains[$domain]) {
-        $issuedDomains = Config::getParam('issuedDomains', []);
-        if (!array_key_exists($domain, $issuedDomains)) {
-            //schedule
-            Console::info('adding ' . $domain . ' to list of domains already checked');
-            $issuedDomains[$domain] = true;
-            Config::setParam('issuedDomains', $issuedDomains);
-
-            Console::info('Issuing a TLS certificate for the master domain (' . $domain . ') in 30 seconds.
-                Make sure your domain points to your server IP or restart your Appwrite server to try again.'); // TODO move this to installation script
-
-            ResqueScheduler::enqueueAt(\time() + 30, 'v1-certificates', 'CertificatesV1', [
-                'document' => [],
-                'domain' => $domain,
-                'validateTarget' => false,
-                'validateCNAME' => false,
-            ]);
-        }
-    }
-
     if(Files::isFileLoaded($request->getURI())) {
         $time = (60 * 60 * 24 * 365 * 2); // 45 days cache