mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge branch 'main' into fix/tanstack-start-vite-output
This commit is contained in:
11 files changed
+219
-34
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -343,9 +343,12 @@ abstract class Scope extends TestCase
|
||||
}
|
||||
|
||||
$query = http_build_query($queryParams);
|
||||
$url = 'http://' . $hostname . ':5000/__find_request__?' . $query;
|
||||
|
||||
for ($attempt = 0; $attempt <= $maxAttempts; $attempt++) {
|
||||
$response = @file_get_contents($url);
|
||||
$requests = is_string($response) ? json_decode($response, true) : [];
|
||||
|
||||
for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
|
||||
$requests = json_decode(file_get_contents('http://' . $hostname . ':5000/__find_request__?' . $query), true);
|
||||
if (is_array($requests)) {
|
||||
for ($i = count($requests) - 1; $i >= 0; $i--) {
|
||||
$request = $this->decodeRequestData($requests[$i]);
|
||||
@@ -369,30 +372,8 @@ abstract class Scope extends TestCase
|
||||
}
|
||||
}
|
||||
|
||||
usleep($delayMs * 1000);
|
||||
}
|
||||
|
||||
$requests = json_decode(file_get_contents('http://' . $hostname . ':5000/__find_request__?' . $query), true);
|
||||
if (is_array($requests)) {
|
||||
for ($i = count($requests) - 1; $i >= 0; $i--) {
|
||||
$request = $this->decodeRequestData($requests[$i]);
|
||||
if ($probe !== null) {
|
||||
try {
|
||||
$probe($request);
|
||||
return $request;
|
||||
} catch (\Throwable $error) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if ($enforceProjectId) {
|
||||
$requestProjectId = $request['headers']['X-Appwrite-Webhook-Project-Id'] ?? '';
|
||||
if ($requestProjectId === $projectId) {
|
||||
return $request;
|
||||
}
|
||||
} else {
|
||||
return $request;
|
||||
}
|
||||
if ($attempt < $maxAttempts) {
|
||||
usleep($delayMs * 1000);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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([
|
||||
|
||||
Reference in new issue
Block a user