Merge pull request #12450 from appwrite/chore/revert-path-stripping

Revert template root directory path-stripping changes
This commit is contained in:
Luke B. Silver authored and GitHub committed 2026-06-01 12:35:01 +01:00
commit 57ef57a681
1 file changed
+9 -18
@@ -297,13 +297,9 @@ class Builds extends Action
$templateReferenceValue = $template->getAttribute('referenceValue', '');
$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');
}
$templateRootDirectory = \rtrim($templateRootDirectory, '/');
$templateRootDirectory = \ltrim($templateRootDirectory, '.');
$templateRootDirectory = \ltrim($templateRootDirectory, '/');
if (! empty($templateRepositoryName) && ! empty($templateOwnerName) && ! empty($templateReferenceType) && ! empty($templateReferenceValue)) {
$stdout = '';
@@ -366,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);
@@ -425,13 +420,9 @@ class Builds extends Action
$templateReferenceValue = $template->getAttribute('referenceValue', '');
$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');
}
$templateRootDirectory = \rtrim($templateRootDirectory, '/');
$templateRootDirectory = \ltrim($templateRootDirectory, '.');
$templateRootDirectory = \ltrim($templateRootDirectory, '/');
if (! empty($templateRepositoryName) && ! empty($templateOwnerName) && ! empty($templateReferenceType) && ! empty($templateReferenceValue)) {
// Clone template repo