Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete orphaned proxy rules on create

Browse Source
This commit is contained in:
Chirag Aggarwal
2026-05-14 15:12:53 +05:30
parent 65d1e58e34
commit 0d32a2e623
5 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Platform/Modules/Proxy/Action.php
+52
View File
@@ -5,7 +5,11 @@ namespace Appwrite\Platform\Modules\Proxy;
use Appwrite\Extend\Exception;
use Appwrite\Network\Validator\DNS as ValidatorDNS;
use Appwrite\Platform\Action as PlatformAction;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\DNS\Message\Record;
use Utopia\Domains\Domain;
use Utopia\Logger\Log;
@@ -20,6 +24,54 @@ class Action extends PlatformAction
{
}
protected function createRule(Document $rule, Database $dbForPlatform, Authorization $authorization): Document
{
try {
return $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
} catch (Duplicate) {
if (!$this->deleteOrphanedRule($rule, $dbForPlatform, $authorization)) {
throw new Exception(Exception::RULE_ALREADY_EXISTS);
}
}
try {
return $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
} catch (Duplicate) {
throw new Exception(Exception::RULE_ALREADY_EXISTS);
}
}
private function deleteOrphanedRule(Document $rule, Database $dbForPlatform, Authorization $authorization): bool
{
$existingRule = $authorization->skip(function () use ($rule, $dbForPlatform) {
$existingRule = $dbForPlatform->findOne('rules', [
Query::equal('domain', [$rule->getAttribute('domain', '')]),
]);
if (!$existingRule->isEmpty()) {
return $existingRule;
}
return $dbForPlatform->getDocument('rules', $rule->getId());
});
if ($existingRule->isEmpty()) {
return false;
}
$project = $authorization->skip(
fn () => $dbForPlatform->getDocument('projects', $existingRule->getAttribute('projectId', ''))
);
if (!$project->isEmpty()) {
return false;
}
$authorization->skip(fn () => $dbForPlatform->deleteDocument('rules', $existingRule->getId()));
return true;
}
/**
* Ensures domain is not in the deny list and is a valid domain
*
src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php
+1 -6
View File
@@ -12,7 +12,6 @@ use Appwrite\SDK\Response as SDKResponse;
use Appwrite\Utopia\Response;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Validator\Authorization;
use Utopia\Logger\Log;
@@ -120,11 +119,7 @@ class Create extends Action
}
}
try {
$rule = $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
} catch (Duplicate $e) {
throw new Exception(Exception::RULE_ALREADY_EXISTS);
}
$rule = $this->createRule($rule, $dbForPlatform, $authorization);
if ($rule->getAttribute('status', '') === RULE_STATUS_CERTIFICATE_GENERATING) {
$publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(
src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php
+1 -6
View File
@@ -12,7 +12,6 @@ use Appwrite\SDK\Response as SDKResponse;
use Appwrite\Utopia\Response;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\UID;
@@ -142,11 +141,7 @@ class Create extends Action
}
}
try {
$rule = $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
} catch (Duplicate $e) {
throw new Exception(Exception::RULE_ALREADY_EXISTS);
}
$rule = $this->createRule($rule, $dbForPlatform, $authorization);
if ($rule->getAttribute('status', '') === RULE_STATUS_CERTIFICATE_GENERATING) {
$publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(
src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
+1 -6
View File
@@ -12,7 +12,6 @@ use Appwrite\SDK\Response as SDKResponse;
use Appwrite\Utopia\Response;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\UID;
@@ -149,11 +148,7 @@ class Create extends Action
}
}
try {
$rule = $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
} catch (Duplicate $e) {
throw new Exception(Exception::RULE_ALREADY_EXISTS);
}
$rule = $this->createRule($rule, $dbForPlatform, $authorization);
if ($rule->getAttribute('status', '') === RULE_STATUS_CERTIFICATE_GENERATING) {
$publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(
src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php
+1 -6
View File
@@ -12,7 +12,6 @@ use Appwrite\SDK\Response as SDKResponse;
use Appwrite\Utopia\Response;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\UID;
@@ -142,11 +141,7 @@ class Create extends Action
}
}
try {
$rule = $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
} catch (Duplicate $e) {
throw new Exception(Exception::RULE_ALREADY_EXISTS);
}
$rule = $this->createRule($rule, $dbForPlatform, $authorization);
if ($rule->getAttribute('status', '') === RULE_STATUS_CERTIFICATE_GENERATING) {
$publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(