Merge pull request #114 from utopia-php/feat-wildcart-host-validator

Fix: Wildcard host validator

Author: TorstenDittmann

src/Http/Validator/Host.php

@@ -51,11 +51,9 @@ 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);
 
-        return false;
+        return $hostnameValidator->isValid(\parse_url($value, PHP_URL_HOST));
     }
 
     /**

tests/Validator/HostTest.php

@@ -10,7 +10,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()
@@ -21,6 +21,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');
     }
 }