Merge branch 'batumibiz-master'

Closes #9
akrabat · Feb 18, 2018 · 558ae43 · 558ae43
2 parents 832687b + e2f7e5d
commit 558ae43
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/IpAddress.php b/src/IpAddress.php
@@ -108,14 +108,10 @@ protected function determineClientIpAddress($request)
             $ipAddress = $serverParams['REMOTE_ADDR'];
         }
 
-        $checkProxyHeaders = $this->checkProxyHeaders;
-        if ($checkProxyHeaders && !empty($this->trustedProxies)) {
-            if (!in_array($ipAddress, $this->trustedProxies)) {
-                $checkProxyHeaders = false;
-            }
-        }
-
-        if ($checkProxyHeaders) {
+        if ($this->checkProxyHeaders
+            && !empty($this->trustedProxies)
+            && in_array($ipAddress, $this->trustedProxies)
+        ) {
             foreach ($this->headersToInspect as $header) {
                 if ($request->hasHeader($header)) {
                     $ip = $this->getFirstIpAddressFromHeader($request, $header);

diff --git a/tests/IpAddressTest.php b/tests/IpAddressTest.php
@@ -48,7 +48,7 @@ public function testIpIsNullIfMissing()
 
     public function testXForwardedForIp()
     {
-        $middleware = new IPAddress(true);
+        $middleware = new IPAddress(true, ['192.168.1.1']);
 
         $request = ServerRequestFactory::fromGlobals([
             'REMOTE_ADDR' => '192.168.1.1',
@@ -88,7 +88,7 @@ public function testProxyIpIsIgnored()
 
     public function testHttpClientIp()
     {
-        $middleware = new IPAddress(true);
+        $middleware = new IPAddress(true, ['192.168.1.1']);
 
         $request = ServerRequestFactory::fromGlobals([
             'REMOTE_ADDR' => '192.168.1.1',
@@ -108,7 +108,7 @@ public function testHttpClientIp()
 
     public function testXForwardedForIpV6()
     {
-        $middleware = new IPAddress(true);
+        $middleware = new IPAddress(true, ['192.168.1.1']);
 
         $request = ServerRequestFactory::fromGlobals([
             'REMOTE_ADDR' => '192.168.1.1',
@@ -128,7 +128,7 @@ public function testXForwardedForIpV6()
 
     public function testXForwardedForWithInvalidIp()
     {
-        $middleware = new IPAddress(true);
+        $middleware = new IPAddress(true, ['192.168.1.1']);
 
         $request = ServerRequestFactory::fromGlobals([
             'REMOTE_ADDR' => '192.168.1.1',
@@ -188,7 +188,7 @@ public function testXForwardedForIpWithUntrustedProxy()
 
     public function testForwardedWithMultipleFor()
     {
-        $middleware = new IPAddress(true);
+        $middleware = new IPAddress(true, ['192.168.1.1']);
 
         $request = ServerRequestFactory::fromGlobals([
             'REMOTE_ADDR' => '192.168.1.1',
@@ -208,7 +208,7 @@ public function testForwardedWithMultipleFor()
 
     public function testForwardedWithAllOptions()
     {
-        $middleware = new IPAddress(true);
+        $middleware = new IPAddress(true, ['192.168.1.1']);
 
         $request = ServerRequestFactory::fromGlobals([
             'REMOTE_ADDR' => '192.168.1.1',
@@ -228,7 +228,7 @@ public function testForwardedWithAllOptions()
 
     public function testForwardedWithWithIpV6()
     {
-        $middleware = new IPAddress(true);
+        $middleware = new IPAddress(true, ['192.168.1.1']);
 
         $request = ServerRequestFactory::fromGlobals([
             'REMOTE_ADDR' => '192.168.1.1',
@@ -251,7 +251,7 @@ public function testCustomHeader()
         $headersToInspect = [
             'Foo-Bar'
         ];
-        $middleware = new IPAddress(true, [], null, $headersToInspect);
+        $middleware = new IPAddress(true, ['192.168.0.1'], null, $headersToInspect);
 
         $request = ServerRequestFactory::fromGlobals([
             'REMOTE_ADDR' => '192.168.0.1',