From 9ca29c17cbd947a16e06ac2c57a3f955795dbd3d Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 1 Jun 2026 11:40:11 +0100 Subject: [PATCH 1/3] Revert template root directory ./ stripping Co-Authored-By: Claude Opus 4.7 (1M context) --- src/Appwrite/Platform/Modules/Functions/Workers/Builds.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php index 92e00cd4e6..f04f7c3807 100644 --- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php +++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php @@ -298,9 +298,6 @@ class Builds extends Action $templateRootDirectory = $template->getAttribute('rootDirectory', ''); $templateRootDirectory = \trim($templateRootDirectory, '/'); - while (\str_starts_with($templateRootDirectory, './')) { - $templateRootDirectory = \substr($templateRootDirectory, 2); - } if ($templateRootDirectory !== '' && \preg_match('#(^|/)\.\.(/|$)#', $templateRootDirectory)) { throw new \Exception('Invalid template root directory'); } @@ -426,9 +423,6 @@ class Builds extends Action $templateRootDirectory = $template->getAttribute('rootDirectory', ''); $templateRootDirectory = \trim($templateRootDirectory, '/'); - while (\str_starts_with($templateRootDirectory, './')) { - $templateRootDirectory = \substr($templateRootDirectory, 2); - } if ($templateRootDirectory !== '' && \preg_match('#(^|/)\.\.(/|$)#', $templateRootDirectory)) { throw new \Exception('Invalid template root directory'); } From f22c7425f758073fb84ee6a094621f12a6175f5a Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 1 Jun 2026 12:02:02 +0100 Subject: [PATCH 2/3] Revert sites test relaxation tied to template path stripping Co-Authored-By: Claude Opus 4.7 (1M context) --- tests/e2e/Services/Sites/SitesCustomServerTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index 9cca689780..2df37c6b1a 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -2274,7 +2274,7 @@ class SitesCustomServerTest extends Scope $deployment = $this->createTemplateDeployment($siteId, [ 'repository' => $template['providerRepositoryId'], 'owner' => $template['providerOwner'], - 'rootDirectory' => $template['frameworks'][0]['providerRootDirectory'], + 'rootDirectory' => \ltrim($template['frameworks'][0]['providerRootDirectory'], './'), 'type' => 'tag', 'reference' => $template['providerVersion'], 'activate' => true @@ -2345,7 +2345,7 @@ class SitesCustomServerTest extends Scope $deployment = $this->createTemplateDeployment($siteId, [ 'repository' => $template['providerRepositoryId'], 'owner' => $template['providerOwner'], - 'rootDirectory' => $template['frameworks'][0]['providerRootDirectory'], + 'rootDirectory' => \ltrim($template['frameworks'][0]['providerRootDirectory'], './'), 'type' => 'branch', 'reference' => 'main', 'activate' => true @@ -2423,7 +2423,7 @@ class SitesCustomServerTest extends Scope $deployment = $this->createTemplateDeployment($siteId, [ 'repository' => $template['providerRepositoryId'], 'owner' => $template['providerOwner'], - 'rootDirectory' => $template['frameworks'][0]['providerRootDirectory'], + 'rootDirectory' => \ltrim($template['frameworks'][0]['providerRootDirectory'], './'), 'type' => 'commit', 'reference' => $latestCommit, 'activate' => true From 6ed54706b3cd87c4a348db931f37ffcb52d30bc5 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 1 Jun 2026 12:22:59 +0100 Subject: [PATCH 3/3] Restore original ./ stripping for template and VCS root directories Co-Authored-By: Claude Opus 4.7 (1M context) --- .../Modules/Functions/Workers/Builds.php | 21 ++++++++----------- .../Services/Sites/SitesCustomServerTest.php | 6 +++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php index f04f7c3807..dd0f9d541b 100644 --- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php +++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php @@ -297,10 +297,9 @@ class Builds extends Action $templateReferenceValue = $template->getAttribute('referenceValue', ''); $templateRootDirectory = $template->getAttribute('rootDirectory', ''); - $templateRootDirectory = \trim($templateRootDirectory, '/'); - if ($templateRootDirectory !== '' && \preg_match('#(^|/)\.\.(/|$)#', $templateRootDirectory)) { - throw new \Exception('Invalid template root directory'); - } + $templateRootDirectory = \rtrim($templateRootDirectory, '/'); + $templateRootDirectory = \ltrim($templateRootDirectory, '.'); + $templateRootDirectory = \ltrim($templateRootDirectory, '/'); if (! empty($templateRepositoryName) && ! empty($templateOwnerName) && ! empty($templateReferenceType) && ! empty($templateReferenceValue)) { $stdout = ''; @@ -363,10 +362,9 @@ class Builds extends Action // VCS and VCS+Temaplte $tmpDirectory = '/tmp/builds/' . $deploymentId . '/code'; $rootDirectory = $resource->getAttribute('providerRootDirectory', ''); - $rootDirectory = \trim($rootDirectory, '/'); - if ($rootDirectory !== '' && \preg_match('#(^|/)\.\.(/|$)#', $rootDirectory)) { - throw new \Exception('Invalid root directory'); - } + $rootDirectory = \rtrim($rootDirectory, '/'); + $rootDirectory = \ltrim($rootDirectory, '.'); + $rootDirectory = \ltrim($rootDirectory, '/'); $owner = $github->getOwnerName($providerInstallationId); $repositoryName = $github->getRepositoryName($providerRepositoryId); @@ -422,10 +420,9 @@ class Builds extends Action $templateReferenceValue = $template->getAttribute('referenceValue', ''); $templateRootDirectory = $template->getAttribute('rootDirectory', ''); - $templateRootDirectory = \trim($templateRootDirectory, '/'); - if ($templateRootDirectory !== '' && \preg_match('#(^|/)\.\.(/|$)#', $templateRootDirectory)) { - throw new \Exception('Invalid template root directory'); - } + $templateRootDirectory = \rtrim($templateRootDirectory, '/'); + $templateRootDirectory = \ltrim($templateRootDirectory, '.'); + $templateRootDirectory = \ltrim($templateRootDirectory, '/'); if (! empty($templateRepositoryName) && ! empty($templateOwnerName) && ! empty($templateReferenceType) && ! empty($templateReferenceValue)) { // Clone template repo diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index 2df37c6b1a..9cca689780 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -2274,7 +2274,7 @@ class SitesCustomServerTest extends Scope $deployment = $this->createTemplateDeployment($siteId, [ 'repository' => $template['providerRepositoryId'], 'owner' => $template['providerOwner'], - 'rootDirectory' => \ltrim($template['frameworks'][0]['providerRootDirectory'], './'), + 'rootDirectory' => $template['frameworks'][0]['providerRootDirectory'], 'type' => 'tag', 'reference' => $template['providerVersion'], 'activate' => true @@ -2345,7 +2345,7 @@ class SitesCustomServerTest extends Scope $deployment = $this->createTemplateDeployment($siteId, [ 'repository' => $template['providerRepositoryId'], 'owner' => $template['providerOwner'], - 'rootDirectory' => \ltrim($template['frameworks'][0]['providerRootDirectory'], './'), + 'rootDirectory' => $template['frameworks'][0]['providerRootDirectory'], 'type' => 'branch', 'reference' => 'main', 'activate' => true @@ -2423,7 +2423,7 @@ class SitesCustomServerTest extends Scope $deployment = $this->createTemplateDeployment($siteId, [ 'repository' => $template['providerRepositoryId'], 'owner' => $template['providerOwner'], - 'rootDirectory' => \ltrim($template['frameworks'][0]['providerRootDirectory'], './'), + 'rootDirectory' => $template['frameworks'][0]['providerRootDirectory'], 'type' => 'commit', 'reference' => $latestCommit, 'activate' => true