diff --git a/src/Appwrite/Network/Validator/AppwriteDomain.php b/src/Appwrite/Network/Validator/AppwriteDomain.php index 881284a007..595c99d478 100644 --- a/src/Appwrite/Network/Validator/AppwriteDomain.php +++ b/src/Appwrite/Network/Validator/AppwriteDomain.php @@ -37,14 +37,21 @@ class AppwriteDomain extends ValidatorDomain return false; } - // 5. Handle URLs with protocols (let Domain class handle extraction) + // 5. Handle URLs with protocols or paths (let Domain class handle extraction) if (preg_match('/^[a-z]+:\/\//', $domain)) { - // Extract hostname from URL for validation + // Extract hostname from URL with protocol for validation $parsed = parse_url($domain); if ($parsed === false || !isset($parsed['host'])) { return false; } $domain = $parsed['host']; + } elseif (strpos($domain, '/') !== false) { + // Extract hostname from URL with path but no protocol + $parsed = parse_url('http://' . $domain); + if ($parsed === false || !isset($parsed['host'])) { + return false; + } + $domain = $parsed['host']; } // 6. Only a-z, 0-9, hyphen, dot @@ -89,6 +96,11 @@ class AppwriteDomain extends ValidatorDomain $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', defined('APP_DOMAIN_SITES_SUFFIX') ? APP_DOMAIN_SITES_SUFFIX : 'appwrite.network'); $appwriteDomain = defined('APP_DOMAIN_SITES_SUFFIX') ? APP_DOMAIN_SITES_SUFFIX : 'appwrite.network'; + // Check for specific localhost domains that should be rejected + if ($domain === 'localhost' || $domain === 'api.localhost') { + return false; + } + foreach ([$functionsDomain, $sitesDomain, $appwriteDomain] as $managedDomain) { if (!empty($managedDomain)) { // Check if domain is exactly the managed domain (should be rejected)