From e35ccea43aafcfe0e1b78aebc58ecd5e1f4d93d3 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Sat, 5 Mar 2022 15:35:44 -0800 Subject: [PATCH 1/4] Fix platform type mismatch in origin validation --- app/controllers/api/projects.php | 3 ++- src/Appwrite/Network/Validator/Origin.php | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index ed2de69ae4..2bee190628 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -4,6 +4,7 @@ use Appwrite\Auth\Auth; use Appwrite\Auth\Validator\Password; use Appwrite\Network\Validator\CNAME; use Appwrite\Network\Validator\Domain as DomainValidator; +use Appwrite\Network\Validator\Origin; use Appwrite\Network\Validator\URL; use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Response; @@ -1002,7 +1003,7 @@ App::post('/v1/projects/:projectId/platforms') ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_PLATFORM) ->param('projectId', null, new UID(), 'Project unique ID.') - ->param('type', null, new WhiteList(['web', 'flutter-ios', 'flutter-android', 'flutter-linux', 'flutter-macos', 'flutter-windows', 'apple-ios', 'apple-macos', 'apple-watchos', 'apple-tvos', 'android', 'unity'], true), 'Platform type.') + ->param('type', null, new WhiteList([Origin::CLIENT_TYPE_WEB, Origin::CLIENT_TYPE_FLUTTER_IOS, Origin::CLIENT_TYPE_FLUTTER_ANDROID, Origin::CLIENT_TYPE_FLUTTER_LINUX, Origin::CLIENT_TYPE_FLUTTER_MACOS, Origin::CLIENT_TYPE_FLUTTER_WINDOWS, Origin::CLIENT_TYPE_APPLE_IOS, Origin::CLIENT_TYPE_APPLE_MACOS, Origin::CLIENT_TYPE_APPLE_WATCHOS, Origin::CLIENT_TYPE_APPLE_TVOS, Origin::CLIENT_TYPE_ANDROID, Origin::CLIENT_TYPE_UNITY], true), 'Platform type.') ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.') ->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true) ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true) diff --git a/src/Appwrite/Network/Validator/Origin.php b/src/Appwrite/Network/Validator/Origin.php index 385f9e2dc0..8831707cef 100644 --- a/src/Appwrite/Network/Validator/Origin.php +++ b/src/Appwrite/Network/Validator/Origin.php @@ -13,8 +13,12 @@ class Origin extends Validator public const CLIENT_TYPE_FLUTTER_MACOS = 'flutter-macos'; public const CLIENT_TYPE_FLUTTER_WINDOWS = 'flutter-windows'; public const CLIENT_TYPE_FLUTTER_LINUX = 'flutter-linux'; + public const CLIENT_TYPE_APPLE_IOS = 'apple-ios'; + public const CLIENT_TYPE_APPLE_MACOS = 'apple-macos'; + public const CLIENT_TYPE_APPLE_WATCHOS = 'apple-watchos'; + public const CLIENT_TYPE_APPLE_TVOS = 'apple-tvos'; public const CLIENT_TYPE_ANDROID = 'android'; - public const CLIENT_TYPE_IOS = 'ios'; + public const CLIENT_TYPE_UNITY = 'unity'; public const SCHEME_TYPE_HTTP = 'http'; @@ -73,7 +77,7 @@ class Origin extends Validator case self::CLIENT_TYPE_FLUTTER_WINDOWS: case self::CLIENT_TYPE_FLUTTER_LINUX: case self::CLIENT_TYPE_ANDROID: - case self::CLIENT_TYPE_IOS: + case self::CLIENT_TYPE_APPLE_IOS: $this->clients[] = (isset($platform['key'])) ? $platform['key'] : ''; break; From 5e8d2c1ee7cd6bfe50574e4a78268b0796fee489 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 7 Mar 2022 11:03:10 +0100 Subject: [PATCH 2/4] chore: add 0.13.x to issue template --- .github/ISSUE_TEMPLATE/bug.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml index 62272064f8..d30f05bfd4 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -37,6 +37,7 @@ body: label: "🎲 Appwrite version" description: "What version of Appwrite are you running?" options: + - Version 0.13.x - Version 0.12.x - Version 0.11.x - Version 0.10.x From 13ac77e78ccee9966eac655084486f8b5d1be376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Mon, 7 Mar 2022 11:31:41 +0000 Subject: [PATCH 3/4] Updated environment secrets --- app/views/install/compose.phtml | 1 + docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 06feff2160..180d2248d3 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -344,6 +344,7 @@ services: - _APP_STORAGE_DO_SPACES_BUCKET - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG + - _APP_EXECUTOR_SECRET appwrite-worker-certificates: image: /: diff --git a/docker-compose.yml b/docker-compose.yml index 8844c4fe58..c12ae93889 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -280,6 +280,7 @@ services: - _APP_STORAGE_DO_SPACES_BUCKET - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG + - _APP_EXECUTOR_SECRET appwrite-worker-database: entrypoint: worker-database From 048997dd4177f803e08ee27b6251ba8ec49f5500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Mon, 7 Mar 2022 13:03:51 +0000 Subject: [PATCH 4/4] Imcreased execution substring limit --- app/executor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/executor.php b/app/executor.php index b82d17a117..1fa32599ab 100644 --- a/app/executor.php +++ b/app/executor.php @@ -500,8 +500,8 @@ App::post('/v1/execution') $execution = [ 'status' => $functionStatus, 'statusCode' => $statusCode, - 'stdout' => \utf8_encode(\mb_substr($stdout, -8000)), - 'stderr' => \utf8_encode(\mb_substr($stderr, -8000)), + 'stdout' => \utf8_encode(\mb_substr($stdout, -16384)), + 'stderr' => \utf8_encode(\mb_substr($stderr, -16384)), 'time' => $executionTime, ];