symfony · Ninos · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.4
 ---
 
+ * Add `*_ONLY_PRIV` and `*_ONLY_RES` versions to `Ip` constraint
  * Add `is_valid` function to the `Expression` constraint, its behavior is the same as `ValidatorInterface::validate`
  * Allow single integer for the `versions` option of the `Uuid` constraint
  * Allow single constraint to be passed to the `constraints` option of the `When` constraint

diff --git a/src/Symfony/Component/Validator/Constraints/Ip.php b/src/Symfony/Component/Validator/Constraints/Ip.php
@@ -23,6 +23,7 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @author Joseph Bielawski <stloyd@gmail.com>
+ * @author Ninos Ego <me@ninosego.de>
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Ip extends Constraint
@@ -46,6 +47,16 @@ class Ip extends Constraint
     public const V6_ONLY_PUBLIC = '6_public';
     public const ALL_ONLY_PUBLIC = 'all_public';
 
+    // adds inverse FILTER_FLAG_NO_PRIV_RANGE
+    public const V4_ONLY_PRIV = '4_priv';
+    public const V6_ONLY_PRIV = '6_priv';
+    public const ALL_ONLY_PRIV = 'all_priv';
+
+    // adds inverse FILTER_FLAG_NO_RES_RANGE
+    public const V4_ONLY_RES = '4_res';
+    public const V6_ONLY_RES = '6_res';
+    public const ALL_ONLY_RES = 'all_res';
+
     public const INVALID_IP_ERROR = 'b1b427ae-9f6f-41b0-aa9b-84511fbb3c5b';
 
     protected const VERSIONS = [
@@ -64,6 +75,14 @@ class Ip extends Constraint
         self::V4_ONLY_PUBLIC,
         self::V6_ONLY_PUBLIC,
         self::ALL_ONLY_PUBLIC,
+
+        self::V4_ONLY_PRIV,
+        self::V6_ONLY_PRIV,
+        self::ALL_ONLY_PRIV,
+
+        self::V4_ONLY_RES,
+        self::V6_ONLY_RES,
+        self::ALL_ONLY_RES,
     ];
 
     protected const ERROR_NAMES = [

diff --git a/src/Symfony/Component/Validator/Constraints/IpValidator.php b/src/Symfony/Component/Validator/Constraints/IpValidator.php
@@ -21,6 +21,7 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @author Joseph Bielawski <stloyd@gmail.com>
+ * @author Ninos Ego <me@ninosego.de>
  */
 class IpValidator extends ConstraintValidator
 {
@@ -48,8 +49,8 @@ public function validate(mixed $value, Constraint $constraint)
         }
 
         $flag = match ($constraint->version) {
            Ip::V4 => \FILTER_FLAG_IPV4,
-            Ip::V6 => \FILTER_FLAG_IPV6,
+            Ip::V4, Ip::V4_ONLY_PRIV, Ip::V4_ONLY_RES => \FILTER_FLAG_IPV4,
+            Ip::V6, Ip::V6_ONLY_PRIV, Ip::V6_ONLY_RES => \FILTER_FLAG_IPV6,
             Ip::V4_NO_PRIV => \FILTER_FLAG_IPV4 | \FILTER_FLAG_NO_PRIV_RANGE,
             Ip::V6_NO_PRIV => \FILTER_FLAG_IPV6 | \FILTER_FLAG_NO_PRIV_RANGE,
             Ip::ALL_NO_PRIV => \FILTER_FLAG_NO_PRIV_RANGE,
@@ -67,6 +68,21 @@ public function validate(mixed $value, Constraint $constraint)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Ip::INVALID_IP_ERROR)
                 ->addViolation();
+
+            return;
+        }
+
+        $inverseFlag = match ($constraint->version) {
+            Ip::V4_ONLY_PRIV, Ip::V6_ONLY_PRIV, Ip::ALL_ONLY_PRIV => \FILTER_FLAG_NO_PRIV_RANGE,
+            Ip::V4_ONLY_RES, Ip::V6_ONLY_RES, Ip::ALL_ONLY_RES => \FILTER_FLAG_NO_RES_RANGE,
+            default => 0,
+        };
+
+        if ($inverseFlag && filter_var($value, \FILTER_VALIDATE_IP, $inverseFlag)) {
+            $this->context->buildViolation($constraint->message)
+                ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(Ip::INVALID_IP_ERROR)
+                ->addViolation();
         }
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
@@ -95,7 +95,7 @@ public function testValidIpV6WithWhitespacesNamed()
     {
         $this->validator->validate(
             "\n\t2001:0db8:85a3:0000:0000:8a2e:0370:7334\r\n",
-            new Ip(version: \Symfony\Component\Validator\Constraints\Ip::V6, normalizer: 'trim')
+            new Ip(version: Ip::V6, normalizer: 'trim')
         );
 
         $this->assertNoViolation();
@@ -185,6 +185,15 @@ public function testInvalidIpsV4($ip)
             ->assertRaised();
     }
 
