From 56e2b7c18b18a332e92654a5a24727b9b14ae799 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 17 Mar 2021 11:04:24 +0545 Subject: [PATCH 01/21] dart 2.12 docker file --- docker/environments/dart-2.12/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docker/environments/dart-2.12/Dockerfile diff --git a/docker/environments/dart-2.12/Dockerfile b/docker/environments/dart-2.12/Dockerfile new file mode 100644 index 000000000..06740803a --- /dev/null +++ b/docker/environments/dart-2.12/Dockerfile @@ -0,0 +1,9 @@ +FROM google/dart:2.12 + +LABEL maintainer="team@appwrite.io" + +RUN apt-get update -y && apt-get install -y tar + +WORKDIR /usr/local/src/ + +ENV PUB_CACHE=/usr/local/src/.appwrite \ No newline at end of file From f430854e1e01d941a14dca78d0995b028b20b52d Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 17 Mar 2021 11:04:31 +0545 Subject: [PATCH 02/21] dart 2.12 environment support --- app/config/environments.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/config/environments.php b/app/config/environments.php index 9f1c5638e..3dd4728c4 100644 --- a/app/config/environments.php +++ b/app/config/environments.php @@ -106,6 +106,15 @@ $environments = [ 'logo' => 'dart.png', 'supports' => [System::X86], ], + 'dart-2.12' => [ + 'name' => 'Dart', + 'version' => '2.12', + 'base' => 'google/dart:2.12', + 'image' => 'appwrite/env-dart-2.12:1.0.0', + 'build' => '/usr/src/code/docker/environments/dart-2.12', + 'logo' => 'dart.png', + 'supports' => [System::X86], + ], 'dotnet-3.1' => [ 'name' => '.NET', 'version' => '3.1', From a4be12a13cbfe8f7be28c749dc3deb0bc9617af3 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 17 Mar 2021 18:01:34 +0545 Subject: [PATCH 03/21] docker build env --- docker/environments/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/environments/build.sh b/docker/environments/build.sh index 1543c5814..1385dc9e3 100644 --- a/docker/environments/build.sh +++ b/docker/environments/build.sh @@ -33,6 +33,9 @@ docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le - echo 'Dart 2.10...' docker buildx build --platform linux/amd64 -t appwrite/env-dart-2.10:1.0.0 ./docker/environments/dart-2.10/ --push +echo 'Dart 2.12...' +docker buildx build --platform linux/amd64 -t appwrite/env-dart-2.12:1.0.0 ./docker/environments/dart-2.12/ --push + echo '.NET 3.1...' docker buildx build --platform linux/amd64,linux/arm64 -t appwrite/env-dotnet-3.1:1.0.0 ./docker/environments/dotnet-3.1/ --push From c8c4b11dad60b1a70c9a153d7cc1d199422d3d54 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 17 Mar 2021 18:13:42 +0545 Subject: [PATCH 04/21] test for dart 2.12 --- .../e2e/Services/Functions/FunctionsCustomServerTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 9dded8fdd..c641c3805 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -541,6 +541,14 @@ class FunctionsCustomServerTest extends Scope 'command' => 'dart main.dart', 'timeout' => 15, ], + [ + 'language' => 'Dart', + 'version' => '2.12', + 'name' => 'dart-2.12', + 'code' => $functions.'/dart.tar.gz', + 'command' => 'dart main.dart', + 'timeout' => 15, + ], [ 'language' => '.NET', 'version' => '3.1', From b262ebfeb3d7384187f377aca92e211ce7248f69 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Tue, 23 Mar 2021 13:27:51 -0400 Subject: [PATCH 05/21] Move validators from utopia --- src/Appwrite/Network/Validator/Email.php | 66 ++++++++++++ src/Appwrite/Network/Validator/Host.php | 82 ++++++++++++++ src/Appwrite/Network/Validator/IP.php | 112 ++++++++++++++++++++ src/Appwrite/Network/Validator/URL.php | 66 ++++++++++++ tests/unit/Network/Validators/EmailTest.php | 71 +++++++++++++ tests/unit/Network/Validators/HostTest.php | 45 ++++++++ tests/unit/Network/Validators/IPTest.php | 81 ++++++++++++++ tests/unit/Network/Validators/URLTest.php | 48 +++++++++ 8 files changed, 571 insertions(+) create mode 100644 src/Appwrite/Network/Validator/Email.php create mode 100644 src/Appwrite/Network/Validator/Host.php create mode 100644 src/Appwrite/Network/Validator/IP.php create mode 100644 src/Appwrite/Network/Validator/URL.php create mode 100755 tests/unit/Network/Validators/EmailTest.php create mode 100755 tests/unit/Network/Validators/HostTest.php create mode 100755 tests/unit/Network/Validators/IPTest.php create mode 100755 tests/unit/Network/Validators/URLTest.php diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php new file mode 100644 index 000000000..451e8e3b0 --- /dev/null +++ b/src/Appwrite/Network/Validator/Email.php @@ -0,0 +1,66 @@ + + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use Utopia\Validator; + +/** + * Email + * + * Validate that an variable is a valid email address + * + * @package Utopia\Validator + */ +class Email extends Validator +{ + /** + * Get Description + * + * Returns validator description + * + * @return string + */ + public function getDescription() + { + return 'Value must be a valid email address'; + } + + /** + * Get Type + * + * Returns validator type. + * + * @return string + */ + public function getType() + { + return self::TYPE_STRING; + } + + /** + * Is valid + * + * Validation will pass when $value is valid email address. + * + * @param mixed $value + * @return bool + */ + public function isValid($value) + { + if (!\filter_var($value, FILTER_VALIDATE_EMAIL)) { + return false; + } + + return true; + } +} diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php new file mode 100644 index 000000000..54c9ebbd2 --- /dev/null +++ b/src/Appwrite/Network/Validator/Host.php @@ -0,0 +1,82 @@ + + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use Utopia\Validator; + +/** + * Host + * + * Validate that a host is allowed from given whitelisted hosts list + * + * @package Utopia\Validator + */ +class Host extends Validator +{ + protected $whitelist = []; + + /** + * @param array $whitelist + */ + public function __construct(array $whitelist) + { + $this->whitelist = $whitelist; + } + + /** + * Get Description + * + * Returns validator description + * + * @return string + */ + public function getDescription() + { + return 'URL host must be one of: ' . \implode(', ', $this->whitelist); + } + + /** + * Get Type + * + * Returns validator type. + * + * @return string + */ + public function getType() + { + return self::TYPE_STRING; + } + + /** + * Is valid + * + * Validation will pass when $value starts with one of the given hosts + * + * @param mixed $value + * @return bool + */ + public function isValid($value) + { + $urlValidator = new URL(); + + if (!$urlValidator->isValid($value)) { + return false; + } + + if (\in_array(\parse_url($value, PHP_URL_HOST), $this->whitelist)) { + return true; + } + + return false; + } +} diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php new file mode 100644 index 000000000..b1ea72779 --- /dev/null +++ b/src/Appwrite/Network/Validator/IP.php @@ -0,0 +1,112 @@ + + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use Exception; +use Utopia\Validator; + +/** + * IP + * + * Validate that an variable is a valid IP address + * + * @package Utopia\Validator + */ +class IP extends Validator +{ + const ALL = 'all'; + const V4 = 'ipv4'; + const V6 = 'ipv6'; + + /** + * @var string + */ + protected $type = self::ALL; + + /** + * Constructor + * + * Set a the type of IP check. + * + * @param string $type + */ + public function __construct(string $type = self::ALL) + { + if (!in_array($type, [self::ALL, self::V4, self::V6])) { + throw new Exception('Unsupported IP type'); + } + + $this->type = $type; + } + + /** + * Get Description + * + * Returns validator description + * + * @return string + */ + public function getDescription() + { + return 'Value must be a valid IP address'; + } + + /** + * Get Type + * + * Returns validator type. + * + * @return string + */ + public function getType() + { + return self::TYPE_STRING; + } + + /** + * Is valid + * + * Validation will pass when $value is valid IP address. + * + * @param mixed $value + * @return bool + */ + public function isValid($value) + { + switch ($this->type) { + case self::ALL: + if (\filter_var($value, FILTER_VALIDATE_IP)) { + return true; + } + break; + + case self::V4: + if (\filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { + return true; + } + break; + + case self::V6: + if (\filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) { + return true; + } + break; + + default: + return false; + break; + } + + return false; + } +} diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php new file mode 100644 index 000000000..a610928d7 --- /dev/null +++ b/src/Appwrite/Network/Validator/URL.php @@ -0,0 +1,66 @@ + + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use Utopia\Validator; + +/** + * URL + * + * Validate that an variable is a valid URL + * + * @package Utopia\Validator + */ +class URL extends Validator +{ + /** + * Get Description + * + * Returns validator description + * + * @return string + */ + public function getDescription() + { + return 'Value must be a valid URL'; + } + + /** + * Get Type + * + * Returns validator type. + * + * @return string + */ + public function getType() + { + return self::TYPE_STRING; + } + + /** + * Is valid + * + * Validation will pass when $value is valid URL. + * + * @param mixed $value + * @return bool + */ + public function isValid($value) + { + if (\filter_var($value, FILTER_VALIDATE_URL) === false) { + return false; + } + + return true; + } +} diff --git a/tests/unit/Network/Validators/EmailTest.php b/tests/unit/Network/Validators/EmailTest.php new file mode 100755 index 000000000..03e4d043c --- /dev/null +++ b/tests/unit/Network/Validators/EmailTest.php @@ -0,0 +1,71 @@ + + * @version 1.0 RC4 + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use PHPUnit\Framework\TestCase; + +class EmailTest extends TestCase +{ + /** + * @var Email + */ + protected $email = null; + + public function setUp():void + { + $this->email = new Email(); + } + + public function tearDown():void + { + $this->email = null; + } + + public function testIsValid() + { + // Assertions + $this->assertEquals(true, $this->email->isValid('email@domain.com')); + $this->assertEquals(true, $this->email->isValid('firstname.lastname@domain.com')); + $this->assertEquals(true, $this->email->isValid('email@subdomain.domain.com')); + $this->assertEquals(true, $this->email->isValid('firstname+lastname@domain.com')); + $this->assertEquals(true, $this->email->isValid('email@[123.123.123.123]')); + $this->assertEquals(true, $this->email->isValid('"email"@domain.com')); + $this->assertEquals(true, $this->email->isValid('1234567890@domain.com')); + $this->assertEquals(true, $this->email->isValid('email@domain-one.com')); + $this->assertEquals(true, $this->email->isValid('_______@domain.com')); + $this->assertEquals(true, $this->email->isValid('email@domain.name')); + $this->assertEquals(true, $this->email->isValid('email@domain.co.jp')); + $this->assertEquals(true, $this->email->isValid('firstname-lastname@domain.com')); + $this->assertEquals(false, $this->email->isValid(false)); + $this->assertEquals(false, $this->email->isValid(['string', 'string'])); + $this->assertEquals(false, $this->email->isValid(1)); + $this->assertEquals(false, $this->email->isValid(1.2)); + $this->assertEquals(false, $this->email->isValid('plainaddress')); // Missing @ sign and domain + $this->assertEquals(false, $this->email->isValid('@domain.com')); // Missing username + $this->assertEquals(false, $this->email->isValid('#@%^%#$@#$@#.com')); // Garbage + $this->assertEquals(false, $this->email->isValid('Joe Smith ')); // Encoded html within email is invalid + $this->assertEquals(false, $this->email->isValid('email.domain.com')); // Missing @ + $this->assertEquals(false, $this->email->isValid('email@domain@domain.com')); // Two @ sign + $this->assertEquals(false, $this->email->isValid('.email@domain.com')); // Leading dot in address is not allowed + $this->assertEquals(false, $this->email->isValid('email.@domain.com')); // Trailing dot in address is not allowed + $this->assertEquals(false, $this->email->isValid('email..email@domain.com')); // Multiple dots + $this->assertEquals(false, $this->email->isValid('あいうえお@domain.com')); // Unicode char as address + $this->assertEquals(false, $this->email->isValid('email@domain.com (Joe Smith)')); // Text followed email is not allowed + $this->assertEquals(false, $this->email->isValid('email@domain')); // Missing top level domain (.com/.net/.org/etc) + $this->assertEquals(false, $this->email->isValid('email@-domain.com')); // Leading dash in front of domain is invalid + $this->assertEquals(false, $this->email->isValid('email@111.222.333.44444')); // Invalid IP format + $this->assertEquals(false, $this->email->isValid('email@domain..com')); // Multiple dot in the domain portion is invalid + $this->assertEquals($this->email->getType(), 'string'); + } +} diff --git a/tests/unit/Network/Validators/HostTest.php b/tests/unit/Network/Validators/HostTest.php new file mode 100755 index 000000000..dbaf83b7b --- /dev/null +++ b/tests/unit/Network/Validators/HostTest.php @@ -0,0 +1,45 @@ + + * @version 1.0 RC4 + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use PHPUnit\Framework\TestCase; + +class HostTest extends TestCase +{ + /** + * @var Host + */ + protected $host = null; + + public function setUp():void + { + $this->host = new Host(['appwrite.io', 'subdomain.appwrite.test', 'localhost']); + } + + public function tearDown():void + { + $this->host = null; + } + + public function testIsValid() + { + // Assertions + $this->assertEquals($this->host->isValid('https://appwrite.io/link'), true); + $this->assertEquals($this->host->isValid('https://localhost'), true); + $this->assertEquals($this->host->isValid('localhost'), false); + $this->assertEquals($this->host->isValid('http://subdomain.appwrite.test/path'), true); + $this->assertEquals($this->host->isValid('http://test.subdomain.appwrite.test/path'), false); + $this->assertEquals($this->host->getType(), 'string'); + } +} diff --git a/tests/unit/Network/Validators/IPTest.php b/tests/unit/Network/Validators/IPTest.php new file mode 100755 index 000000000..1be8f78ab --- /dev/null +++ b/tests/unit/Network/Validators/IPTest.php @@ -0,0 +1,81 @@ + + * @version 1.0 RC4 + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use PHPUnit\Framework\TestCase; + +class IPTest extends TestCase +{ + public function tearDown():void + { + $this->validator = null; + } + + public function testIsValidIP() + { + $validator = new IP(); + + // Assertions + $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true); + $this->assertEquals($validator->isValid('109.67.204.101'), true); + $this->assertEquals($validator->isValid(23.5), false); + $this->assertEquals($validator->isValid('23.5'), false); + $this->assertEquals($validator->isValid(null), false); + $this->assertEquals($validator->isValid(true), false); + $this->assertEquals($validator->isValid(false), false); + $this->assertEquals($validator->getType(), 'string'); + } + + public function testIsValidIPALL() + { + $validator = new IP(IP::ALL); + + // Assertions + $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true); + $this->assertEquals($validator->isValid('109.67.204.101'), true); + $this->assertEquals($validator->isValid(23.5), false); + $this->assertEquals($validator->isValid('23.5'), false); + $this->assertEquals($validator->isValid(null), false); + $this->assertEquals($validator->isValid(true), false); + $this->assertEquals($validator->isValid(false), false); + } + + public function testIsValidIPV4() + { + $validator = new IP(IP::V4); + + // Assertions + $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), false); + $this->assertEquals($validator->isValid('109.67.204.101'), true); + $this->assertEquals($validator->isValid(23.5), false); + $this->assertEquals($validator->isValid('23.5'), false); + $this->assertEquals($validator->isValid(null), false); + $this->assertEquals($validator->isValid(true), false); + $this->assertEquals($validator->isValid(false), false); + } + + public function testIsValidIPV6() + { + $validator = new IP(IP::V6); + + // Assertions + $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true); + $this->assertEquals($validator->isValid('109.67.204.101'), false); + $this->assertEquals($validator->isValid(23.5), false); + $this->assertEquals($validator->isValid('23.5'), false); + $this->assertEquals($validator->isValid(null), false); + $this->assertEquals($validator->isValid(true), false); + $this->assertEquals($validator->isValid(false), false); + } +} diff --git a/tests/unit/Network/Validators/URLTest.php b/tests/unit/Network/Validators/URLTest.php new file mode 100755 index 000000000..cd4844f7c --- /dev/null +++ b/tests/unit/Network/Validators/URLTest.php @@ -0,0 +1,48 @@ + + * @version 1.0 RC4 + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use PHPUnit\Framework\TestCase; + +class URLTest extends TestCase +{ + /** + * @var Domain + */ + protected $url = null; + + public function setUp():void + { + $this->url = new URL(); + } + + public function tearDown():void + { + $this->url = null; + } + + public function testIsValid() + { + // Assertions + $this->assertEquals(true, $this->url->isValid('http://example.com')); + $this->assertEquals(true, $this->url->isValid('https://example.com')); + $this->assertEquals(true, $this->url->isValid('htts://example.com')); // does not validate protocol + $this->assertEquals(false, $this->url->isValid('example.com')); // though, requires some kind of protocol + $this->assertEquals(false, $this->url->isValid('http:/example.com')); + $this->assertEquals(true, $this->url->isValid('http://exa-mple.com')); + $this->assertEquals(false, $this->url->isValid('htt@s://example.com')); + $this->assertEquals(true, $this->url->isValid('http://www.example.com/foo%2\u00c2\u00a9zbar')); + $this->assertEquals(true, $this->url->isValid('http://www.example.com/?q=%3Casdf%3E')); + } +} From 7f485ce53622b9227a653a706dade94dc8db774d Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 24 Mar 2021 13:47:17 -0400 Subject: [PATCH 06/21] Update validator namespaces --- src/Appwrite/Network/Validator/Email.php | 2 +- src/Appwrite/Network/Validator/Host.php | 2 +- src/Appwrite/Network/Validator/IP.php | 2 +- src/Appwrite/Network/Validator/URL.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php index 451e8e3b0..85ec99b07 100644 --- a/src/Appwrite/Network/Validator/Email.php +++ b/src/Appwrite/Network/Validator/Email.php @@ -10,7 +10,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use Utopia\Validator; diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php index 54c9ebbd2..0a912a77b 100644 --- a/src/Appwrite/Network/Validator/Host.php +++ b/src/Appwrite/Network/Validator/Host.php @@ -10,7 +10,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use Utopia\Validator; diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php index b1ea72779..8fed45dca 100644 --- a/src/Appwrite/Network/Validator/IP.php +++ b/src/Appwrite/Network/Validator/IP.php @@ -10,7 +10,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use Exception; use Utopia\Validator; diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php index a610928d7..b7907da71 100644 --- a/src/Appwrite/Network/Validator/URL.php +++ b/src/Appwrite/Network/Validator/URL.php @@ -10,7 +10,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use Utopia\Validator; From 07140bda5a92298b858ac0e3f7ca106b74ff7178 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 24 Mar 2021 13:47:43 -0400 Subject: [PATCH 07/21] Replace utopia libs with native validators --- app/controllers/api/account.php | 6 +++--- app/controllers/api/avatars.php | 2 +- app/controllers/api/projects.php | 2 +- app/controllers/api/teams.php | 4 ++-- app/controllers/api/users.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index fd09aaa3d..0a2615199 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -6,10 +6,10 @@ use Utopia\Exception; use Utopia\Config\Config; use Utopia\Validator\Assoc; use Utopia\Validator\Text; -use Utopia\Validator\Email; +use Appwrite\Network\Validator\Email; use Utopia\Validator\WhiteList; -use Utopia\Validator\Host; -use Utopia\Validator\URL; +use Appwrite\Network\Validator\Host; +use Appwrite\Network\Validator\URL; use Utopia\Audit\Audit; use Utopia\Audit\Adapters\MySQL as AuditAdapter; use Appwrite\Auth\Auth; diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php index a094dc672..b5c47c198 100644 --- a/app/controllers/api/avatars.php +++ b/app/controllers/api/avatars.php @@ -14,7 +14,7 @@ use Utopia\Validator\Boolean; use Utopia\Validator\HexColor; use Utopia\Validator\Range; use Utopia\Validator\Text; -use Utopia\Validator\URL; +use Appwrite\Network\Validator\URL; use Utopia\Validator\WhiteList; $avatarCallback = function ($type, $code, $width, $height, $quality, $response) { diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index 63c99ffae..573771461 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -6,7 +6,7 @@ use Utopia\Validator\ArrayList; use Utopia\Validator\Boolean; use Utopia\Validator\Text; use Utopia\Validator\WhiteList; -use Utopia\Validator\URL; +use Appwrite\Network\Validator\URL; use Utopia\Validator\Range; use Utopia\Config\Config; use Utopia\Domains\Domain; diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index c4a9e4875..847b37484 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -3,9 +3,9 @@ use Utopia\App; use Utopia\Exception; use Utopia\Config\Config; -use Utopia\Validator\Email; +use Appwrite\Network\Validator\Email; use Utopia\Validator\Text; -use Utopia\Validator\Host; +use Appwrite\Network\Validator\Host; use Utopia\Validator\Range; use Utopia\Validator\ArrayList; use Utopia\Validator\WhiteList; diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 958dfc148..58ec3ee97 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -4,7 +4,7 @@ use Utopia\App; use Utopia\Exception; use Utopia\Validator\Assoc; use Utopia\Validator\WhiteList; -use Utopia\Validator\Email; +use Appwrite\Network\Validator\Email; use Utopia\Validator\Text; use Utopia\Validator\Range; use Utopia\Audit\Audit; From 31bf1bdcef6c58b6d43e671389424f56c0d2776f Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 24 Mar 2021 14:34:47 -0400 Subject: [PATCH 08/21] Update validator namespaces --- tests/unit/Network/Validators/EmailTest.php | 2 +- tests/unit/Network/Validators/HostTest.php | 2 +- tests/unit/Network/Validators/IPTest.php | 2 +- tests/unit/Network/Validators/URLTest.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/Network/Validators/EmailTest.php b/tests/unit/Network/Validators/EmailTest.php index 03e4d043c..5a7bf0f96 100755 --- a/tests/unit/Network/Validators/EmailTest.php +++ b/tests/unit/Network/Validators/EmailTest.php @@ -11,7 +11,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use PHPUnit\Framework\TestCase; diff --git a/tests/unit/Network/Validators/HostTest.php b/tests/unit/Network/Validators/HostTest.php index dbaf83b7b..724ad7415 100755 --- a/tests/unit/Network/Validators/HostTest.php +++ b/tests/unit/Network/Validators/HostTest.php @@ -11,7 +11,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use PHPUnit\Framework\TestCase; diff --git a/tests/unit/Network/Validators/IPTest.php b/tests/unit/Network/Validators/IPTest.php index 1be8f78ab..8ebd12dd0 100755 --- a/tests/unit/Network/Validators/IPTest.php +++ b/tests/unit/Network/Validators/IPTest.php @@ -11,7 +11,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use PHPUnit\Framework\TestCase; diff --git a/tests/unit/Network/Validators/URLTest.php b/tests/unit/Network/Validators/URLTest.php index cd4844f7c..458637da6 100755 --- a/tests/unit/Network/Validators/URLTest.php +++ b/tests/unit/Network/Validators/URLTest.php @@ -11,7 +11,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use PHPUnit\Framework\TestCase; From 448276fcd485f3e58a65e4bca8a8bf5fb37be7db Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 24 Mar 2021 14:35:36 -0400 Subject: [PATCH 09/21] Validator constants not defined --- src/Appwrite/Network/Validator/Email.php | 2 +- src/Appwrite/Network/Validator/Host.php | 2 +- src/Appwrite/Network/Validator/IP.php | 2 +- src/Appwrite/Network/Validator/URL.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php index 85ec99b07..1736ac817 100644 --- a/src/Appwrite/Network/Validator/Email.php +++ b/src/Appwrite/Network/Validator/Email.php @@ -44,7 +44,7 @@ class Email extends Validator */ public function getType() { - return self::TYPE_STRING; + return 'string'; } /** diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php index 0a912a77b..145e4eb7e 100644 --- a/src/Appwrite/Network/Validator/Host.php +++ b/src/Appwrite/Network/Validator/Host.php @@ -54,7 +54,7 @@ class Host extends Validator */ public function getType() { - return self::TYPE_STRING; + return 'string'; } /** diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php index 8fed45dca..c1d1402db 100644 --- a/src/Appwrite/Network/Validator/IP.php +++ b/src/Appwrite/Network/Validator/IP.php @@ -70,7 +70,7 @@ class IP extends Validator */ public function getType() { - return self::TYPE_STRING; + return 'string'; } /** diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php index b7907da71..0a2a1326e 100644 --- a/src/Appwrite/Network/Validator/URL.php +++ b/src/Appwrite/Network/Validator/URL.php @@ -44,7 +44,7 @@ class URL extends Validator */ public function getType() { - return self::TYPE_STRING; + return 'string'; } /** From 30fc7df975aeba531e32a4769d700f09d76e45c6 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 29 Mar 2021 13:14:20 +0545 Subject: [PATCH 10/21] python functions env 3.9 --- app/config/environments.php | 9 +++++++++ docker/environments/build.sh | 3 +++ docker/environments/python-3.9/Dockerfile | 11 +++++++++++ .../Services/Functions/FunctionsCustomServerTest.php | 8 ++++++++ 4 files changed, 31 insertions(+) create mode 100644 docker/environments/python-3.9/Dockerfile diff --git a/app/config/environments.php b/app/config/environments.php index 9f1c5638e..c74db6fd3 100644 --- a/app/config/environments.php +++ b/app/config/environments.php @@ -70,6 +70,15 @@ $environments = [ 'logo' => 'python.png', 'supports' => [System::X86, System::PPC, System::ARM], ], + 'python-3.9' => [ + 'name' => 'Python', + 'version' => '3.9', + 'base' => 'python:3.9-alpine', + 'image' => 'appwrite/env-python-3.9:1.0.0', + 'build' => '/usr/src/code/docker/environments/python-3.9', + 'logo' => 'python.png', + 'supports' => [System::X86, System::PPC, System::ARM], + ], 'deno-1.2' => [ 'name' => 'Deno', 'version' => '1.2', diff --git a/docker/environments/build.sh b/docker/environments/build.sh index 1543c5814..175389847 100644 --- a/docker/environments/build.sh +++ b/docker/environments/build.sh @@ -24,6 +24,9 @@ docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 echo 'Python 3.8...' docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-python-3.8:1.0.0 ./docker/environments/python-3.8/ --push +echo 'Python 3.9...' +docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-python-3.9:1.0.0 ./docker/environments/python-3.9/ --push + echo 'Ruby 2.7...' docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-ruby-2.7:1.0.2 ./docker/environments/ruby-2.7/ --push diff --git a/docker/environments/python-3.9/Dockerfile b/docker/environments/python-3.9/Dockerfile new file mode 100644 index 000000000..94b7b8ceb --- /dev/null +++ b/docker/environments/python-3.9/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3.9-alpine + +LABEL maintainer="team@appwrite.io" + +RUN apk add tar + +RUN mkdir /usr/local/src + +WORKDIR /usr/local/src/ + +ENV PYTHONPATH "${PYTHONPATH}:/usr/local/src/.appwrite" \ No newline at end of file diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index b04a635cf..08f2f046d 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -485,6 +485,14 @@ class FunctionsCustomServerTest extends Scope 'command' => 'python main.py', 'timeout' => 15, ], + [ + 'language' => 'Python', + 'version' => '3.9', + 'name' => 'python-3.9', + 'code' => $functions.'/python.tar.gz', + 'command' => 'python main.py', + 'timeout' => 15, + ], [ 'language' => 'Node.js', 'version' => '14.5', From c49166248795cf49860f6934f06fe6c65a134750 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Tue, 30 Mar 2021 07:25:21 -0400 Subject: [PATCH 11/21] Remove utopia license comments --- src/Appwrite/Network/Validator/Email.php | 10 ---------- src/Appwrite/Network/Validator/Host.php | 10 ---------- src/Appwrite/Network/Validator/IP.php | 10 ---------- src/Appwrite/Network/Validator/URL.php | 10 ---------- 4 files changed, 40 deletions(-) diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php index 1736ac817..ca9ba1d53 100644 --- a/src/Appwrite/Network/Validator/Email.php +++ b/src/Appwrite/Network/Validator/Email.php @@ -1,14 +1,4 @@ - * @license The MIT License (MIT) - */ namespace Appwrite\Network\Validator; diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php index 145e4eb7e..f746ecd75 100644 --- a/src/Appwrite/Network/Validator/Host.php +++ b/src/Appwrite/Network/Validator/Host.php @@ -1,14 +1,4 @@ - * @license The MIT License (MIT) - */ namespace Appwrite\Network\Validator; diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php index c1d1402db..523147eb2 100644 --- a/src/Appwrite/Network/Validator/IP.php +++ b/src/Appwrite/Network/Validator/IP.php @@ -1,14 +1,4 @@ - * @license The MIT License (MIT) - */ namespace Appwrite\Network\Validator; diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php index 0a2a1326e..bd1546e11 100644 --- a/src/Appwrite/Network/Validator/URL.php +++ b/src/Appwrite/Network/Validator/URL.php @@ -1,14 +1,4 @@ - * @license The MIT License (MIT) - */ namespace Appwrite\Network\Validator; From 1c9fbf0b1713ee45b0dd450b4f42423b7ae01434 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 31 Mar 2021 07:15:25 +0545 Subject: [PATCH 12/21] self signed certs on readmes --- docs/sdks/dart/GETTING_STARTED.md | 1 + docs/sdks/deno/GETTING_STARTED.md | 2 ++ docs/sdks/dotnet/GETTING_STARTED.md | 1 + docs/sdks/flutter/GETTING_STARTED.md | 4 ++-- docs/sdks/nodejs/GETTING_STARTED.md | 2 ++ docs/sdks/php/GETTING_STARTED.md | 2 ++ docs/sdks/python/GETTING_STARTED.md | 2 ++ docs/sdks/ruby/GETTING_STARTED.md | 2 ++ docs/sdks/web/GETTING_STARTED.md | 2 ++ 9 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/sdks/dart/GETTING_STARTED.md b/docs/sdks/dart/GETTING_STARTED.md index 56297a2e5..5318c8ce1 100644 --- a/docs/sdks/dart/GETTING_STARTED.md +++ b/docs/sdks/dart/GETTING_STARTED.md @@ -11,6 +11,7 @@ void main() async { .setEndpoint('http://[HOSTNAME_OR_IP]/v1') // Make sure your endpoint is accessible .setProject('5ff3379a01d25') // Your project ID .setKey('cd868c7af8bdc893b4...93b7535db89') + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert Users users = Users(client); diff --git a/docs/sdks/deno/GETTING_STARTED.md b/docs/sdks/deno/GETTING_STARTED.md index bfe40468b..b8f851a4b 100644 --- a/docs/sdks/deno/GETTING_STARTED.md +++ b/docs/sdks/deno/GETTING_STARTED.md @@ -10,6 +10,7 @@ client .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint .setProject('5df5acd0d48c2') // Your project ID .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; ``` @@ -41,6 +42,7 @@ client .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint .setProject('5df5acd0d48c2') // Your project ID .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; let promise = users.create('email@example.com', 'password'); diff --git a/docs/sdks/dotnet/GETTING_STARTED.md b/docs/sdks/dotnet/GETTING_STARTED.md index 66dca9ff3..4363c6820 100644 --- a/docs/sdks/dotnet/GETTING_STARTED.md +++ b/docs/sdks/dotnet/GETTING_STARTED.md @@ -14,6 +14,7 @@ static async Task Main(string[] args) .setEndpoint('http://[HOSTNAME_OR_IP]/v1') // Make sure your endpoint is accessible .setProject('5ff3379a01d25') // Your project ID .setKey('cd868c7af8bdc893b4...93b7535db89') + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; var users = Users(client); diff --git a/docs/sdks/flutter/GETTING_STARTED.md b/docs/sdks/flutter/GETTING_STARTED.md index 78845f3e1..9af9720d8 100644 --- a/docs/sdks/flutter/GETTING_STARTED.md +++ b/docs/sdks/flutter/GETTING_STARTED.md @@ -58,7 +58,7 @@ Client client = Client(); client .setEndpoint('https://localhost/v1') // Your Appwrite Endpoint .setProject('5e8cf4f46b5e8') // Your project ID - .setSelfSigned() // Remove in production + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; ``` @@ -91,7 +91,7 @@ Client client = Client(); client .setEndpoint('https://localhost/v1') // Your Appwrite Endpoint .setProject('5e8cf4f46b5e8') // Your project ID - .setSelfSigned() // Remove in production + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; diff --git a/docs/sdks/nodejs/GETTING_STARTED.md b/docs/sdks/nodejs/GETTING_STARTED.md index 1053f2814..b2ce5f091 100644 --- a/docs/sdks/nodejs/GETTING_STARTED.md +++ b/docs/sdks/nodejs/GETTING_STARTED.md @@ -12,6 +12,7 @@ client .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint .setProject('5df5acd0d48c2') // Your project ID .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; ``` @@ -40,6 +41,7 @@ client .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint .setProject('5df5acd0d48c2') // Your project ID .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; let users = new sdk.Users(client); diff --git a/docs/sdks/php/GETTING_STARTED.md b/docs/sdks/php/GETTING_STARTED.md index b92bb90e9..a7ceb6137 100644 --- a/docs/sdks/php/GETTING_STARTED.md +++ b/docs/sdks/php/GETTING_STARTED.md @@ -10,6 +10,7 @@ $client ->setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint ->setProject('5df5acd0d48c2') // Your project ID ->setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key + ->setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; ``` @@ -33,6 +34,7 @@ $client ->setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint ->setProject('5df5acd0d48c2') // Your project ID ->setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key + ->setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; $users = new Users($client); diff --git a/docs/sdks/python/GETTING_STARTED.md b/docs/sdks/python/GETTING_STARTED.md index b513f01da..81c795450 100644 --- a/docs/sdks/python/GETTING_STARTED.md +++ b/docs/sdks/python/GETTING_STARTED.md @@ -13,6 +13,7 @@ client = Client() .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint .set_project('5df5acd0d48c2') # Your project ID .set_key('919c2d18fb5d4...a2ae413da83346ad2') # Your secret API key + .set_self_signed() # Use only on dev mode with a self-signed SSL cert ) ``` @@ -36,6 +37,7 @@ client = Client() .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint .set_project('5df5acd0d48c2') # Your project ID .set_key('919c2d18fb5d4...a2ae413da83346ad2') # Your secret API key + .set_self_signed() # Use only on dev mode with a self-signed SSL cert ) users = Users(client) diff --git a/docs/sdks/ruby/GETTING_STARTED.md b/docs/sdks/ruby/GETTING_STARTED.md index 23de47c1a..acabf1c0a 100644 --- a/docs/sdks/ruby/GETTING_STARTED.md +++ b/docs/sdks/ruby/GETTING_STARTED.md @@ -12,6 +12,7 @@ client .set_endpoint(ENV["APPWRITE_ENDPOINT"]) # Your API Endpoint .set_project(ENV["APPWRITE_PROJECT"]) # Your project ID .set_key(ENV["APPWRITE_SECRET"]) # Your secret API key + .setSelfSigned() # Use only on dev mode with a self-signed SSL cert ; ``` @@ -34,6 +35,7 @@ client .set_endpoint(ENV["APPWRITE_ENDPOINT"]) # Your API Endpoint .set_project(ENV["APPWRITE_PROJECT"]) # Your project ID .set_key(ENV["APPWRITE_SECRET"]) # Your secret API key + .setSelfSigned() # Use only on dev mode with a self-signed SSL cert ; users = Appwrite::Users.new(client); diff --git a/docs/sdks/web/GETTING_STARTED.md b/docs/sdks/web/GETTING_STARTED.md index c8eee4999..f8908ae9d 100644 --- a/docs/sdks/web/GETTING_STARTED.md +++ b/docs/sdks/web/GETTING_STARTED.md @@ -15,6 +15,7 @@ const appwrite = new Appwrite(); appwrite .setEndpoint('http://localhost/v1') // Your Appwrite Endpoint .setProject('455x34dfkj') // Your project ID + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; ``` @@ -41,6 +42,7 @@ const appwrite = new Appwrite(); appwrite .setEndpoint('http://localhost/v1') // Your Appwrite Endpoint .setProject('455x34dfkj') + .setSelfSigned() // Use only on dev mode with a self-signed SSL cert ; // Register User From 5d0ea6a45f3c66f2aca137e67bad364a310f00de Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 1 Apr 2021 11:59:23 +0545 Subject: [PATCH 13/21] Set default locale on .env #1052 --- .env | 1 + app/init.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 581af6d97..6e3367a7e 100644 --- a/.env +++ b/.env @@ -1,5 +1,6 @@ _APP_ENV=production _APP_ENV=development +_APP_LOCALE=en _APP_SYSTEM_EMAIL_NAME=Appwrite _APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io diff --git a/app/init.php b/app/init.php index 2aa5fb020..311cfccb6 100644 --- a/app/init.php +++ b/app/init.php @@ -313,7 +313,7 @@ App::setResource('layout', function($locale) { }, ['locale']); App::setResource('locale', function() { - return new Locale('en'); + return new Locale(App::getEnv('_APP_LOCALE', 'en')); }); // Queues From a9950edcc1fbd816216c667e0e602c026caa64e7 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 4 Apr 2021 07:08:41 +0545 Subject: [PATCH 14/21] updating default functions env python env --- app/config/variables.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/variables.php b/app/config/variables.php index 20b49bd9e..b6e93eabb 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -381,7 +381,7 @@ return [ 'name' => '_APP_FUNCTIONS_ENVS', 'description' => 'This option allows you to limit the available environments for cloud functions. This option is very useful for low-cost servers to safe disk space.\n\nTo enable/activate this option, pass a list of allowed environments separated by a comma.\n\nCurrently, supported environments are: ' . \implode(', ', \array_keys(Config::getParam('providers'))), 'introduction' => '0.7.0', - 'default' => 'node-14.5,deno-1.6,php-7.4,python-3.8,ruby-3.0,dotnet-5.0', + 'default' => 'node-14.5,deno-1.6,php-7.4,python-3.9,ruby-3.0,dotnet-5.0', 'required' => false, 'question' => '', ], From c3fb2e6c46aa3471bfd4ea9ace262128035c7c4c Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 4 Apr 2021 07:15:41 +0545 Subject: [PATCH 15/21] adding locale to dev docker compose, dockerfile and compose and variables --- Dockerfile | 1 + app/config/variables.php | 8 ++++++++ app/views/install/compose.phtml | 1 + docker-compose.yml | 1 + 4 files changed, 11 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7cd404b7a..74dc9685e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -68,6 +68,7 @@ ARG VERSION=dev ENV _APP_SERVER=swoole \ _APP_ENV=production \ + _APP_LOCALE=en \ _APP_DOMAIN=localhost \ _APP_DOMAIN_TARGET=localhost \ _APP_HOME=https://appwrite.io \ diff --git a/app/config/variables.php b/app/config/variables.php index 20b49bd9e..e7e964f72 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -15,6 +15,14 @@ return [ 'required' => false, 'question' => '', ], + [ + 'name' => '_APP_LOCALE', + 'description' => 'Set your Appwrite\'s locale. By default, the locale is set to \'en\'.', + 'introduction' => '', + 'default' => 'en', + 'required' => false, + 'question' => '', + ], [ 'name' => '_APP_OPTIONS_ABUSE', 'description' => 'Allows you to disable abuse checks and API rate limiting. By default, set to \'enabled\'. To cancel the abuse checking, set to \'disabled\'. It is not recommended to disable this check-in a production environment.', diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 1c0c98108..7508d4fb0 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -56,6 +56,7 @@ services: - influxdb environment: - _APP_ENV + - _APP_LOCALE - _APP_CONSOLE_WHITELIST_EMAILS - _APP_CONSOLE_WHITELIST_IPS - _APP_SYSTEM_EMAIL_NAME diff --git a/docker-compose.yml b/docker-compose.yml index c4ad29c64..806a10f23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,6 +75,7 @@ services: - influxdb environment: - _APP_ENV + - _APP_LOCALE - _APP_SYSTEM_EMAIL_NAME - _APP_SYSTEM_EMAIL_ADDRESS - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS From 7794204acba615cea3bd1af4d36d5cc0f42cd0d9 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 4 Apr 2021 07:55:56 +0545 Subject: [PATCH 16/21] disable clamav stuff on installation --- app/config/variables.php | 2 +- app/views/install/compose.phtml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/config/variables.php b/app/config/variables.php index 20b49bd9e..d4cdacb06 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -311,7 +311,7 @@ return [ 'name' => '_APP_STORAGE_ANTIVIRUS', 'description' => 'This variable allows you to disable the internal anti-virus scans. This value is set to \'enabled\' by default, to cancel the scans set the value to \'disabled\'. When disabled, it\'s recommended to turn off the ClamAV container for better resource usage.', 'introduction' => '', - 'default' => 'enabled', + 'default' => 'disabled', 'required' => false, 'question' => '', ], diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 1c0c98108..750e4c281 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -52,7 +52,7 @@ services: depends_on: - mariadb - redis - - clamav +# - clamav - influxdb environment: - _APP_ENV @@ -351,14 +351,14 @@ services: volumes: - appwrite-redis:/data:rw - clamav: - image: appwrite/clamav:1.2.0 - container_name: appwrite-clamav - restart: unless-stopped - networks: - - appwrite - volumes: - - appwrite-uploads:/storage/uploads +# clamav: +# image: appwrite/clamav:1.2.0 +# container_name: appwrite-clamav +# restart: unless-stopped +# networks: +# - appwrite +# volumes: +# - appwrite-uploads:/storage/uploads influxdb: image: influxdb:1.8-alpine From 272607ad3f2ded2c901cfe64b828fad4eb892eac Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 5 Apr 2021 12:25:37 +0545 Subject: [PATCH 17/21] update description --- app/config/variables.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/variables.php b/app/config/variables.php index d4cdacb06..f88000f25 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -309,7 +309,7 @@ return [ ], [ 'name' => '_APP_STORAGE_ANTIVIRUS', - 'description' => 'This variable allows you to disable the internal anti-virus scans. This value is set to \'enabled\' by default, to cancel the scans set the value to \'disabled\'. When disabled, it\'s recommended to turn off the ClamAV container for better resource usage.', + 'description' => 'This variable allows you to disable the internal anti-virus scans. This value is set to \'disabled\' by default, to enable the scans set the value to \'enabled\'. Before enabling, you must add the ClamAV service and depend on it on main Appwrite service.', 'introduction' => '', 'default' => 'disabled', 'required' => false, From ec87c11a0ab3cf41789269f759e369d4ea903dd8 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 5 Apr 2021 12:33:45 +0545 Subject: [PATCH 18/21] production doc section to enable ClamAV --- docs/tutorials/running-in-production.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/tutorials/running-in-production.md b/docs/tutorials/running-in-production.md index 2ed69d0ef..9c206efd7 100644 --- a/docs/tutorials/running-in-production.md +++ b/docs/tutorials/running-in-production.md @@ -30,6 +30,27 @@ If you decide to set up a load balancer for a specific container, make sure that There are three Appwrite containers that do keep their state are the MariaDB, Redis, and InfluxDB containers that are used for storing data, cache, and stats (in this order). To scale them out, all you need to do is set up a standard cluster (same as you would with any other app using these technologies) according to your needs and performance. +## [ Optional ] Enable ClamAV + +### Enable ClamAV Service on Docker Compose +Once you install Appwrite, in the `docker-compose.yml` file, the ClamAV service is disabled, you can simply enable the service by uncommenting the following lines in the `docker-compose.yml` file by removing preceeding `#` in each line. + +```yml + clamav: + image: appwrite/clamav:1.2.0 + container_name: appwrite-clamav + networks: + - appwrite + volumes: + - appwrite-uploads:/storage/uploads +``` + +### Enable ClamAV in Appwrite container +In order to enable ClamAV service to scan the storage, in `appwrite` service, in `docker-compose.yml` under `depends_on` uncomment the line containing `clamav`. After that update the environment variables. +Using the environment variable `_APP_STORAGE_ANTIVIRUS`, you can either disable or enable the antivirus. To enable it, in the environment section, find `_APP_STORAGE_ANTIVIRUS` and set its value to **enabled**, then set `_APP_STORAGE_ANTIVIRUS_HOST` to `clamav` and `_APP_STORAGE_ANTIVIRUS_PORT` to `3310`. This will enable the antivirus checking during new file uploads. + +Finally, you can now restart the `appwrite` service and start the `clamav` service. You can do that simply by using `docker-compose up -d` command. This should start the `clamav` service as well as recreate the `appwrite` service. + ## Sending Emails Sending emails is hard. There are a lot of SPAM rules and configurations to master in order to set a functional SMTP server. The SMTP server that comes packaged with Appwrite is great for development but needs some work done to function well against SPAM filters. You can find some guidelines in this [tutorial]([https://www.digitalocean.com/community/tutorials/how-to-use-an-spf-record-to-prevent-spoofing-improve-e-mail-reliability](https://www.digitalocean.com/community/tutorials/how-to-use-an-spf-record-to-prevent-spoofing-improve-e-mail-reliability)). From 5f3b44d5b7c7c3da20c90864a6fa3d240dffddcd Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Mon, 5 Apr 2021 12:47:48 +0545 Subject: [PATCH 19/21] remove old file --- docs/tutorials/running-in-production.md | 66 ------------------------- 1 file changed, 66 deletions(-) delete mode 100644 docs/tutorials/running-in-production.md diff --git a/docs/tutorials/running-in-production.md b/docs/tutorials/running-in-production.md deleted file mode 100644 index 9c206efd7..000000000 --- a/docs/tutorials/running-in-production.md +++ /dev/null @@ -1,66 +0,0 @@ -# Running in Production - -This tutorial will cover some basic concepts and best practices for running a production Appwrite server. This tutorial assumes you have some basic knowledge of Docker and Docker Compose command-line tools. - -## Error Reporting - -By default, Appwrite installation comes with error debugging turned on, We do this to help new users solve issues and report problems while still in development mode. - -In production, it is highly recommended to turn error reporting off. To do so, you have to change the Appwrite container environment variable **_APP_ENV** value from **development** to **production**. - -## Enable Encryption - -By default, the Appwrite setup doesn’t come with a uniquely generated encryption key. This key is used to store your files and sensitive data like webhook passwords or API keys in a safe way. To take advantage of this feature, you must generate a unique key and set it as the value of the **_APP_OPENSSL_KEY_V1** environment variable. - -Make sure to keep this key in a safe place and never make it publicly accessible. There are many [online resources]([https://www.freecodecamp.org/news/how-to-securely-store-api-keys-4ff3ea19ebda/](https://www.freecodecamp.org/news/how-to-securely-store-api-keys-4ff3ea19ebda/)) with methods of keeping your secret keys safe in your servers. - -## Limit Access to your Console - -By default, anyone can signup for your Appwrite server, create projects, and use your computing power. While this is great for testing around or running your Appwrite service in a network isolated environment, it is highly not recommended for public production use. - -We are providing three different methods to limit access to your Appwrite console. You can either set a list of [IPs]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_ips](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_ips)), [email address]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_emails](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_emails)) or [email domains]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_domains](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_domains)) which users are allowed to signup from. You can choose one or multiple restriction methods to apply. - -## Scaling - -Appwrite was built with scalability in mind. Appwrite can potentially scale horizontally infinitely with no known limitations. - -Appwrite uses a few containers to run, where each container has its job. Most of the Appwrite containers are stateless, and in order to scale them, all you need is run multiple instances of them and setup a load balancer in front of them. - -If you decide to set up a load balancer for a specific container, make sure that the containers that are trying to communicate with it are accessing it through a load balancer and not directly. All connections between Appwrite different containers are set using Docker environment variables. - -There are three Appwrite containers that do keep their state are the MariaDB, Redis, and InfluxDB containers that are used for storing data, cache, and stats (in this order). To scale them out, all you need to do is set up a standard cluster (same as you would with any other app using these technologies) according to your needs and performance. - -## [ Optional ] Enable ClamAV - -### Enable ClamAV Service on Docker Compose -Once you install Appwrite, in the `docker-compose.yml` file, the ClamAV service is disabled, you can simply enable the service by uncommenting the following lines in the `docker-compose.yml` file by removing preceeding `#` in each line. - -```yml - clamav: - image: appwrite/clamav:1.2.0 - container_name: appwrite-clamav - networks: - - appwrite - volumes: - - appwrite-uploads:/storage/uploads -``` - -### Enable ClamAV in Appwrite container -In order to enable ClamAV service to scan the storage, in `appwrite` service, in `docker-compose.yml` under `depends_on` uncomment the line containing `clamav`. After that update the environment variables. -Using the environment variable `_APP_STORAGE_ANTIVIRUS`, you can either disable or enable the antivirus. To enable it, in the environment section, find `_APP_STORAGE_ANTIVIRUS` and set its value to **enabled**, then set `_APP_STORAGE_ANTIVIRUS_HOST` to `clamav` and `_APP_STORAGE_ANTIVIRUS_PORT` to `3310`. This will enable the antivirus checking during new file uploads. - -Finally, you can now restart the `appwrite` service and start the `clamav` service. You can do that simply by using `docker-compose up -d` command. This should start the `clamav` service as well as recreate the `appwrite` service. - -## Sending Emails - -Sending emails is hard. There are a lot of SPAM rules and configurations to master in order to set a functional SMTP server. The SMTP server that comes packaged with Appwrite is great for development but needs some work done to function well against SPAM filters. You can find some guidelines in this [tutorial]([https://www.digitalocean.com/community/tutorials/how-to-use-an-spf-record-to-prevent-spoofing-improve-e-mail-reliability](https://www.digitalocean.com/community/tutorials/how-to-use-an-spf-record-to-prevent-spoofing-improve-e-mail-reliability)). - -Another **easier option** is to use an ‘SMTP as a service’ product like [Sendgrid]([https://sendgrid.com/](https://sendgrid.com/)) or [Mailgun]([https://www.mailgun.com/](https://www.mailgun.com/)). You can change Appwrite SMTP settings and credentials to any 3rd party provider you like who support SMTP integration using our [Docker environment variables]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#smtp](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#smtp)). Most services offer a decent free tier to get started with. - -## Backups - -Backups are highly recommended for any production environment. Currently, there is not built-in script we provide to do this automatically. To be able to backup your Appwrite server data, stats, and files you will need to do the following. - -1. Create a script to backups and restore your MariaDB Appwrite schema. Note that trying to backup MariaDB using a docker volume backup can result in a corrupted copy of your data. It is recommended to use MariaDB or MySQL built-in tools for this. -2. Create a script to backups and restore your InfluxDB stats. If you don’t care much about your server stats, you can skip this. -3. Create a script to backup Appwrite storage volume. There are many [online resources]([https://blog.ssdnodes.com/blog/docker-backup-volumes/](https://blog.ssdnodes.com/blog/docker-backup-volumes/)) explaining different ways to backup a docker volume. When running on multiple servers, it is very recommended to use an attachable storage point. Some cloud providers offer integrated backups to such attachable mount like GCP, AWS, DigitalOcean, and the list continues. From 8b9cf9abddfa777b58f38aac776acb5fd862526a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Sat, 10 Apr 2021 15:28:55 +0200 Subject: [PATCH 20/21] fix: disable clamav for development and ci --- .env | 2 +- docker-compose.yml | 16 ++++++++-------- tests/resources/docker/docker-compose.yml | 19 ++++++++++--------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.env b/.env index 6e3367a7e..1c260bc3f 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ _APP_DB_PORT=3306 _APP_DB_SCHEMA=appwrite _APP_DB_USER=user _APP_DB_PASS=password -_APP_STORAGE_ANTIVIRUS=enabled +_APP_STORAGE_ANTIVIRUS=disabled _APP_STORAGE_ANTIVIRUS_HOST=clamav _APP_STORAGE_ANTIVIRUS_PORT=3310 _APP_INFLUXDB_HOST=influxdb diff --git a/docker-compose.yml b/docker-compose.yml index 806a10f23..994270785 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,7 +71,7 @@ services: depends_on: - mariadb - redis - - clamav + # - clamav - influxdb environment: - _APP_ENV @@ -414,13 +414,13 @@ services: volumes: - appwrite-redis:/data:rw - clamav: - image: appwrite/clamav:1.2.0 - container_name: appwrite-clamav - networks: - - appwrite - volumes: - - appwrite-uploads:/storage/uploads + # clamav: + # image: appwrite/clamav:1.2.0 + # container_name: appwrite-clamav + # networks: + # - appwrite + # volumes: + # - appwrite-uploads:/storage/uploads influxdb: image: influxdb:1.8-alpine diff --git a/tests/resources/docker/docker-compose.yml b/tests/resources/docker/docker-compose.yml index 9f4074c54..7a931600c 100644 --- a/tests/resources/docker/docker-compose.yml +++ b/tests/resources/docker/docker-compose.yml @@ -62,7 +62,7 @@ services: depends_on: - mariadb - redis - - clamav + # - clamav - influxdb environment: - _APP_ENV @@ -81,6 +81,7 @@ services: - _APP_USAGE_STATS - _APP_INFLUXDB_HOST - _APP_INFLUXDB_PORT + - _APP_STORAGE_ANTIVIRUS=disabled - _APP_STORAGE_LIMIT - _APP_FUNCTIONS_TIMEOUT - _APP_FUNCTIONS_CONTAINERS @@ -326,14 +327,14 @@ services: volumes: - appwrite-redis:/data:rw - clamav: - image: appwrite/clamav:1.2.0 - container_name: appwrite-clamav - restart: unless-stopped - networks: - - appwrite - volumes: - - appwrite-uploads:/storage/uploads + # clamav: + # image: appwrite/clamav:1.2.0 + # container_name: appwrite-clamav + # restart: unless-stopped + # networks: + # - appwrite + # volumes: + # - appwrite-uploads:/storage/uploads influxdb: image: influxdb:1.6 From 2150c7e63f7c0c6e4285abca525d5b8998cf7d35 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Sat, 10 Apr 2021 15:54:03 +0200 Subject: [PATCH 21/21] fix: tests for docker services --- tests/unit/Docker/ComposeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/Docker/ComposeTest.php b/tests/unit/Docker/ComposeTest.php index c484fc17e..79fbdd9f9 100644 --- a/tests/unit/Docker/ComposeTest.php +++ b/tests/unit/Docker/ComposeTest.php @@ -36,7 +36,7 @@ class ComposeTest extends TestCase public function testServices() { - $this->assertCount(17, $this->object->getServices()); + $this->assertCount(16, $this->object->getServices()); $this->assertEquals('appwrite-telegraf', $this->object->getService('telegraf')->getContainerName()); $this->assertEquals('appwrite', $this->object->getService('appwrite')->getContainerName()); $this->assertEquals('', $this->object->getService('appwrite')->getImageVersion());