fix(oauth2): move disable IP adress check

Author: smarcet

app/Models/OAuth2/ResourceServer.php

@@ -66,7 +66,6 @@ class ResourceServer extends BaseEntity
      */
     public function isOwn($ip)
     {
-        if (!config('oauth2.validate_resource_server_ip', true)) return true;
 
         $provided_ips = array_map('trim', explode(',', $ip));
         $own_ips = array_map('trim', explode(',', $this->ips));

app/libs/OAuth2/GrantTypes/Strategies/ValidateBearerTokenResourceServerStrategy.php

@@ -78,31 +78,31 @@ public function validate(AccessToken $access_token, IClient $client)
                 'resource server is disabled!'
             );
         }
-        //check resource server ip address
-        if (!$resource_server->isOwn($current_ip))
-        {
-            throw new BearerTokenDisclosureAttemptException
-            (
-                sprintf
+        if (config('oauth2.validate_resource_server_ip', false)) {
+            //check resource server ip address
+            if (!$resource_server->isOwn($current_ip)) {
+                throw new BearerTokenDisclosureAttemptException
                 (
-                    'resource server ip (%s) differs from current request ip %s',
-                    $resource_server->getIPAddresses(),
-                    $current_ip
-                )
-            );
-        }
-        // check if current ip belongs to a registered resource server audience
-        if (!$this->token_service->checkAccessTokenAudience($access_token, $current_ip))
-        {
-            throw new BearerTokenDisclosureAttemptException
-            (
-                sprintf
+                    sprintf
+                    (
+                        'resource server ip (%s) differs from current request ip %s',
+                        $resource_server->getIPAddresses(),
+                        $current_ip
+                    )
+                );
+            }
+            // check if current ip belongs to a registered resource server audience
+            if (!$this->token_service->checkAccessTokenAudience($access_token, $current_ip)) {
+                throw new BearerTokenDisclosureAttemptException
                 (
-                    'access token current audience (%s) does not match with current request ip %s',
-                    $access_token->getAudience(),
-                    $current_ip
-                )
-            );
+                    sprintf
+                    (
+                        'access token current audience (%s) does not match with current request ip %s',
+                        $access_token->getAudience(),
+                        $current_ip
+                    )
+                );
+            }
         }
     }
 }

config/oauth2.php

@@ -11,5 +11,5 @@
     | the request IP and the access token audience.
     |
     */
-    'validate_resource_server_ip' => env('OAUTH2_VALIDATE_RESOURCE_SERVER_IP', true),
+    'validate_resource_server_ip' => env('OAUTH2_VALIDATE_RESOURCE_SERVER_IP', false),
 ];