Merge remote-tracking branch 'origin/1.4.x' into 1.5.x

2024-06-14 16:54:52 +12:00 · 2024-01-11 19:59:59 +13:00 · 2024-01-11 19:59:59 +13:00 · 320919fef2
parent 07b6ee58fe 6b1330e400
commit 320919fef2
6 changed files with 85 additions and 19 deletions
--- a/.env
+++ b/.env
@ -4,12 +4,13 @@ _APP_WORKER_PER_CORE=6
 _APP_CONSOLE_WHITELIST_ROOT=disabled
 _APP_CONSOLE_WHITELIST_EMAILS=
 _APP_CONSOLE_WHITELIST_IPS=
+_APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 _APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
 _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
-_APP_OPTIONS_ROUTER_PROTECTION=disbled
+_APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
--- a/app/config/variables.php
+++ b/app/config/variables.php
@ -115,14 +115,6 @@ return [
                'question' => '',
                'filter' => ''
            ],
-            // [
-            //     'name' => '_APP_CONSOLE_WHITELIST_DOMAINS',
-            //     'description' => 'This option allows you to limit creation of users to Appwrite console for users sharing the same email domains. This option is very useful for team working with company emails domain.\n\nTo enable this option, pass a list of allowed email domains separated by a comma.',
-            //     'introduction' => '',
-            //     'default' => '',
-            //     'required' => false,
-            //     'question' => '',
-            // ],
            [
                'name' => '_APP_CONSOLE_WHITELIST_IPS',
                'description' => "This last option allows you to limit creation of users in Appwrite console for users sharing the same set of IP addresses. This option is very useful for team working with a VPN service or a company IP.\n\nTo enable/activate this option, pass a list of allowed IP addresses separated by a comma.",
@ -132,6 +124,15 @@ return [
                'question' => '',
                'filter' => ''
            ],
+            [
+                'name' => '_APP_CONSOLE_HOSTNAMES',
+                'description' => 'This option allows you to add additional hostnames to your Appwrite console. This option is very useful for allowing access to the console project from additional domains. To enable it, pass a list of allowed hostnames separated by a comma.',
+                'introduction' => '1.5.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_SYSTEM_EMAIL_NAME',
                'description' => 'This is the sender name value that will appear on email messages sent to developers from the Appwrite console. The default value is: \'Appwrite\'. You can use url encoded strings for spaces and special chars.',
--- a/app/init.php
+++ b/app/init.php
@ -74,6 +74,7 @@ use Utopia\Queue\Connection;
 use Utopia\Storage\Storage;
 use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;
 use Utopia\Validator\Range;
+use Utopia\Validator\Hostname;
 use Utopia\Validator\IP;
 use Utopia\Validator\URL;
 use Utopia\Validator\WhiteList;
@ -1044,6 +1045,21 @@ App::setResource('clients', function ($request, $console, $project) {
        'hostname' => $request->getHostname(),
    ], Document::SET_TYPE_APPEND);

+    $hostnames = explode(',', App::getEnv('_APP_CONSOLE_HOSTNAMES', ''));
+    $validator = new Hostname();
+    foreach ($hostnames as $hostname) {
+        $hostname = trim($hostname);
+        if (!$validator->isValid($hostname)) {
+            continue;
+        }
+        $console->setAttribute('platforms', [
+            '$collection' => ID::custom('platforms'),
+            'type' => Origin::CLIENT_TYPE_WEB,
+            'name' => $hostname,
+            'hostname' => $hostname,
+        ], Document::SET_TYPE_APPEND);
+    }
+
    /**
     * Get All verified client URLs for both console and current projects
     * + Filter for duplicated entries
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@ -79,6 +79,7 @@ services:
      - _APP_CONSOLE_WHITELIST_ROOT
      - _APP_CONSOLE_WHITELIST_EMAILS
      - _APP_CONSOLE_WHITELIST_IPS
+      - _APP_CONSOLE_HOSTNAMES
      - _APP_SYSTEM_EMAIL_NAME
      - _APP_SYSTEM_EMAIL_ADDRESS
      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
@ -273,7 +274,7 @@ services:
    depends_on:
      - redis
      - mariadb
-    volumes: 
+    volumes:
      - appwrite-uploads:/storage/uploads:rw
      - appwrite-cache:/storage/cache:rw
      - appwrite-functions:/storage/functions:rw
@ -420,7 +421,7 @@ services:
    depends_on:
      - redis
      - mariadb
-    volumes: 
+    volumes:
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
    environment:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -53,7 +53,7 @@ services:
        DEBUG: false
        TESTING: true
        VERSION: dev
-    ports: 
+    ports:
      - 9501:80
    networks:
      - appwrite
@ -88,7 +88,7 @@ services:
      - mariadb
      - redis
      # - clamav
-    entrypoint: 
+    entrypoint:
      - php
      - -e
      - app/http.php
@ -100,6 +100,7 @@ services:
      - _APP_CONSOLE_WHITELIST_ROOT
      - _APP_CONSOLE_WHITELIST_EMAILS
      - _APP_CONSOLE_WHITELIST_IPS
+      - _APP_CONSOLE_HOSTNAMES
      - _APP_SYSTEM_EMAIL_NAME
      - _APP_SYSTEM_EMAIL_ADDRESS
      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
@ -197,7 +198,7 @@ services:
    container_name: appwrite-realtime
    image: appwrite-dev
    restart: unless-stopped
-    ports: 
+    ports:
      - 9505:80
    labels:
      - "traefik.enable=true"
@ -305,7 +306,7 @@ services:
    depends_on:
      - redis
      - mariadb
-    volumes: 
+    volumes:
      - appwrite-uploads:/storage/uploads:rw
      - appwrite-cache:/storage/cache:rw
      - appwrite-functions:/storage/functions:rw
@ -359,7 +360,7 @@ services:
    image: appwrite-dev
    networks:
      - appwrite
-    volumes: 
+    volumes:
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
    depends_on:
@ -458,7 +459,7 @@ services:
    depends_on:
      - redis
      - mariadb
-    volumes: 
+    volumes:
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
      - ./app:/usr/src/code/app
@ -752,7 +753,7 @@ services:
      - _APP_REDIS_USER
      - _APP_REDIS_PASS
      - _APP_MIXPANEL_TOKEN
-  
+
  appwrite-hamster-scheduler:
    entrypoint: hamster
    <<: *x-logging
@ -1003,7 +1004,7 @@ services:
  #     - './debug:/tmp'
  #   ports:
  #     - '3001:80'
-  
+
  graphql-explorer:
    container_name: appwrite-graphql-explorer
    image: appwrite/altair:0.3.0
--- a/tests/e2e/General/HTTPTest.php
+++ b/tests/e2e/General/HTTPTest.php
@ -171,4 +171,50 @@ class HTTPTest extends Scope

        $this->assertEquals(200, $response['headers']['status-code']);
    }
+
+    public function testCors()
+    {
+        /**
+         * Test for SUCCESS
+         */
+
+        $endpoint = '/v1/projects'; // Can be any non-404 route
+
+        $response = $this->client->call(Client::METHOD_GET, $endpoint);
+
+        $this->assertEquals('http://localhost', $response['headers']['access-control-allow-origin']);
+
+        $response = $this->client->call(Client::METHOD_GET, $endpoint, [
+            'origin' => 'http://localhost',
+        ]);
+
+        $this->assertEquals('http://localhost', $response['headers']['access-control-allow-origin']);
+
+        $response = $this->client->call(Client::METHOD_GET, $endpoint, [
+            'origin' => 'http://appwrite.io',
+        ]);
+
+        $this->assertEquals('http://appwrite.io', $response['headers']['access-control-allow-origin']);
+
+        $response = $this->client->call(Client::METHOD_GET, $endpoint, [
+            'origin' => 'https://appwrite.io',
+        ]);
+
+        $this->assertEquals('https://appwrite.io', $response['headers']['access-control-allow-origin']);
+
+        $response = $this->client->call(Client::METHOD_GET, $endpoint, [
+            'origin' => 'http://cloud.appwrite.io',
+        ]);
+
+        $this->assertEquals('http://cloud.appwrite.io', $response['headers']['access-control-allow-origin']);
+
+        /**
+         * Test for FAILURE
+         */
+        $response = $this->client->call(Client::METHOD_GET, $endpoint, [
+            'origin' => 'http://google.com',
+        ]);
+
+        $this->assertEquals('http://localhost', $response['headers']['access-control-allow-origin']);
+    }
 }