+    public static function getValidPublicIpsV4()
+    {
+        return [
+            ['8.0.0.0'],
+            ['90.0.0.0'],
+            ['110.0.0.110'],
+        ];
+    }
+
     public static function getInvalidIpsV4()
     {
         return [
@@ -201,7 +210,19 @@ public static function getInvalidIpsV4()
     }
 
     /**
-     * @dataProvider getInvalidPrivateIpsV4
+     * @dataProvider getValidPrivateIpsV4
+     */
+    public function testValidPrivateIpsV4($ip)
+    {
+        $this->validator->validate($ip, new Ip([
+            'version' => Ip::V4_ONLY_PRIV,
+        ]));
+
+        $this->assertNoViolation();
+    }
+
+    /**
+     * @dataProvider getValidPrivateIpsV4
      */
     public function testInvalidPrivateIpsV4($ip)
     {
@@ -218,7 +239,25 @@ public function testInvalidPrivateIpsV4($ip)
             ->assertRaised();
     }
 
-    public static function getInvalidPrivateIpsV4()
+    /**
+     * @dataProvider getInvalidPrivateIpsV4
+     */
+    public function testInvalidOnlyPrivateIpsV4($ip)
+    {
+        $constraint = new Ip([
+            'version' => Ip::V4_ONLY_PRIV,
+            'message' => 'myMessage',
+        ]);
+
+        $this->validator->validate($ip, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '"'.$ip.'"')
+            ->setCode(Ip::INVALID_IP_ERROR)
+            ->assertRaised();
+    }
+
+    public static function getValidPrivateIpsV4()
     {
         return [
             ['10.0.0.0'],
@@ -227,8 +266,25 @@ public static function getInvalidPrivateIpsV4()
         ];
     }
 
+    public static function getInvalidPrivateIpsV4()
+    {
+        return array_merge(self::getValidPublicIpsV4(), self::getValidReservedIpsV4());
+    }
+
     /**
-     * @dataProvider getInvalidReservedIpsV4
+     * @dataProvider getValidReservedIpsV4
+     */
+    public function testValidReservedIpsV4($ip)
+    {
+        $this->validator->validate($ip, new Ip([
+            'version' => Ip::V4_ONLY_RES,
+        ]));
+
+        $this->assertNoViolation();
+    }
+
+    /**
+     * @dataProvider getValidReservedIpsV4
      */
     public function testInvalidReservedIpsV4($ip)
     {
@@ -245,7 +301,25 @@ public function testInvalidReservedIpsV4($ip)
             ->assertRaised();
     }
 
-    public static function getInvalidReservedIpsV4()
+    /**
+     * @dataProvider getInvalidReservedIpsV4
+     */
+    public function testInvalidOnlyReservedIpsV4($ip)
+    {
+        $constraint = new Ip([
+            'version' => Ip::V4_ONLY_RES,
+            'message' => 'myMessage',
+        ]);
+
+        $this->validator->validate($ip, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '"'.$ip.'"')
+            ->setCode(Ip::INVALID_IP_ERROR)
+            ->assertRaised();
+    }
+
+    public static function getValidReservedIpsV4()
     {
         return [
             ['0.0.0.0'],
@@ -254,6 +328,11 @@ public static function getInvalidReservedIpsV4()
         ];
     }
 
+    public static function getInvalidReservedIpsV4()
+    {
+        return array_merge(self::getValidPublicIpsV4(), self::getValidPrivateIpsV4());
+    }
+
     /**
      * @dataProvider getInvalidPublicIpsV4
      */
@@ -274,7 +353,7 @@ public function testInvalidPublicIpsV4($ip)
 
     public static function getInvalidPublicIpsV4()
     {
-        return array_merge(self::getInvalidPrivateIpsV4(), self::getInvalidReservedIpsV4());
+        return array_merge(self::getValidPrivateIpsV4(), self::getValidReservedIpsV4());
     }
 
     /**
@@ -433,7 +512,7 @@ public function testInvalidPrivateIpsAll($ip)
 
     public static function getInvalidPrivateIpsAll()
     {
-        return array_merge(self::getInvalidPrivateIpsV4(), self::getInvalidPrivateIpsV6());
+        return array_merge(self::getValidPrivateIpsV4(), self::getInvalidPrivateIpsV6());
     }
 
     /**
@@ -456,7 +535,7 @@ public function testInvalidReservedIpsAll($ip)
 
     public static function getInvalidReservedIpsAll()
     {
-        return array_merge(self::getInvalidReservedIpsV4(), self::getInvalidReservedIpsV6());
+        return array_merge(self::getValidReservedIpsV4(), self::getInvalidReservedIpsV6());
     }
 
     /**