make curl timeout of server token validation call configurable

Author: matthiasgrube

config/recaptcha.php

@@ -39,6 +39,13 @@
 	 */
 	'version'                      => env('RECAPTCHA_DEFAULT_VERSION', 'v2'),
 
+	/**
+	 *
+	 * The curl timout in seconds to validate a recaptcha token
+	 *
+	 */
+	'curl_timeout'                 => env('RECAPTCHA_CURL_TIMEOUT', 3),
+
 	/**
 	 *
 	 * IP addresses for which validation will be skipped

src/ReCaptchaBuilder.php

@@ -35,6 +35,13 @@ class ReCaptchaBuilder {
 	 */
 	protected $version;
 
+	/**
+	 * The curl timeout
+	 * please visit https://curl.haxx.se/libcurl/c/CURLOPT_TIMEOUT.html
+	 * @var int
+	 */
+	protected $curl_timeout;
+
 	/**
 	 * Whether is true the ReCAPTCHA is inactive
 	 * @var boolean
@@ -46,11 +53,12 @@ class ReCaptchaBuilder {
 	 */
 	protected $api_url = 'https://www.google.com/recaptcha/api/siteverify';
 
-	public function __construct($api_site_key, $api_secret_key, $version = 'v2') {
+	public function __construct($api_site_key, $api_secret_key, $version = 'v2', $curl_timeout = 3) {
 
 		$this->setApiSiteKey($api_site_key);
 		$this->setApiSecretKey($api_secret_key);
 		$this->setVersion($version);
+		$this->setCurlTimeout($curl_timeout);
 		$this->setSkipByIp($this->skipByIp());
 	}
 
@@ -78,6 +86,25 @@ public function setApiSecretKey(string $api_secret_key): ReCaptchaBuilder {
 		return $this;
 	}
 
+	/**
+	 * @param int $curl_timeout
+	 * @return ReCaptchaBuilder
+	 */
+	public function setCurlTimeout(int $curl_timeout): ReCaptchaBuilder {
+
+		$this->curl_timeout = $curl_timeout;
+
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getCurlTimeout(): int {
+
+		return $this->curl_timeout;
+	}
+
 	/**
 	 * @param string $version
 	 *
@@ -258,7 +285,7 @@ public function validate($response) {
 			$curl = curl_init($url);
 			curl_setopt($curl, CURLOPT_HEADER, false);
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($curl, CURLOPT_TIMEOUT, 1);
+			curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
 			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
 			$curl_response = curl_exec($curl);
 		}

src/ReCaptchaBuilderInvisible.php

@@ -21,10 +21,11 @@ class ReCaptchaBuilderInvisible extends ReCaptchaBuilder {
 	 *
 	 * @param string $api_site_key
 	 * @param string $api_secret_key
+	 * @param int $curl_timeout
 	 */
-	public function __construct(string $api_site_key, string $api_secret_key) {
+	public function __construct(string $api_site_key, string $api_secret_key, int $curl_timeout) {
 
-		parent::__construct($api_site_key, $api_secret_key, 'invisible');
+		parent::__construct($api_site_key, $api_secret_key, 'invisible', $curl_timeout);
 	}
 
 	/**

src/ReCaptchaBuilderV2.php

@@ -21,10 +21,11 @@ class ReCaptchaBuilderV2 extends ReCaptchaBuilder {
 	 *
 	 * @param string $api_site_key
 	 * @param string $api_secret_key
+	 * @param int $curl_timeout
 	 */
-	public function __construct(string $api_site_key, string $api_secret_key) {
+	public function __construct(string $api_site_key, string $api_secret_key, int $curl_timeout) {
 
-		parent::__construct($api_site_key, $api_secret_key, 'v2');
+		parent::__construct($api_site_key, $api_secret_key, 'v2', $curl_timeout);
 	}
 
 	/**

src/ReCaptchaBuilderV3.php

@@ -21,10 +21,11 @@ class ReCaptchaBuilderV3 extends ReCaptchaBuilder {
 	 *
 	 * @param string $api_site_key
 	 * @param string $api_secret_key
+	 * @param int $curl_timeout
 	 */
-	public function __construct(string $api_site_key, string $api_secret_key) {
+	public function __construct(string $api_site_key, string $api_secret_key, int $curl_timeout) {
 
-		parent::__construct($api_site_key, $api_secret_key, 'v3');
+		parent::__construct($api_site_key, $api_secret_key, 'v3', $curl_timeout);
 	}
 
 }

src/ReCaptchaServiceProvider.php

@@ -114,7 +114,7 @@ protected function registerReCaptchaBuilder() {
 					break;
 			}
 
-			return new $recaptcha_class(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'));
+			return new $recaptcha_class(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.curl_timeout'));
 
 		});
 	}

tests/ReCaptchaConfigurationTest.php

@@ -37,6 +37,13 @@ public function testSkipIpWhiteListIsArray() {
 		$this->assertCount(2, $ip_whitelist);
 	}
 
+	/**
+	 * @test
+	 */
+	public function testCurlTimeoutIsSet() {
+		$this->assertEquals($this->recaptcha->getCurlTimeout(), 3);
+	}
+
 	/**
 	 * Define environment setup.
 	 *
@@ -56,6 +63,6 @@ protected function setUp(): void {
 
 		parent::setUp(); // TODO: Change the autogenerated stub
 
-		$this->recaptcha = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key');
+		$this->recaptcha = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key', 3);
 	}
 }

tests/ReCaptchaTest.php

@@ -85,8 +85,8 @@ protected function setUp(): void {
 
 		parent::setUp(); // TODO: Change the autogenerated stub
 
-		$this->recaptcha_invisible = new ReCaptchaBuilderInvisible('api_site_key', 'api_secret_key');
-		$this->recaptcha_v2 = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key');
+		$this->recaptcha_invisible = new ReCaptchaBuilderInvisible('api_site_key', 'api_secret_key', 3);
+		$this->recaptcha_v2 = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key', 3);
 
 	}
 }

tests/ReCaptchaV3Test.php

@@ -106,7 +106,7 @@ protected function setUp(): void {
 
 		parent::setUp(); // TODO: Change the autogenerated stub
 
-		$this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key');
+		$this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key', 3);
 
 	}
 }