From 8c8f7b7c48fa3118f8de59611580414d80ddeb74 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Fri, 29 May 2026 16:40:42 +0530 Subject: [PATCH] Normalize template root directories in builds --- src/Appwrite/Platform/Modules/Functions/Workers/Builds.php | 6 ++++++ tests/e2e/Services/Sites/SitesCustomServerTest.php | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php index f04f7c3807..92e00cd4e6 100644 --- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php +++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php @@ -298,6 +298,9 @@ 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'); } @@ -423,6 +426,9 @@ 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'); } diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index 01bb0de589..e1b55d4dfb 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