- Fix log api key when ip is invalid

daycry · Feb 14, 2023 · 37df851 · 37df851
1 parent 2f658a5
commit 37df851
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/RestServer.php b/src/RestServer.php
@@ -114,6 +114,13 @@ class RestServer extends ResourceController
      */
     protected ?object $apiUser = null;
 
+    /**
+     * Information about the current API user.
+     *
+     * @var string
+     */
+    protected ?string $key = null;
+
     /**
      * Information about the current AUTH user.
      *
@@ -275,7 +282,7 @@ protected function _logRequest($authorized = false)
             'uri'        => $this->request->uri,
             'method'     => $this->request->getMethod(),
             'params'     => $params,
-            'api_key'    => isset($this->apiUser->key) ? $this->apiUser->key : '',
+            'api_key'    => isset($this->key) ? $this->key : '',
             'ip_address' => $this->request->getIPAddress(),
             'duration'   => $this->_benchmark->getElapsedTime('petition'),
             'response_code' => $this->response->getStatusCode(),
@@ -340,7 +347,7 @@ public function _remap($method, ...$params)
                 }
             }
 
-            $this->apiUser = \Daycry\RestServer\Validators\ApiKey::check($this->request, $this->_petition, $this->args);
+            $this->apiUser = \Daycry\RestServer\Validators\ApiKey::check($this->request, $this->args, $this->_petition, $this->key);
 
             if ($this->_restConfig->strictApiAndAuth && $this->apiUser instanceof \Exception) {
                 throw $this->apiUser;

diff --git a/src/Validators/ApiKey.php b/src/Validators/ApiKey.php
@@ -7,7 +7,7 @@
 
 class ApiKey
 {
-    public static function check(RequestInterface $request, object $petition = null, array $args): ?object
+    public static function check(RequestInterface $request, array $args, object $petition = null, string &$key = null): ?object
     {
         $row = null;
         $usekey = config('RestServer')->restEnableKeys;
@@ -54,7 +54,7 @@ public static function check(RequestInterface $request, object $petition = null,
                             }
                         }
 
-                        if (!$found_address) {
+                        if ($found_address !== true) {
                             return UnauthorizedException::forIpDenied();
                         }
                     } else {