Merge pull request #100 from internetgalerie/develop

add threshold, reject if score is below threshold

Author: garbast

Classes/Services/CaptchaService.php

@@ -189,6 +189,13 @@ public function validateReCaptcha(string $value = ''): array
 
             if ($response['success']) {
                 $result['verified'] = true;
+                if (($this->configuration['threshold'] ?? 0) > 0.0) {
+                    // Reject if score is below threshold
+                    if (isset($response['score']) && $response['score'] < $this->configuration['threshold']) {
+                        $result['verified'] = false;
+                        $result['error'] = 'score-threshold-not-met';
+                    }
+                }
             } else {
                 $result['error'] = (string)(
                     is_array($response['error-codes']) ?

Configuration/Sets/Recaptcha/labels.xlf

@@ -50,6 +50,9 @@
 			<trans-unit id="settings.evoweb.recaptcha.enforceCaptcha" resname="settings.evoweb.recaptcha.enforceCaptcha">
 				<source>Enforcing captcha even in development mode</source>
 			</trans-unit>
+			<trans-unit id="settings.evoweb.recaptcha.threshold" resname="settings.evoweb.recaptcha.threshold">
+				<source>Threshold for score (0.0 - 1.0)</source>
+			</trans-unit>
 			<trans-unit id="settings.evoweb.recaptcha.theme" resname="settings.evoweb.recaptcha.theme">
 				<source>Theme</source>
 			</trans-unit>

Configuration/Sets/Recaptcha/settings.definitions.yaml

@@ -47,6 +47,10 @@ settings:
     default: 0
     type: bool
     category: recaptcha
+  evoweb.recaptcha.threshold:
+    default: 0.5
+    type: number
+    category: recaptcha
   evoweb.sf-register.captchaId:
     default: 'recaptcha'
     type: string

Configuration/TypoScript/constants.typoscript

@@ -30,6 +30,9 @@ plugin.tx_recaptcha {
 
   # cat=plugin.recaptcha//11; type=boolean; label= reCAPTCHA robotMode: If you use a frontend testing tool, which cannot solve the recaptcha
   robotMode = 0
+
+  # cat=plugin.recaptcha//20; type=string; label= reCAPTCHA threshold: needed score (0.0 - 1.0)
+  threshold = 0.5
 }
 
 plugin.tx_sfregister.settings.captchaId = recaptcha

Configuration/TypoScript/setup.typoscript

@@ -21,6 +21,7 @@ plugin.tx_recaptcha {
   enforceCaptcha = {$plugin.tx_recaptcha.enforceCaptcha ?? $evoweb.recaptcha.enforceCaptcha}
 
   robotMode = {$plugin.tx_recaptcha.robotMode ?? $evoweb.recaptcha.robotMode}
+  threshold = {$plugin.tx_recaptcha.threshold ?? $evoweb.recaptcha.threshold}
 }