Merge pull request #4705 from appwrite/disable-invites

feat: disable auth on console project
2024-06-29 19:50:26 +12:00 · 2022-11-17 23:21:30 +05:30 · 2022-11-17 23:21:30 +05:30 · 18cd83c2af
parent 6acb07109a 6c43b44441
commit 18cd83c2af
9 changed files with 88 additions and 53 deletions
--- a/.env
+++ b/.env
@ -29,7 +29,7 @@ _APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mariadb://user:password@mariadb:3306/appw
 _APP_CONNECTIONS_CACHE=redis_fra1_01=redis://redis:6379
 _APP_CONNECTIONS_QUEUE=redis_fra1_01=redis://redis:6379
 _APP_CONNECTIONS_PUBSUB=redis_fra1_01=redis://redis:6379
-_APP_CONNECTIONS_STORAGE=file://localhost
+_APP_CONNECTIONS_STORAGE=local://localhost
 _APP_STORAGE_ANTIVIRUS=disabled
 _APP_STORAGE_ANTIVIRUS_HOST=clamav
 _APP_STORAGE_ANTIVIRUS_PORT=3310
--- a/app/config/variables.php
+++ b/app/config/variables.php
@ -509,7 +509,7 @@ return [
            ],
            [
                'name' => '_APP_CONNECTIONS_STORAGE',
-                'description' => 'A DSN representing the storage device to connect to. The DSN takes the following format <device>://<access_key>:<access_secret>@<host>:<port>/<bucket>?region=<region>. For example, for S3: \'s3://access_key:access_secret@host:port/bucket?region=us-east-1\'. To use the local filesystem, you can leave this variable empty. Available devices are file, s3, dospaces, linode, backblaze and wasabi.',
+                'description' => 'A DSN representing the storage device to connect to. The DSN takes the following format <device>://<access_key>:<access_secret>@<host>:<port>/<bucket>?region=<region>. For example, for S3: \'s3://access_key:access_secret@host:port/bucket?region=us-east-1\'. To use the local filesystem, you can leave this variable empty. Available devices are local, s3, dospaces, linode, backblaze and wasabi.',
                'introduction' => '1.1.0',
                'default' => '',
                'required' => false,
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@ -41,6 +41,7 @@ use Utopia\Validator\HexColor;
 use Utopia\Validator\Range;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
+use Utopia\DSN\DSN;
 use Utopia\Swoole\Request;

 App::post('/v1/storage/buckets')
@ -494,16 +495,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
        }

        if ($chunksUploaded === $chunks) {
-            $connection = App::getEnv('_APP_CONNECTIONS_STORAGE', ''); /** @TODO : move this to the registry or someplace else */
-            $device = STORAGE_DEVICE_LOCAL;
-            try {
-                $dsn = new DSN($connection);
-                $device = $dsn->getScheme();
-            } catch (\Exception $e) {
-                $device = STORAGE_DEVICE_LOCAL;
-            }
-
-            if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'enabled' && $bucket->getAttribute('antivirus', true) && $fileSize <= APP_LIMIT_ANTIVIRUS && $device === STORAGE_DEVICE_LOCAL) {
+            if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'enabled' && $bucket->getAttribute('antivirus', true) && $fileSize <= APP_LIMIT_ANTIVIRUS && $deviceFiles->getType() === Storage::DEVICE_LOCAL) {
                $antivirus = new Network(
                    App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
                    (int) App::getEnv('_APP_STORAGE_ANTIVIRUS_PORT', 3310)
--- a/app/init.php
+++ b/app/init.php
@ -54,7 +54,6 @@ use Utopia\Config\Config;
 use Utopia\Locale\Locale;
 use Utopia\Registry\Registry;
 use Utopia\Storage\Device;
-use Utopia\Storage\Storage;
 use Utopia\DSN\DSN;
 use Utopia\Storage\Device\Backblaze;
 use Utopia\Storage\Device\DOSpaces;
@ -75,7 +74,9 @@ use Appwrite\Event\Func;
 use MaxMind\Db\Reader;
 use PHPMailer\PHPMailer\PHPMailer;
 use Swoole\Database\PDOProxy;
+use Utopia\CLI\Console;
 use Utopia\Queue;
+use Utopia\Storage\Storage;

 const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
@ -160,13 +161,6 @@ const DELETE_TYPE_SCHEDULES = 'schedules';
 const COMPRESSION_TYPE_NONE = 'none';
 const COMPRESSION_TYPE_GZIP = 'gzip';
 const COMPRESSION_TYPE_ZSTD = 'zstd';
-// Storage Device Types
-const STORAGE_DEVICE_LOCAL = 'file';
-const STORAGE_DEVICE_S3 = 's3';
-const STORAGE_DEVICE_DO_SPACES = 'dospaces';
-const STORAGE_DEVICE_BACKBLAZE = 'backblaze';
-const STORAGE_DEVICE_LINODE = 'linode';
-const STORAGE_DEVICE_WASABI = 'wasabi';
 // Mail Types
 const MAIL_TYPE_VERIFICATION = 'verification';
 const MAIL_TYPE_MAGIC_SESSION = 'magicSession';
@ -593,7 +587,7 @@ $register->set('pools', function () {
            $dsnUser = $dsn->getUser();
            $dsnPass = $dsn->getPassword();
            $dsnScheme = $dsn->getScheme();
-            $dsnDatabase = $dsn->getDatabase();
+            $dsnDatabase = $dsn->getPath();

            if (!in_array($dsnScheme, $schemes)) {
                throw new Exception(Exception::GENERAL_SERVER_ERROR, "Invalid console database scheme");
@ -653,7 +647,7 @@ $register->set('pools', function () {
                            default => null
                        };

-                        $adapter->setDefaultDatabase($dsn->getDatabase());
+                        $adapter->setDefaultDatabase($dsn->getPath());
                        break;
                    case 'pubsub':
                        $adapter = $resource();
@ -1035,6 +1029,7 @@ App::setResource('console', function () {
        'legalAddress' => '',
        'legalTaxId' => '',
        'auths' => [
+            'invites' => false,
            'limit' => (App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
        ],
        'authWhitelistEmails' => (!empty(App::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', App::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
@ -1109,7 +1104,7 @@ function getDevice($root): Device
    $connection = App::getEnv('_APP_CONNECTIONS_STORAGE', '');

    $acl = 'private';
-    $device = STORAGE_DEVICE_LOCAL;
+    $device = Storage::DEVICE_LOCAL;
    $accessKey = '';
    $accessSecret = '';
    $bucket = '';
@ -1123,22 +1118,21 @@ function getDevice($root): Device
        $bucket = $dsn->getPath();
        $region = $dsn->getParam('region');
    } catch (\Exception $e) {
-        Console::eor($e->getMessage() . 'Invalid DSN. Defaulting to Local storage.');
-        $device = STORAGE_DEVICE_LOCAL;
+        Console::error($e->getMessage() . 'Invalid DSN. Defaulting to Local device.');
    }

    switch ($device) {
-        case STORAGE_DEVICE_S3:
+        case Storage::DEVICE_S3:
            return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-        case STORAGE_DEVICE_DO_SPACES:
+        case STORAGE::DEVICE_DO_SPACES:
            return new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-        case STORAGE_DEVICE_BACKBLAZE:
+        case Storage::DEVICE_BACKBLAZE:
            return new Backblaze($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-        case STORAGE_DEVICE_LINODE:
+        case Storage::DEVICE_LINODE:
            return new Linode($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-        case STORAGE_DEVICE_WASABI:
+        case Storage::DEVICE_WASABI:
            return new Wasabi($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-        case STORAGE_DEVICE_LOCAL:
+        case Storage::DEVICE_LOCAL:
        default:
            return new Local($root);
    }
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@ -11,10 +11,11 @@ use Utopia\Database\DateTime;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Database\ID;
-use Utopia\Storage\Storage;
+use Utopia\DSN\DSN;
 use Utopia\Database\Document;
 use Utopia\Config\Config;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Storage\Storage;

 require_once __DIR__ . '/../init.php';

@ -80,12 +81,12 @@ class BuildsV1 extends Worker
        }

        $connection = App::getEnv('_APP_CONNECTIONS_STORAGE', ''); /** @TODO : move this to the registry or someplace else */
-        $device = STORAGE_DEVICE_LOCAL;
+        $device = Storage::DEVICE_LOCAL;
        try {
            $dsn = new DSN($connection);
            $device = $dsn->getScheme();
        } catch (\Exception $e) {
-            $device = STORAGE_DEVICE_LOCAL;
+            Console::error($e->getMessage() . 'Invalid DSN. Defaulting to Local device.');
        }

        $buildId = $deployment->getAttribute('buildId', '');
--- a/app/workers/messaging.php
+++ b/app/workers/messaging.php
@ -6,7 +6,7 @@ use Appwrite\SMS\Adapter\TextMagic;
 use Appwrite\SMS\Adapter\Twilio;
 use Appwrite\SMS\Adapter\Msg91;
 use Appwrite\SMS\Adapter\Vonage;
-use Appwrite\DSN\DSN;
+use Utopia\DSN\DSN;
 use Appwrite\Resque\Worker;
 use Appwrite\SMS\Adapter;
 use Utopia\App;
--- a/composer.json
+++ b/composer.json
@ -54,6 +54,7 @@
        "utopia-php/framework": "0.25.*",
        "utopia-php/image": "0.5.*",
        "utopia-php/queue": "0.4.*",
+        "utopia-php/dsn": "0.1.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.3.*",
        "utopia-php/orchestration": "0.9.*",
@ -61,7 +62,7 @@
        "utopia-php/pools": "0.4.*",
        "utopia-php/preloader": "0.2.*",
        "utopia-php/registry": "0.5.*",
-        "utopia-php/storage": "0.11.*",
+        "utopia-php/storage": "0.13.*",
        "utopia-php/swoole": "0.5.*",
        "utopia-php/websocket": "0.1.0",
        "resque/php-resque": "1.3.6",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "a673091aa6bd8ef01380b63245427c93",
+    "content-hash": "2b8002030d115fd67f57b89a9972f104",
    "packages": [
        {
            "name": "adhocore/jwt",
@ -1943,6 +1943,53 @@
            },
            "time": "2020-02-23T07:40:02+00:00"
        },
+        {
+            "name": "utopia-php/dsn",
+            "version": "0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/utopia-php/dsn.git",
+                "reference": "17a5935eab1b89fb4b95600db50a1b6d5faa6cea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/utopia-php/dsn/zipball/17a5935eab1b89fb4b95600db50a1b6d5faa6cea",
+                "reference": "17a5935eab1b89fb4b95600db50a1b6d5faa6cea",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0"
+            },
+            "require-dev": {
+                "laravel/pint": "1.2.*",
+                "phpunit/phpunit": "^9.3",
+                "squizlabs/php_codesniffer": "^3.6",
+                "vimeo/psalm": "4.0.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Utopia\\DSN\\": "src/DSN"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A simple library for parsing and managing Data Source Names ( DSNs )",
+            "keywords": [
+                "dsn",
+                "framework",
+                "php",
+                "upf",
+                "utopia"
+            ],
+            "support": {
+                "issues": "https://github.com/utopia-php/dsn/issues",
+                "source": "https://github.com/utopia-php/dsn/tree/0.1.0"
+            },
+            "time": "2022-10-26T10:06:20+00:00"
+        },
        {
            "name": "utopia-php/framework",
            "version": "0.25.0",
@ -2472,16 +2519,16 @@
        },
        {
            "name": "utopia-php/storage",
-            "version": "0.11.0",
+            "version": "0.13.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/storage.git",
-                "reference": "59802cf281d1976560cf6e353f250a9b870efddc"
+                "reference": "f34c010e4f8394a6b4aff70b6de55041d9a145d3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/59802cf281d1976560cf6e353f250a9b870efddc",
-                "reference": "59802cf281d1976560cf6e353f250a9b870efddc",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/f34c010e4f8394a6b4aff70b6de55041d9a145d3",
+                "reference": "f34c010e4f8394a6b4aff70b6de55041d9a145d3",
                "shasum": ""
            },
            "require": {
@ -2521,9 +2568,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/0.11.0"
+                "source": "https://github.com/utopia-php/storage/tree/0.13.0"
            },
-            "time": "2022-08-31T09:17:31+00:00"
+            "time": "2022-11-17T15:10:18+00:00"
        },
        {
            "name": "utopia-php/swoole",
--- a/src/Appwrite/Resque/Worker.php
+++ b/src/Appwrite/Resque/Worker.php
@ -7,9 +7,9 @@ use Utopia\App;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
 use Utopia\Cache\Adapter\Sharding;
+use Utopia\CLI\Console;
 use Utopia\Database\Database;
 use Utopia\Storage\Device;
-use Utopia\Storage\Storage;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Device\DOSpaces;
 use Utopia\Storage\Device\Linode;
@ -19,6 +19,7 @@ use Utopia\Storage\Device\S3;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
 use Utopia\DSN\DSN;
+use Utopia\Storage\Storage;

 abstract class Worker
 {
@ -280,7 +281,7 @@ abstract class Worker
        $connection = App::getEnv('_APP_CONNECTIONS_STORAGE', '');

        $acl = 'private';
-        $device = STORAGE_DEVICE_LOCAL;
+        $device = Storage::DEVICE_LOCAL;
        $accessKey = '';
        $accessSecret = '';
        $bucket = '';
@ -294,22 +295,21 @@ abstract class Worker
            $bucket = $dsn->getPath();
            $region = $dsn->getParam('region');
        } catch (\Exception $e) {
-            Console::error($e->getMessage() . 'Invalid DSN. Defaulting to Local storage.');
-            $device = STORAGE_DEVICE_LOCAL;
+            Console::error($e->getMessage() . 'Invalid DSN. Defaulting to Local device.');
        }

        switch ($device) {
-            case STORAGE_DEVICE_S3:
+            case Storage::DEVICE_S3:
                return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case STORAGE_DEVICE_DO_SPACES:
+            case STORAGE::DEVICE_DO_SPACES:
                return new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case STORAGE_DEVICE_BACKBLAZE:
+            case Storage::DEVICE_BACKBLAZE:
                return new Backblaze($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case STORAGE_DEVICE_LINODE:
+            case Storage::DEVICE_LINODE:
                return new Linode($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case STORAGE_DEVICE_WASABI:
+            case Storage::DEVICE_WASABI:
                return new Wasabi($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case STORAGE_DEVICE_LOCAL:
+            case Storage::DEVICE_LOCAL:
            default:
                return new Local($root);
        }