use PSR-7 for Firewall middleware

Author: mevdschee

api.include.php

@@ -7932,14 +7932,20 @@ private function isIpAllowed(string $ipAddress, string $allowedIpAddresses): boo
             return false;
         }
 
+        private function getIpAddress(ServerRequestInterface $request): string
+        {
+            $serverParams = $request->getServerParams();
+            return $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
+        }
+
         public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
         {
             $reverseProxy = $this->getProperty('reverseProxy', '');
             $serverParams = $request->getServerParams();
             if ($reverseProxy) {
                 $ipAddress = array_pop($request->getHeader('X-Forwarded-For'));
             } else {
-                $ipAddress = $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
+                $ipAddress = $this->getIpAddress($request);
             }
             $allowedIpAddresses = $this->getProperty('allowedIpAddresses', '');
             if (!$this->isIpAllowed($ipAddress, $allowedIpAddresses)) {
@@ -7958,8 +7964,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     use Psr\Http\Message\ResponseInterface;
     use Psr\Http\Message\ServerRequestInterface;
     use Psr\Http\Server\RequestHandlerInterface;
-    use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
     use Tqdev\PhpCrudApi\Column\ReflectionService;
+    use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
     use Tqdev\PhpCrudApi\Controller\Responder;
     use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
     use Tqdev\PhpCrudApi\Middleware\Router\Router;

api.php

@@ -7932,14 +7932,20 @@ private function isIpAllowed(string $ipAddress, string $allowedIpAddresses): boo
             return false;
         }
 
+        private function getIpAddress(ServerRequestInterface $request): string
+        {
+            $serverParams = $request->getServerParams();
+            return $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
+        }
+
         public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
         {
             $reverseProxy = $this->getProperty('reverseProxy', '');
             $serverParams = $request->getServerParams();
             if ($reverseProxy) {
                 $ipAddress = array_pop($request->getHeader('X-Forwarded-For'));
             } else {
-                $ipAddress = $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
+                $ipAddress = $this->getIpAddress($request);
             }
             $allowedIpAddresses = $this->getProperty('allowedIpAddresses', '');
             if (!$this->isIpAllowed($ipAddress, $allowedIpAddresses)) {
@@ -7958,8 +7964,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     use Psr\Http\Message\ResponseInterface;
     use Psr\Http\Message\ServerRequestInterface;
     use Psr\Http\Server\RequestHandlerInterface;
-    use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
     use Tqdev\PhpCrudApi\Column\ReflectionService;
+    use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
     use Tqdev\PhpCrudApi\Controller\Responder;
     use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
     use Tqdev\PhpCrudApi\Middleware\Router\Router;

src/Tqdev/PhpCrudApi/Middleware/FirewallMiddleware.php

@@ -36,14 +36,20 @@ private function isIpAllowed(string $ipAddress, string $allowedIpAddresses): boo
         return false;
     }
 
+    private function getIpAddress(ServerRequestInterface $request): string
+    {
+        $serverParams = $request->getServerParams();
+        return $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
+    }
+
     public function process(ServerRequestInterface $request, RequestHandlerInterface $next): ResponseInterface
     {
         $reverseProxy = $this->getProperty('reverseProxy', '');
         $serverParams = $request->getServerParams();
         if ($reverseProxy) {
             $ipAddress = array_pop($request->getHeader('X-Forwarded-For'));
         } else {
-            $ipAddress = $serverParams['REMOTE_ADDR'] ?? '127.0.0.1';
+            $ipAddress = $this->getIpAddress($request);
         }
         $allowedIpAddresses = $this->getProperty('allowedIpAddresses', '');
         if (!$this->isIpAllowed($ipAddress, $allowedIpAddresses)) {

src/Tqdev/PhpCrudApi/Middleware/IpAddressMiddleware.php

@@ -5,8 +5,8 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
+use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;