Wildcard host validator

utopia-php · Jan 4, 2024 · 9cfeb16 · 9cfeb16
1 parent ad6f7e6
commit 9cfeb16
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Validator/Host.php b/src/Validator/Host.php
@@ -51,11 +51,13 @@ public function isValid($value): bool
             return false;
         }
 
-        if (\in_array(\parse_url($value, PHP_URL_HOST), $this->whitelist)) {
-            return true;
+        $hostnameValidator = new Hostname($this->whitelist);
+
+        if (!$hostnameValidator->isValid(\parse_url($value, PHP_URL_HOST))) {
+            return false;
         }
 
-        return false;
+        return true;
     }
 
     /**

diff --git a/tests/Validator/HostTest.php b/tests/Validator/HostTest.php
@@ -21,7 +21,7 @@ class HostTest extends TestCase
 
     public function setUp(): void
     {
-        $this->host = new Host(['example.io', 'subdomain.example.test', 'localhost']);
+        $this->host = new Host(['example.io', 'subdomain.example.test', 'localhost', '*.appwrite.io']);
     }
 
     public function testIsValid()
@@ -32,6 +32,10 @@ public function testIsValid()
         $this->assertEquals($this->host->isValid('localhost'), false);
         $this->assertEquals($this->host->isValid('http://subdomain.example.test/path'), true);
         $this->assertEquals($this->host->isValid('http://test.subdomain.example.test/path'), false);
+        $this->assertEquals($this->host->isValid('http://appwrite.io/path'), false);
+        $this->assertEquals($this->host->isValid('http://me.appwrite.io/path'), true);
+        $this->assertEquals($this->host->isValid('http://you.appwrite.io/path'), true);
+        $this->assertEquals($this->host->isValid('http://us.together.appwrite.io/path'), true);
         $this->assertEquals($this->host->getType(), 'string');
     }
 }