fix(compute): require resourceType on deployment get/delete/download/activate (#13127)

* fix(compute): require resourceType on deployment get/delete/download/activate

Function and site IDs are independent namespaces. resourceId-only checks on
Get, Delete, Download, and activate Update can still cross a type boundary
when a function and site share a custom ID. Match Status/Duplicate/Create by
requiring resourceType as well, and add cross-type e2e coverage.

Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>

* fix(functions): allow empty deployment resourceType for legacy records

Pre-Sites deployments may have a null/empty resourceType. Keep rejecting
mismatched types, but do not treat an unset resourceType as a foreign
resource on Functions get/delete/download/activate. Sites stay strict
because site deployments have always set resourceType.

Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>

* fix(compute): disambiguate empty deployment resourceType via resourceInternalId

Strict resourceType rejects untyped legacy rows; empty-type-as-functions
reopened cross-type access when IDs collide. Accept a deployment when
resourceType matches, or when resourceType is empty and resourceInternalId
matches the parent sequence (unique across functions/sites).

Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>

* test(compute): pass boolean false for inactive deployment setup

SitesBase treats activate with loose equality, so the string 'false'
still waits for activation and flakes the resourceType ownership e2e.

Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>

* fix(compute): reject untyped deployments when function/site IDs collide

Sequences are per-collection, so resourceInternalId alone is not enough
for empty resourceType. Allow the legacy empty-type path only when the
other resource namespace has no document with the same custom ID.

Also fix e2e activate handling for multipart (string 'false' + manual ready wait).

Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>

* fix(compute): require strict deployment resourceType ownership

Drop the empty-resourceType compatibility branch. Per-collection sequence
fallbacks and opposite-resource lookups were still ambiguous under ID
collisions and permission filtering. Match Status/Duplicate/Create: require
resourceId and resourceType together.

Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>

* fix(compute): auth-skip opposite-resource check for untyped deployments

Restore empty-resourceType compatibility using resourceInternalId, but only
when no opposite-namespace resource shares the custom ID. Look up the
opposite resource with authorization skipped so permission filtering cannot
hide a colliding function/site and reopen cross-type access.

Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>

* fix(compute): only reject untyped deployments on sequence collisions

Opposite-type resources may share a custom ID with a different sequence.
Keep allowing that legacy empty-resourceType path when resourceInternalId
matches the parent. Reject only when the opposite resource also shares the
same sequence, which is the ambiguous cross-namespace case.

Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>

* refactor(compute): simplify deployment ownership checks

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
This commit is contained in:
authored and GitHub committed 2026-08-13 12:37:18 +05:30
1 parent a6d21fcda6
commit 644e17d173
10 files changed
+212 -8

No files matched your search

@@ -87,7 +87,12 @@ class Delete extends Action
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
if ($deployment->getAttribute('resourceId') !== $function->getId()) {
$resourceType = $deployment->getAttribute('resourceType');
// Untyped deployments predate Sites and belong to Functions.
if (
$deployment->getAttribute('resourceId') !== $function->getId()
|| ($resourceType !== 'functions' && !empty($resourceType))
) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
@@ -111,7 +111,12 @@ class Get extends Action
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
if ($deployment->getAttribute('resourceId') !== $function->getId()) {
$resourceType = $deployment->getAttribute('resourceType');
// Untyped deployments predate Sites and belong to Functions.
if (
$deployment->getAttribute('resourceId') !== $function->getId()
|| ($resourceType !== 'functions' && !empty($resourceType))
) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
@@ -71,7 +71,12 @@ class Get extends Action
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
if ($deployment->getAttribute('resourceId') !== $function->getId()) {
$resourceType = $deployment->getAttribute('resourceType');
// Untyped deployments predate Sites and belong to Functions.
if (
$deployment->getAttribute('resourceId') !== $function->getId()
|| ($resourceType !== 'functions' && !empty($resourceType))
) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
@@ -88,7 +88,12 @@ class Update extends Base
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
if ($deployment->getAttribute('resourceId') !== $function->getId()) {
$resourceType = $deployment->getAttribute('resourceType');
// Untyped deployments predate Sites and belong to Functions.
if (
$deployment->getAttribute('resourceId') !== $function->getId()
|| ($resourceType !== 'functions' && !empty($resourceType))
) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
@@ -87,7 +87,10 @@ class Delete extends Action
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
if ($deployment->getAttribute('resourceId') !== $site->getId()) {
if (
$deployment->getAttribute('resourceId') !== $site->getId()
|| $deployment->getAttribute('resourceType') !== 'sites'
) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
@@ -110,7 +110,10 @@ class Get extends Action
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
if ($deployment->getAttribute('resourceId') !== $site->getId()) {
if (
$deployment->getAttribute('resourceId') !== $site->getId()
|| $deployment->getAttribute('resourceType') !== 'sites'
) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
@@ -67,7 +67,10 @@ class Get extends Action
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
if ($deployment->getAttribute('resourceId') !== $site->getId()) {
if (
$deployment->getAttribute('resourceId') !== $site->getId()
|| $deployment->getAttribute('resourceType') !== 'sites'
) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
@@ -86,7 +86,10 @@ class Update extends Base
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
if ($deployment->getAttribute('resourceId') !== $site->getId()) {
if (
$deployment->getAttribute('resourceId') !== $site->getId()
|| $deployment->getAttribute('resourceType') !== 'sites'
) {
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
}
@@ -1391,6 +1391,92 @@ final class FunctionsCustomServerTest extends Scope
$this->cleanupFunction($otherFunctionId);
}
public function testDeploymentEndpointsRequireMatchingResourceType(): void
{
$sharedId = ID::unique();
$functionId = $this->setupFunction([
'functionId' => $sharedId,
'name' => 'Resource type function',
'runtime' => 'node-22',
'entrypoint' => 'index.js',
'execute' => [Role::any()->toString()],
]);
$site = $this->client->call(Client::METHOD_POST, '/sites', [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
], [
'siteId' => $sharedId,
'name' => 'Resource type site',
'framework' => 'other',
'buildRuntime' => 'node-22',
'outputDirectory' => './',
'providerBranch' => 'main',
'providerRootDirectory' => './',
'fallbackFile' => '',
]);
$this->assertEquals(201, $site['headers']['status-code']);
$deployment = $this->createDeployment($functionId, [
'code' => $this->packageFunction('basic'),
'activate' => 'false',
'entrypoint' => 'index.js',
]);
$this->assertEquals(202, $deployment['headers']['status-code']);
$deploymentId = $deployment['body']['$id'] ?? '';
$this->assertEventually(function () use ($functionId, $deploymentId) {
$deployment = $this->getDeployment($functionId, $deploymentId);
$this->assertEquals('ready', $deployment['body']['status']);
}, 120000, 500);
/**
* Test for FAILURE — a site that shares the function custom ID must not
* read or mutate the function deployment (resourceType mismatch).
*/
$response = $this->client->call(Client::METHOD_GET, '/sites/' . $sharedId . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
$this->assertEquals(404, $response['headers']['status-code']);
$this->assertEquals('deployment_not_found', $response['body']['type']);
$response = $this->client->call(Client::METHOD_PATCH, '/sites/' . $sharedId . '/deployment', [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
], [
'deploymentId' => $deploymentId,
]);
$this->assertEquals(404, $response['headers']['status-code']);
$this->assertEquals('deployment_not_found', $response['body']['type']);
$response = $this->client->call(Client::METHOD_DELETE, '/sites/' . $sharedId . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
$this->assertEquals(404, $response['headers']['status-code']);
$this->assertEquals('deployment_not_found', $response['body']['type']);
/**
* Test for SUCCESS — the owning function path still works.
*/
$response = $this->getDeployment($functionId, $deploymentId);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($deploymentId, $response['body']['$id']);
$this->client->call(Client::METHOD_DELETE, '/sites/' . $sharedId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
$this->cleanupFunction($functionId);
}
public function testCreateDuplicateDeploymentRequiresOwnership(): void
{
$data = $this->setupTestDeployment();
@@ -1619,6 +1619,92 @@ final class SitesCustomServerTest extends Scope
$this->cleanupSite($siteId);
}
public function testDeploymentEndpointsRequireMatchingResourceType(): void
{
$sharedId = ID::unique();
$siteId = $this->setupSite([
'buildRuntime' => 'node-22',
'fallbackFile' => '',
'framework' => 'other',
'name' => 'Resource type site',
'outputDirectory' => './',
'providerBranch' => 'main',
'providerRootDirectory' => './',
'siteId' => $sharedId,
]);
$function = $this->client->call(Client::METHOD_POST, '/functions', [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
], [
'functionId' => $sharedId,
'name' => 'Resource type function',
'runtime' => 'node-22',
'entrypoint' => 'index.js',
'execute' => ['any'],
]);
$this->assertEquals(201, $function['headers']['status-code']);
$deployment = $this->createDeployment($siteId, [
'code' => $this->packageSite('static-single-file'),
'activate' => 'false',
]);
$this->assertEquals(202, $deployment['headers']['status-code']);
$deploymentId = $deployment['body']['$id'] ?? '';
$this->assertEventually(function () use ($siteId, $deploymentId) {
$deployment = $this->getDeployment($siteId, $deploymentId);
$this->assertEquals('ready', $deployment['body']['status']);
}, 120000, 500);
/**
* Test for FAILURE — a function that shares the site custom ID must not
* read or mutate the site deployment (resourceType mismatch).
*/
$response = $this->client->call(Client::METHOD_GET, '/functions/' . $sharedId . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
$this->assertEquals(404, $response['headers']['status-code']);
$this->assertEquals('deployment_not_found', $response['body']['type']);
$response = $this->client->call(Client::METHOD_PATCH, '/functions/' . $sharedId . '/deployment', [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
], [
'deploymentId' => $deploymentId,
]);
$this->assertEquals(404, $response['headers']['status-code']);
$this->assertEquals('deployment_not_found', $response['body']['type']);
$response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $sharedId . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
$this->assertEquals(404, $response['headers']['status-code']);
$this->assertEquals('deployment_not_found', $response['body']['type']);
/**
* Test for SUCCESS — the owning site path still works.
*/
$response = $this->getDeployment($siteId, $deploymentId);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($deploymentId, $response['body']['$id']);
$this->client->call(Client::METHOD_DELETE, '/functions/' . $sharedId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
$this->cleanupDeployment($siteId, $deploymentId);
$this->cleanupSite($siteId);
}
public function testCreateDuplicateDeploymentRequiresOwnership(): void
{
$siteId = $this->setupSite([