Add option to validate a specific IP format (IPv4 or IPv6)

Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
fuel · Apr 23, 2016 · 13821e8 · 13821e8
1 parent 17f9b4c
commit 13821e8
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 2 deletions.
diff --git a/classes/validation.php b/classes/validation.php
@@ -884,11 +884,22 @@ public function _validation_valid_url($val)
 	 * Validate IP using PHP's filter_var()
 	 *
 	 * @param   string  $val
+	 * @param   string  ipv4|ipv6
 	 * @return  bool
 	 */
-	public function _validation_valid_ip($val)
+	public function _validation_valid_ip($val, $flag = null)
 	{
-		return $this->_empty($val) || filter_var($val, FILTER_VALIDATE_IP);
+		switch (strtolower($flag))
+		{
+			case 'ipv4':
+				$flag = FILTER_FLAG_IPV4;
+				break;
+			case 'ipv6':
+				$flag = FILTER_FLAG_IPV6;
+				break;
+		}
+
+		return $this->_empty($val) || filter_var($val, FILTER_VALIDATE_IP, $flag);
 	}
 
 	/**

diff --git a/tests/validation.php b/tests/validation.php
@@ -555,6 +555,48 @@ public function test_validation_valid_ip_failure($input)
 		$this->assertEquals($expected, $output);
 	}
 
+	/**
+	 * Validation:  valid_ip
+	 * Expecting:   success
+	 */
+	public function test_validation_valid_ip_v6_only_success()
+	{
+		$val = Validation::forge(__FUNCTION__);
+		$val->add_field('ipv6', 'IPv6 address', 'valid_ip[ipv6]');
+
+		$output = $val->run(array('ipv6' => '2001:0db8:85a3:08d3:1319:8a2e:0370:7334'));
+
+		$this->assertTrue($output);
+	}
+
+	/**
+	 * Validation:  valid_ip
+	 * Expecting:   failure
+	 */
+	public function test_validation_valid_ip_v6_only_failure()
+	{
+		$val = Validation::forge(__FUNCTION__);
+		$val->add_field('ipv6', 'IPv6 address', 'valid_ip[ipv6]');
+
+		$output = $val->run(array('ipv6' => '192.168.0.1'));
+
+		$this->assertFalse($output);
+	}
+
+	/**
+	 * Validation:  valid_ip
+	 * Expecting:   failure
+	 */
+	public function test_validation_valid_ip_v4_only_failure()
+	{
+		$val = Validation::forge(__FUNCTION__);
+		$val->add_field('ipv4', 'IPv4 address', 'valid_ip[ipv4]');
+
+		$output = $val->run(array('ipv4' => '2001:0db8:85a3:08d3:1319:8a2e:0370:7334'));
+
+		$this->assertFalse($output);
+	}
+
 	/**
 	 * Validation:  numeric_min
 	 * Expecting:   success