Merge pull request #16545 from Stricted/ip_validation

[5.4] Add ipv4 and ipv6 validations
laravel · Nov 25, 2016 · 3e03a2a · 3e03a2a
2 parents 4d27029 + b81cfae
commit 3e03a2a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -1551,6 +1551,30 @@ protected function validateIp($attribute, $value)
         return filter_var($value, FILTER_VALIDATE_IP) !== false;
     }
 
+    /**
+     * Validate that an attribute is a valid IPv4.
+     *
+     * @param  string  $attribute
+     * @param  mixed   $value
+     * @return bool
+     */
+    protected function validateIpv4($attribute, $value)
+    {
+        return filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
+    }
+
+    /**
+     * Validate that an attribute is a valid IPv6.
+     *
+     * @param  string  $attribute
+     * @param  mixed   $value
+     * @return bool
+     */
+    protected function validateIpv6($attribute, $value)
+    {
+        return filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false;
+    }
+
     /**
      * Validate that an attribute is a valid e-mail address.
      *

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -1505,6 +1505,18 @@ public function testValidateIp()
 
         $v = new Validator($trans, ['ip' => '127.0.0.1'], ['ip' => 'Ip']);
         $this->assertTrue($v->passes());
+
+        $v = new Validator($trans, ['ip' => '127.0.0.1'], ['ip' => 'Ipv4']);
+        $this->assertTrue($v->passes());
+
+        $v = new Validator($trans, ['ip' => '::1'], ['ip' => 'Ipv6']);
+        $this->assertTrue($v->passes());
+
+        $v = new Validator($trans, ['ip' => '127.0.0.1'], ['ip' => 'Ipv6']);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, ['ip' => '::1'], ['ip' => 'Ipv4']);
+        $this->assertTrue($v->fails());
     }
 
     public function testValidateEmail()