From d19f205207a19f894733c8f4284995493c898d33 Mon Sep 17 00:00:00 2001 From: Evan Date: Thu, 3 Oct 2024 14:38:03 -0700 Subject: [PATCH 1/5] Version Bump --- SECURITY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SECURITY.md b/SECURITY.md index a17a55e368..d5901533fb 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -11,6 +11,7 @@ | 1.3.x | :white_check_mark: | | 1.4.x | :white_check_mark: | | 1.5.x | :white_check_mark: | +| 1.6.x | :white_check_mark: | ## Reporting a Vulnerability From 6080a363ee11fb6b3efdc5bd7428be0f8dc7b686 Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Fri, 4 Oct 2024 13:28:38 +0530 Subject: [PATCH 2/5] update: names. --- app/assets/security/10k-common-passwords | 4 ++++ app/controllers/api/avatars.php | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/security/10k-common-passwords b/app/assets/security/10k-common-passwords index 487a4faf54..6902dfb81a 100644 --- a/app/assets/security/10k-common-passwords +++ b/app/assets/security/10k-common-passwords @@ -412,6 +412,7 @@ august sammy cool brian +brien platinum jake bronco @@ -1935,6 +1936,7 @@ panama lucy buffy brianna +brienna welcome1 vette blue22 @@ -3053,6 +3055,7 @@ randall abstr napster brian1 +brien1 bogart high hitler @@ -4123,6 +4126,7 @@ truman cubbies nitram briana +briena ebony kings warner diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php index fcff3e4179..f6044dd624 100644 --- a/app/controllers/api/avatars.php +++ b/app/controllers/api/avatars.php @@ -609,9 +609,9 @@ App::get('/v1/cards/cloud') $isPlatinum = $user->getInternalId() % 100 === 0; } else { - $name = $mock === 'normal-long' ? 'Sir First Walter O\'Brian Junior' : 'Walter O\'Brian'; + $name = $mock === 'normal-long' ? 'Sir First Walter O\'Brien Junior' : 'Walter O\'Brien'; $createdAt = new \DateTime('now'); - $githubName = $mock === 'normal-no-github' ? '' : ($mock === 'normal-long' ? 'sir-first-walterobrian-junior' : 'walterobrian'); + $githubName = $mock === 'normal-no-github' ? '' : ($mock === 'normal-long' ? 'sir-first-walterobrien-junior' : 'walterobrien'); $isHero = $mock === 'hero'; $isContributor = $mock === 'contributor'; $isEmployee = \str_starts_with($mock, 'employee'); @@ -900,9 +900,9 @@ App::get('/v1/cards/cloud-og') } else { $bgVariation = \str_ends_with($mock, '-bg2') ? '2' : (\str_ends_with($mock, '-bg3') ? '3' : '1'); $cardVariation = \str_ends_with($mock, '-right') ? '2' : (\str_ends_with($mock, '-middle') ? '3' : '1'); - $name = \str_starts_with($mock, 'normal-long') ? 'Sir First Walter O\'Brian Junior' : 'Walter O\'Brian'; + $name = \str_starts_with($mock, 'normal-long') ? 'Sir First Walter O\'Brien Junior' : 'Walter O\'Brien'; $createdAt = new \DateTime('now'); - $githubName = $mock === 'normal-no-github' ? '' : (\str_starts_with($mock, 'normal-long') ? 'sir-first-walterobrian-junior' : 'walterobrian'); + $githubName = $mock === 'normal-no-github' ? '' : (\str_starts_with($mock, 'normal-long') ? 'sir-first-walterobrien-junior' : 'walterobrien'); $isHero = \str_starts_with($mock, 'hero'); $isContributor = \str_starts_with($mock, 'contributor'); $isEmployee = \str_starts_with($mock, 'employee'); From 62096dc008161bb859cda06c92414f4fa43ea1fb Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Wed, 23 Oct 2024 14:22:37 +0100 Subject: [PATCH 3/5] chore: use 1 instead of 0.5 cpu --- app/config/runtimes/specifications.php | 2 +- app/init.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/runtimes/specifications.php b/app/config/runtimes/specifications.php index d3625db8a2..86db2708b1 100644 --- a/app/config/runtimes/specifications.php +++ b/app/config/runtimes/specifications.php @@ -6,7 +6,7 @@ return [ Specification::S_05VCPU_512MB => [ 'slug' => Specification::S_05VCPU_512MB, 'memory' => 512, - 'cpus' => 0.5 + 'cpus' => 1 ], Specification::S_1VCPU_512MB => [ 'slug' => Specification::S_1VCPU_512MB, diff --git a/app/init.php b/app/init.php index b4ab772e0e..2162bf8333 100644 --- a/app/init.php +++ b/app/init.php @@ -148,7 +148,7 @@ const APP_SOCIAL_DEV = 'https://dev.to/appwrite'; const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite'; const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1'; const APP_HOSTNAME_INTERNAL = 'appwrite'; -const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_05VCPU_512MB; +const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB; const APP_FUNCTION_CPUS_DEFAULT = 0.5; const APP_FUNCTION_MEMORY_DEFAULT = 512; From 6f7d8d7f62f919f280f86d08da62c98f00e085c1 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:16:15 +0100 Subject: [PATCH 4/5] chore: add comment --- app/config/runtimes/specifications.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/runtimes/specifications.php b/app/config/runtimes/specifications.php index 86db2708b1..68880f4d4e 100644 --- a/app/config/runtimes/specifications.php +++ b/app/config/runtimes/specifications.php @@ -6,7 +6,7 @@ return [ Specification::S_05VCPU_512MB => [ 'slug' => Specification::S_05VCPU_512MB, 'memory' => 512, - 'cpus' => 1 + 'cpus' => 1 // TODO: revert this, it's a temporary change to test function performance. ], Specification::S_1VCPU_512MB => [ 'slug' => Specification::S_1VCPU_512MB, From 51fe894a3f769db631f995f65dd52a52d7624d85 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:20:45 +0100 Subject: [PATCH 5/5] Revert "Merge pull request #8757 from ItzNotABug/update-walter-references" This reverts commit a49c3a33f0fd831423afa7a0b53df2c5d709fc2b, reversing changes made to 3887ba69d7d5bc2a1d07885f1f1329c58dad9cf6. --- app/assets/security/10k-common-passwords | 4 ---- app/controllers/api/avatars.php | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/assets/security/10k-common-passwords b/app/assets/security/10k-common-passwords index 6902dfb81a..487a4faf54 100644 --- a/app/assets/security/10k-common-passwords +++ b/app/assets/security/10k-common-passwords @@ -412,7 +412,6 @@ august sammy cool brian -brien platinum jake bronco @@ -1936,7 +1935,6 @@ panama lucy buffy brianna -brienna welcome1 vette blue22 @@ -3055,7 +3053,6 @@ randall abstr napster brian1 -brien1 bogart high hitler @@ -4126,7 +4123,6 @@ truman cubbies nitram briana -briena ebony kings warner diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php index f4839fdf0d..dadd9da5e3 100644 --- a/app/controllers/api/avatars.php +++ b/app/controllers/api/avatars.php @@ -609,9 +609,9 @@ App::get('/v1/cards/cloud') $isPlatinum = $user->getInternalId() % 100 === 0; } else { - $name = $mock === 'normal-long' ? 'Sir First Walter O\'Brien Junior' : 'Walter O\'Brien'; + $name = $mock === 'normal-long' ? 'Sir First Walter O\'Brian Junior' : 'Walter O\'Brian'; $createdAt = new \DateTime('now'); - $githubName = $mock === 'normal-no-github' ? '' : ($mock === 'normal-long' ? 'sir-first-walterobrien-junior' : 'walterobrien'); + $githubName = $mock === 'normal-no-github' ? '' : ($mock === 'normal-long' ? 'sir-first-walterobrian-junior' : 'walterobrian'); $isHero = $mock === 'hero'; $isContributor = $mock === 'contributor'; $isEmployee = \str_starts_with($mock, 'employee'); @@ -900,9 +900,9 @@ App::get('/v1/cards/cloud-og') } else { $bgVariation = \str_ends_with($mock, '-bg2') ? '2' : (\str_ends_with($mock, '-bg3') ? '3' : '1'); $cardVariation = \str_ends_with($mock, '-right') ? '2' : (\str_ends_with($mock, '-middle') ? '3' : '1'); - $name = \str_starts_with($mock, 'normal-long') ? 'Sir First Walter O\'Brien Junior' : 'Walter O\'Brien'; + $name = \str_starts_with($mock, 'normal-long') ? 'Sir First Walter O\'Brian Junior' : 'Walter O\'Brian'; $createdAt = new \DateTime('now'); - $githubName = $mock === 'normal-no-github' ? '' : (\str_starts_with($mock, 'normal-long') ? 'sir-first-walterobrien-junior' : 'walterobrien'); + $githubName = $mock === 'normal-no-github' ? '' : (\str_starts_with($mock, 'normal-long') ? 'sir-first-walterobrian-junior' : 'walterobrian'); $isHero = \str_starts_with($mock, 'hero'); $isContributor = \str_starts_with($mock, 'contributor'); $isEmployee = \str_starts_with($mock, 'employee');