fix wildcard-domain matching

hesham-fouda · Feb 5, 2014 · f889e61 · f889e61
1 parent 13a04e0
commit f889e61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Whitelist/Definition/WildcardDomain.php b/src/Whitelist/Definition/WildcardDomain.php
@@ -20,7 +20,7 @@ public function validate()
 	public function match($value)
 	{
 		// Remove the wildcard part and check if it matches the end of $value
-		$domain = substr($this->_definition, 2);
+		$domain = substr($this->_definition, 1);
 
 		return substr($value, -strlen($domain)) === $domain;
 	}

diff --git a/tests/Definition/DomainTest.php b/tests/Definition/DomainTest.php
@@ -39,6 +39,9 @@ public function provider()
 		return array(
 			array(true,  new Whitelist\Definition\WildcardDomain('*.example.com'), 'sub.example.com'),
 			array(true,  new Whitelist\Definition\WildcardDomain('*.example.com'), 'anothersub.example.com'),
+			array(false,  new Whitelist\Definition\WildcardDomain('*.example.com'), 'sub.example.net'),
+			array(false,  new Whitelist\Definition\WildcardDomain('*.example.com'), 'sub.anotherexample.com'),
+			array(false,  new Whitelist\Definition\WildcardDomain('*.example.com'), 'localhost'),
 			array(true,  new Whitelist\Definition\Domain('example.com'), 'example.com'),
 			array(false, new Whitelist\Definition\Domain('example.com'), 'sub.example.com'),
 			array(false, new Whitelist\Definition\Domain('example.com'), 'example2.com'),