IPRange::matches() accepts a list of CIDR #9573

Author: PowerKiKi

src/Middleware/SignedQueryMiddleware.php

@@ -124,12 +124,6 @@ private function isAllowedIp(ServerRequestInterface $request): bool
             return false;
         }
 
-        foreach ($this->allowedIps as $allowedIp) {
-            if (IPRange::matches($remoteAddress, $allowedIp)) {
-                return true;
-            }
-        }
-
-        return false;
+        return IPRange::matches($remoteAddress, $this->allowedIps);
     }
 }

src/Validator/IPRange.php

@@ -6,7 +6,23 @@
 
 abstract class IPRange
 {
-    final public static function matches(string $ip, string $cidr): bool
+    /**
+     * Whether the given IP address matches at least one of the given CIDR.
+     *
+     * @param string[] $cidrs
+     */
+    final public static function matches(string $ip, array $cidrs): bool
+    {
+        foreach ($cidrs as $cidr) {
+            if (self::matchesOne($ip, $cidr)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static function matchesOne(string $ip, string $cidr): bool
     {
         if (str_contains($ip, ':')) {
             return self::matchesIPv6($ip, $cidr);

tests/Validator/IPRangeTest.php

@@ -15,7 +15,7 @@ class IPRangeTest extends TestCase
      */
     public function testMatches(bool $result, string $remoteAddr, string $cidr): void
     {
-        self::assertSame($result, IPRange::matches($remoteAddr, $cidr));
+        self::assertSame($result, IPRange::matches($remoteAddr, [$cidr]));
     }
 
     public static function IPv4Data(): iterable
@@ -52,4 +52,9 @@ public static function IPv6Data(): iterable
             'invalid - empty IP address' => [false, '', '::1'],
         ];
     }
+
+    public function testMultiplesWillMatchesIfAtLeastOne(): void
+    {
+        self::assertTrue(IPRange::matches('192.168.1.1', ['255.255.255.255', '192.168.1.1']));
+    }
 }