Merge pull request #2 from andrey-tm/fix-ip-header

fixed getting user IP

README.md

@@ -53,6 +53,8 @@ public function behaviors()
 
         // Allows to skip rate limiting for test environment
         'testMode' => true,
+        // Defines whether proxy enabled, list of headers getting from request ipHeaders. By default ['X-Forwarded-For']
+        'proxyEnabled' => false
     ];
     return $behaviors;
 }

src/IpRateLimiter.php

@@ -37,11 +37,6 @@ class IpRateLimiter extends RateLimiter
      */
     public $proxyEnabled = false;
 
-    /**
-     * @var string tag in headers containing IP list
-     */
-    public $proxyIpHeader = 'X-Forwarded-For';
-
     /**
      * @inheritdoc
      */
@@ -64,7 +59,7 @@ public function beforeAction($action)
                 }
 
                 $this->user = $identityClass::create(
-                    $this->prepareIpListString(),
+                    $this->request->getUserIP(),
                     $this->rateLimit,
                     $this->timePeriod
                 );
@@ -74,16 +69,4 @@ public function beforeAction($action)
         }
         return true;
     }
-
-    /*
-    When used trusted proxy, we need use limit by combination ip proxy server and X-Forwarded-For header.
-    */
-    protected function prepareIpListString()
-    {
-        $ipList = [$this->request->getRemoteIP()];
-        if ($this->proxyEnabled && $this->request->headers->has($this->proxyIpHeader)) {
-            $ipList[] = $this->request->headers->get($this->proxyIpHeader);
-        }
-        return implode(', ', $ipList);
-    }
 }