Allow override of reCAPTCHA request method (cf. issue ltb-project#130)

lonoak · Aug 9, 2017 · e15491c · e15491c
1 parent 6ddbc1b
commit e15491c
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 7 deletions.
diff --git a/conf/config.inc.php b/conf/config.inc.php
@@ -265,6 +265,9 @@
 $recaptcha_theme = "light";
 $recaptcha_type = "image";
 $recaptcha_size = "normal";
+# reCAPTCHA request method, null for default, Fully Qualified Class Name to override
+# Useful when allow_url_fopen=0 ex. $recaptcha_request_method = '\ReCaptcha\RequestMethod\Socket';
+$recaptcha_request_method = null;
 
 ## Default action
 # change

diff --git a/pages/change.php b/pages/change.php
@@ -65,7 +65,7 @@
 #==============================================================================
 if ( $result === "" ) {
     if ( $use_recaptcha) {
-        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey);
+        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey, is_null($recaptcha_request_method) ? null : new $recaptcha_request_method());
         $resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
         if (!$resp->isSuccess()) {
             $result = "badcaptcha";

diff --git a/pages/changesshkey.php b/pages/changesshkey.php
@@ -57,7 +57,7 @@
 #==============================================================================
 if ( $result === "" ) {
     if ( $use_recaptcha) {
-        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey);
+        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey, is_null($recaptcha_request_method) ? null : new $recaptcha_request_method());
         $resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
         if (!$resp->isSuccess()) {
             $result = "badcaptcha";

diff --git a/pages/resetbyquestions.php b/pages/resetbyquestions.php
@@ -66,7 +66,7 @@
 #==============================================================================
 if ( $result === "" ) {
     if ( $use_recaptcha ) {
-        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey);
+        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey, is_null($recaptcha_request_method) ? null : new $recaptcha_request_method());
         $resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
         if (!$resp->isSuccess()) {
             $result = "badcaptcha";

diff --git a/pages/resetbytoken.php b/pages/resetbytoken.php
@@ -102,7 +102,7 @@
 #==============================================================================
 if ( $result === "" ) {
     if ( $use_recaptcha ) {
-        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey);
+        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey, is_null($recaptcha_request_method) ? null : new $recaptcha_request_method());
         $resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
         if (!$resp->isSuccess()) {
             $result = "badcaptcha";

diff --git a/pages/sendsms.php b/pages/sendsms.php
@@ -116,7 +116,7 @@
 #==============================================================================
 if ( $result === "" ) {
     if ( $use_recaptcha ) {
-        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey);
+        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey, is_null($recaptcha_request_method) ? null : new $recaptcha_request_method());
         $resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
         if (!$resp->isSuccess()) {
             $result = "badcaptcha";

diff --git a/pages/sendtoken.php b/pages/sendtoken.php
@@ -55,7 +55,7 @@
 #==============================================================================
 if ( $result === "" ) {
     if ( $use_recaptcha ) {
-        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey);
+        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey, is_null($recaptcha_request_method) ? null : new $recaptcha_request_method());
         $resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
         if (!$resp->isSuccess()) {
             $result = "badcaptcha";

diff --git a/pages/setquestions.php b/pages/setquestions.php
@@ -60,7 +60,7 @@
 #==============================================================================
 if ( $result === "" ) {
     if ( $use_recaptcha) {
-        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey);
+        $recaptcha = new \ReCaptcha\ReCaptcha($recaptcha_privatekey, is_null($recaptcha_request_method) ? null : new $recaptcha_request_method());
         $resp = $recaptcha->verify($_POST['g-recaptcha-response'], $_SERVER['REMOTE_ADDR']);
         if (!$resp->isSuccess()) {
             $result = "badcaptcha";

diff --git a/tests/ReCaptchaTest.php b/tests/ReCaptchaTest.php
@@ -0,0 +1,26 @@
+<?php
+
+require_once __DIR__ . '/../lib/vendor/autoload.php';
+
+class ReCaptchaTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Verifies that alternative request method is available (for $recaptcha_request_method in config)
+     * @dataProvider requestMethodsProvider
+     * @param $requestMethod string Request method FQCN
+     */
+    public function testRequestMethodAvailable($requestMethod)
+    {
+        $this->assertInstanceOf('\ReCaptcha\RequestMethod', new $requestMethod);
+    }
+
+    public function requestMethodsProvider()
+    {
+        return [
+            ['\ReCaptcha\RequestMethod\Post'], // default reCAPTCHA request method
+            ['\ReCaptcha\RequestMethod\SocketPost'],
+            ['\ReCaptcha\RequestMethod\CurlPost'],
+        ];
+    }
+}
+