Feature skip IP/CIDR netmask

Viktor Mazur · Viktor Mazur · commit ee454114eb17 · 2022-01-14T14:02:31.000+02:00
diff --git a/config/recaptcha.php b/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', []),
 
     /**
      *
diff --git a/src/ReCaptchaBuilder.php b/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());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,10 @@`
`51`	`51`	`/**`
`52`	`52`	`*`
`53`	`53`	`* IP addresses for which validation will be skipped`
	`54`	`+ * IP/CIDR netmask eg. 127.0.0.0/24, also 127.0.0.1 is accepted and /32 assumed`
`54`	`55`	`*`
`55`	`56`	`*/`
`56`		`- 'skip_ip' => [],`
	`57`	`+ 'skip_ip' => env('RECAPTCHA_SKIP_IP', []),`
`57`	`58`
`58`	`59`	`/**`
`59`	`60`	`*`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Biscolab\ReCaptcha;`
`13`	`13`
`14`	`14`	`use Illuminate\Support\Arr;`
	`15`	`+use Symfony\Component\HttpFoundation\IpUtils;`
`15`	`16`
`16`	`17`	`/**`
`17`	`18`	`* Class ReCaptchaBuilder`
`@@ -247,8 +248,7 @@ public function getIpWhitelist()`
`247`	`248`	`*/`
`248`	`249`	`public function skipByIp(): bool`
`249`	`250`	`{`
`250`		`-`
`251`		`- return (in_array(request()->ip(), $this->getIpWhitelist()));`
	`251`	`+ return IpUtils::checkIp(request()->ip(), $this->getIpWhitelist());`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`/**`