Use Symfony IpUtils to check for local IP ranges

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/lib/private/Http/Client/LocalAddressChecker.php b/lib/private/Http/Client/LocalAddressChecker.php
index 35240c38a8a2154c23450ad4838282e309aeee45..14a45ce01bb002a513c73f85278ed9a37acf2d73 100644 (file)
--- a/lib/private/Http/Client/LocalAddressChecker.php
+++ b/lib/private/Http/Client/LocalAddressChecker.php
@@ -37,12 +37,15 @@ class LocalAddressChecker {
        }
 
        public function ThrowIfLocalIp(string $ip) : void {
-               $localIps = ['100.100.100.200'];
+               $localRanges = [
+                       '100.64.0.0/10', // See RFC 6598
+                       '192.0.0.0/24', // See RFC 6890
+               ];
                if (
                        (bool)filter_var($ip, FILTER_VALIDATE_IP) &&
                        (
                                !filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) ||
-                               in_array($ip, $localIps, true)
+                               IpUtils::checkIp($ip, $localRanges)
                        )) {
                        $this->logger->warning("Host $ip was not connected to because it violates local access rules");
                        throw new LocalServerException('Host violates local access rules');
@@ -55,7 +58,7 @@ class LocalAddressChecker {
 
                        if (
                                !filter_var($ipv4Address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) ||
-                               in_array($ipv4Address, $localIps, true)) {
+                               IpUtils::checkIp($ip, $localRanges)) {
                                $this->logger->warning("Host $ip was not connected to because it violates local access rules");
                                throw new LocalServerException('Host violates local access rules');
                        }

diff --git a/tests/lib/Http/Client/LocalAddressCheckerTest.php b/tests/lib/Http/Client/LocalAddressCheckerTest.php
index b2e09c0700bdc164dc3b2d66acecec45d7721d59..04694f98b6550bbda72e33290f0c48c0bae20eaa 100644 (file)
--- a/tests/lib/Http/Client/LocalAddressCheckerTest.php
+++ b/tests/lib/Http/Client/LocalAddressCheckerTest.php
@@ -96,6 +96,8 @@ class LocalAddressCheckerTest extends \Test\TestCase {
                        ['10.0.0.1'],
                        ['::'],
                        ['::1'],
+                       ['100.100.100.200'],
+                       ['192.0.0.1'],
                ];
        }
 
@@ -116,6 +118,9 @@ class LocalAddressCheckerTest extends \Test\TestCase {
                        ['another-host.local'],
                        ['service.localhost'],
                        ['!@#$'], // test invalid url
+                       ['100.100.100.200'],
+                       ['192.0.0.1'],
+                       ['randomdomain.internal'],
                ];
        }