fix: use header() instead of getServer() for header values

getIPAddress() does not work with OpenSwoole.

Author: kenjis

system/HTTP/RequestTrait.php

@@ -67,8 +67,13 @@ public function getIPAddress(): string
         $this->ipAddress = $this->getServer('REMOTE_ADDR');
 
         if ($proxyIPs) {
-            foreach (['HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_X_CLIENT_IP', 'HTTP_X_CLUSTER_CLIENT_IP'] as $header) {
-                if (($spoof = $this->getServer($header)) !== null) {
+            foreach (['x-forwarded-for', 'client-ip', 'x-client-ip', 'x-cluster-client-ip'] as $header) {
+                $spoof     = null;
+                $headerObj = $this->header($header);
+
+                if ($headerObj !== null) {
+                    $spoof = $headerObj->getValue();
+
                     // Some proxies typically list the whole chain of IP
                     // addresses through which the client has reached us.
                     // e.g. client_ip, proxy_ip1, proxy_ip2, etc.

tests/system/HTTP/RequestTest.php

@@ -613,6 +613,7 @@ public function testGetIPAddressThruProxy()
         $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
         $this->request                   = new Request($config);
+        $this->request->populateHeaders();
 
         // we should see the original forwarded address
         $this->assertSame($expected, $this->request->getIPAddress());
@@ -626,6 +627,7 @@ public function testGetIPAddressThruProxyInvalid()
         $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
         $this->request                   = new Request($config);
+        $this->request->populateHeaders();
 
         // spoofed address invalid
         $this->assertSame('10.0.1.200', $this->request->getIPAddress());
@@ -639,6 +641,7 @@ public function testGetIPAddressThruProxyNotWhitelisted()
         $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
         $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
         $this->request                   = new Request($config);
+        $this->request->populateHeaders();
 
         // spoofed address invalid
         $this->assertSame('10.10.1.200', $this->request->getIPAddress());
@@ -652,6 +655,7 @@ public function testGetIPAddressThruProxySubnet()
         $config->proxyIPs                = ['192.168.5.0/24'];
         $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
         $this->request                   = new Request($config);
+        $this->request->populateHeaders();
 
         // we should see the original forwarded address
         $this->assertSame($expected, $this->request->getIPAddress());
@@ -665,6 +669,7 @@ public function testGetIPAddressThruProxyOutofSubnet()
         $config->proxyIPs                = ['192.168.5.0/28'];
         $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
         $this->request                   = new Request($config);
+        $this->request->populateHeaders();
 
         // we should see the original forwarded address
         $this->assertSame('192.168.5.21', $this->request->getIPAddress());