Support comma-separated IP addresses (X-Forwarded-For)

Author: Jasper-MultiSafepay

src/ValueObject/IpAddress.php

@@ -17,14 +17,18 @@ class IpAddress
     /**
      * @var string
      */
-    private $ipAddress = '';
+    private $ipAddress;
 
     /**
      * Country constructor.
      * @param string $ipAddress
      */
     public function __construct(string $ipAddress)
     {
+        // Clean up in case of comma-separated IPs
+        $ipAddressList = explode(',', $ipAddress);
+        $ipAddress = trim(reset($ipAddressList));
+
         if (filter_var($ipAddress, FILTER_VALIDATE_IP) === false) {
             throw new InvalidArgumentException('Value "' . $ipAddress . '" is not a valid IP address');
         }

tests/Unit/ValueObject/IpAddressTest.php

@@ -29,4 +29,14 @@ public function testWhetherWrongValueCanNotBeSetAndUsed()
         $this->expectException(InvalidArgumentException::class);
         new IpAddress('foobar');
     }
+
+    /**
+     * Test whether comma-separated values could be set and used
+     * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#examples
+     */
+    public function testWhetherCommaSeparatedValuesCanBeSetAndUsed()
+    {
+        $ipAddress = new IpAddress('203.0.113.195, 70.41.3.18, 150.172.238.178');
+        $this->assertEquals('203.0.113.195', $ipAddress->get());
+    }
 }