app/controllers/api/proxy.php (2)

217-243: Improved domain validation logic based on rule type

The implementation now correctly determines the target CNAME based on the rule type and deployment resource type, which makes the validation more accurate. Each rule type (api, redirect, deployment) now points to its appropriate target domain, enhancing the reliability of DNS validation.

Consider extracting this logic into a separate method like getTargetCNAMEForRule($rule) to improve readability and maintainability. This would make the code more modular and easier to test.

-        $targetCNAME = null;
-        switch ($rule->getAttribute('type', '')) {
-            case 'api':
-                // For example: fra.cloud.appwrite.io
-                $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
-                break;
-            case 'redirect':
-                // For example: appwrite.network
-                $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
-                break;
-            case 'deployment':
-                switch ($rule->getAttribute('deploymentResourceType', '')) {
-                    case 'function':
-                        // For example: fra.appwrite.run
-                        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_FUNCTIONS', ''));
-                        break;
-                    case 'site':
-                        // For example: appwrite.network
-                        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
-                        break;
-                    default:
-                        break;
-                }
-                // no break
-            default:
-                break;
-        }
+        $targetCNAME = $this->getTargetCNAMEForRule($rule);

Then add this method to the class:

private function getTargetCNAMEForRule(Document $rule): ?Domain
{
    switch ($rule->getAttribute('type', '')) {
        case 'api':
            // For example: fra.cloud.appwrite.io
            return new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
        case 'redirect':
            // For example: appwrite.network
            return new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
        case 'deployment':
            switch ($rule->getAttribute('deploymentResourceType', '')) {
                case 'function':
                    // For example: fra.appwrite.run
                    return new Domain(System::getEnv('_APP_DOMAIN_FUNCTIONS', ''));
                case 'site':
                    // For example: appwrite.network
                    return new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
                default:
                    return null;
            }
            // no break intentionally to fall through to default
        default:
            return null;
    }
}

---

247-251: Improved CNAME validator addition logic

The code now only adds a DNS validator for CNAME records when an appropriate target domain is determined and is valid. This prevents validation against inappropriate or invalid target domains.

Consider adding a log entry when a target CNAME is not available or not valid for debugging purposes:

        if (!is_null($targetCNAME)) {
            if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+            } else {
+                $log->debug('Target CNAME is known or is test domain, skipping CNAME validation');
            }
+        } else {
+            $log->debug('No target CNAME determined for rule type: ' . $rule->getAttribute('type', ''));
        }

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro