Update domain validation ignoring ports.

fixes dingo#754
judereid · Dec 8, 2015 · d55f08c · d55f08c
1 parent 02dd0e9
commit d55f08c
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/src/Http/Validation/Domain.php b/src/Http/Validation/Domain.php
@@ -7,6 +7,8 @@
 
 class Domain implements Validator
 {
+    const PATTERN_STRIP_PROTOCOL = '/:\d*$/';
+
     /**
      * API domain.
      *
@@ -35,7 +37,7 @@ public function __construct($domain)
      */
     public function validate(Request $request)
     {
-        return ! is_null($this->domain) && $request->header('host') == $this->stripProtocol($this->domain);
+        return ! is_null($this->domain) && $request->getHost() == $this->getStrippedDomain();
     }
 
     /**
@@ -53,4 +55,32 @@ protected function stripProtocol($domain)
 
         return $domain;
     }
+
+    /**
+     * Strip the port from a domain.
+     *
+     * @param $domain
+     *
+     * @return mixed
+     */
+    protected function stripPort($domain)
+    {
+        $domainStripped = preg_replace(self::PATTERN_STRIP_PROTOCOL, '', $domain);
+
+        if ($domainStripped === null) {
+            return $domain;
+        }
+
+        return $domainStripped;
+    }
+
+    /**
+     * Get the domain stripped from protocol and port.
+     *
+     * @return mixed
+     */
+    protected function getStrippedDomain()
+    {
+        return $this->stripPort($this->stripProtocol($this->domain));
+    }
 }
diff --git a/tests/Http/Validation/DomainTest.php b/tests/Http/Validation/DomainTest.php
@@ -31,4 +31,22 @@ public function testValidationPassesWithDifferentProtocols()
         $validator = new Domain('https://foo.bar');
         $this->assertTrue($validator->validate(Request::create('http://foo.bar', 'GET')), 'Validation failed when it should have passed with a valid domain.');
     }
+
+    public function testValidationPassesWithPortOnDomain()
+    {
+        $validator = new Domain('http://foo.bar:8888');
+        $this->assertTrue($validator->validate(Request::create('http://foo.bar', 'GET')), 'Validation failed when it should have passed with a valid domain.');
+    }
+
+    public function testValidationPassesWithPortOnRequest()
+    {
+        $validator = new Domain('http://foo.bar');
+        $this->assertTrue($validator->validate(Request::create('http://foo.bar:8888', 'GET')), 'Validation failed when it should have passed with a valid domain.');
+    }
+
+    public function testValidationPassesWithPortOnDomainAndRequest()
+    {
+        $validator = new Domain('http://foo.bar:8888');
+        $this->assertTrue($validator->validate(Request::create('http://foo.bar:8888', 'GET')), 'Validation failed when it should have passed with a valid domain.');
+    }
 }