Merge branch 'master' into develop

Author: biscolab

.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+  run:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        php: ['7.3', '7.4', '8.0']
+        
+    name: PHP ${{ matrix.php }} Test on ${{ matrix.os }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{matrix.php}} 
+ 
+    - name: Install dependencies
+      uses: php-actions/composer@v5
+      with:
+        args: --prefer-source --no-interaction
+
+    - name: Run composer test script
+      uses: php-actions/composer@v5
+      with:
+        command: test 

config/recaptcha.php

@@ -51,9 +51,10 @@
     /**
      *
      * IP addresses for which validation will be skipped
+     * IP/CIDR netmask eg. 127.0.0.0/24, also 127.0.0.1 is accepted and /32 assumed
      *
      */
-    'skip_ip'                      => [],
+    'skip_ip'                      => env('RECAPTCHA_SKIP_IP', []),
 
     /**
      *

src/ReCaptchaBuilder.php

@@ -12,6 +12,7 @@
 namespace Biscolab\ReCaptcha;
 
 use Illuminate\Support\Arr;
+use Symfony\Component\HttpFoundation\IpUtils;
 
 /**
  * Class ReCaptchaBuilder
@@ -247,8 +248,7 @@ public function getIpWhitelist()
      */
     public function skipByIp(): bool
     {
-
-        return (in_array(request()->ip(), $this->getIpWhitelist()));
+        return IpUtils::checkIp(request()->ip(), $this->getIpWhitelist());
     }
 
     /**