Replace darsyn/ip in favour of symfony/http-foundation

Author: Anton Evers

composer.json

@@ -47,6 +47,7 @@
         "sjparkinson/static-review": "~4.1",
         "symfony/console": "~2.3, !=2.7.0",
         "symfony/event-dispatcher": "~2.1",
+        "symfony/http-foundation": "^3.3",
         "symfony/process": "~2.1",
         "tedivm/jshrink": "~1.1.0",
         "tubalmartin/cssmin": "4.1.0",
@@ -75,8 +76,7 @@
         "zendframework/zend-text": "^2.6.0",
         "zendframework/zend-uri": "^2.5.1",
         "zendframework/zend-validator": "^2.6.0",
-        "zendframework/zend-view": "^2.8.1",
-        "darsyn/ip": "^3.3"
+        "zendframework/zend-view": "^2.8.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.1.1",

composer.lock

@@ -7,7 +7,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
-use Darsyn\IP\IP;
+use Symfony\Component\HttpFoundation\IpUtils;
 
 /**
  * Application Maintenance Mode
@@ -62,23 +62,7 @@ public function isOn($remoteAddr = '')
         if (!$this->flagDir->isExist(self::FLAG_FILENAME)) {
             return false;
         }
-        $info = $this->getAddressInfo();
-        $testIp = new IP($remoteAddr);
-        foreach ($info as $range) {
-            $cidr = 32;
-            $ip = $range;
-            if (strpos($range, '/') !== false) {
-                list($ip, $cidr) = explode('/', $range);
-            }
-            $rangeIp = new IP($ip);
-            if ($rangeIp->isVersion4()) {
-                $cidr += IP::CIDR4TO6;
-            }
-            if ($testIp->inRange($rangeIp, $cidr)) {
-                return false;
-            }
-        }
-        return true;
+        return !IpUtils::checkIp($remoteAddr, $this->getAddressInfo());
     }
 
     /**

lib/internal/Magento/Framework/App/MaintenanceMode.php

@@ -28,6 +28,7 @@
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
         "symfony/console": "~2.3, !=2.7.0",
+        "symfony/http-foundation": "^3.3",
         "symfony/process": "~2.1",
         "tedivm/jshrink": "~1.1.0",
         "zendframework/zend-code": "^3.1.0",
@@ -37,7 +38,8 @@
         "zendframework/zend-stdlib": "^2.7.7",
         "zendframework/zend-uri": "^2.5.1",
         "zendframework/zend-validator": "^2.6.0",
-        "darsyn/ip": "^3.3"
+        "zendframework/zend-stdlib": "^2.7.7",
+        "zendframework/zend-http": "^2.6.0"
     },
     "suggest": {
         "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"

lib/internal/Magento/Framework/composer.json

@@ -5,9 +5,6 @@
  */
 namespace Magento\Setup\Validator;
 
-use Darsyn\IP\IP;
-use Darsyn\IP\InvalidIpAddressException;
-
 /**
  * Class to validate list of IPs for maintenance commands
  */
@@ -70,30 +67,31 @@ public function validateIps(array $ips, $noneAllowed)
     private function filterIps(array $ips)
     {
         foreach ($ips as $range) {
+            if ($range === 'none') {
+                $this->none[] = $range;
+                continue;
+            }
+
             $cidr = 32;
             $ip = $range;
             if (strpos($range, '/') !== false) {
                 list($ip, $cidr) = explode('/', $range);
             }
 
-            try {
-                $validIp = new IP($ip);
-            } catch (InvalidIpAddressException $e) {
-                if ($range == 'none') {
-                    $this->none[] = $range;
-                    continue;
-                }
+            $ipValidator = new \Zend_Validate_Ip(['allowipv6' => true, 'allowipv4' => true]);
+            if (!$ipValidator->isValid($ip)) {
                 $this->invalidIps[] = $range;
                 continue;
             }
 
-            $max = $validIp->isVersion4() ? 32 : 128;
-            if ($cidr >= 0 && $cidr <= $max) {
-                $this->validIps[] = $range;
+            $ipv4Validator = new \Zend_Validate_Ip(['allowipv6' => false, 'allowipv4' => true]);
+            $max = $ipv4Validator->isValid($ip) ? 32 : 128;
+            if ($cidr < 0 || $cidr > $max) {
+                $this->invalidIps[] = $range;
                 continue;
             }
 
-            $this->invalidIps[] = $range;
+            $this->validIps[] = $range;
         }
     }
 }