diff --git a/src/Appwrite/Domain/Validator/AppwriteDomain.php b/src/Appwrite/Domain/Validator/AppwriteDomain.php index 061ee99525..69e7eae91b 100644 --- a/src/Appwrite/Domain/Validator/AppwriteDomain.php +++ b/src/Appwrite/Domain/Validator/AppwriteDomain.php @@ -14,11 +14,19 @@ class AppwriteDomain extends Domain public function isValid($value): bool { + if (empty($value)) { + return false; + } + // Reject domains with leading/trailing whitespace if (!is_string($value) || $value !== trim($value)) { return false; } + if (\filter_var($value, FILTER_VALIDATE_DOMAIN) === false) { + return false; + } + if (preg_match('/^https?:\/\//', $value)) { return false; } @@ -27,16 +35,8 @@ class AppwriteDomain extends Domain return false; } - if (!parent::isValid($value)) { - return false; - } - $domain = strtolower($value); - if ($domain === 'localhost' || $domain === 'api.localhost') { - return false; - } - $parts = explode('.', $domain); $firstLabel = $parts[0]; if (str_starts_with($firstLabel, 'commit-') || str_starts_with($firstLabel, 'branch-')) {