Replace left-over from Net-utils with Symfony's IpUtils

tvdijen · tvdijen · commit 4e43439d11d5 · 2025-05-20T17:53:07.000+02:00
diff --git a/src/SimpleSAML/Metadata/MetaDataStorageSource.php b/src/SimpleSAML/Metadata/MetaDataStorageSource.php
@@ -6,6 +6,7 @@
 
 use Exception;
 use SimpleSAML\{Configuration, Error, Module, Utils};
+use Symfony\Component\HttpFoundation\IpUtils;
 use Symfony\Component\Filesystem\Filesystem;
 
 use function array_flip;
@@ -217,9 +218,8 @@ public function getPreferredEntityIdFromCIDRhint(string $set, string $ip, string
                 continue;
             }
 
-            $netUtils = new Utils\Net();
             foreach ($cidrHints as $hint_entry) {
-                if ($netUtils->ipCIDRcheck($hint_entry, $ip)) {
+                if (IpUtils::checkIp($ip, $hint_entry)) {
                     if ($type === 'entityid') {
                         return $entry['entityid'];
                     } else {
