Implement $cfg['CaptchaSiteVerifyURL'] for Google re-captcha

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 2, 2020 · 3278415 · 3278415
1 parent 85174fd
commit 3278415
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/doc/config.rst b/doc/config.rst
@@ -1892,6 +1892,17 @@ Cookie authentication options
 
     reCaptcha will be then used in :ref:`cookie`.
 
+.. config:option:: $cfg['CaptchaSiteVerifyURL']
+
+    :type: string
+    :default: ``''``
+
+    The URL for the reCaptcha service to do siteverify action.
+
+    reCaptcha will be then used in :ref:`cookie`.
+
+    .. versionadded:: 5.1.0
+
 Navigation panel setup
 ----------------------
 

diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php
@@ -898,6 +898,8 @@ public static function getString($path, $type = 'name')
             'CaptchaLoginPublicKey_name' => __('Public key for reCaptcha'),
             'CaptchaLoginPrivateKey_desc' => __('Enter your private key for your domain reCaptcha service.'),
             'CaptchaLoginPrivateKey_name' => __('Private key for reCaptcha'),
+            'CaptchaSiteVerifyURL_desc' => __('Enter your siteverify URL for your reCaptcha service.'),
+            'CaptchaSiteVerifyURL_name' => __('URL for reCaptcha siteverify'),
 
             'SendErrorReports_desc' => __('Choose the default action when sending error reports.'),
             'SendErrorReports_name' => __('Send error reports'),

diff --git a/libraries/classes/Config/Forms/Setup/FeaturesForm.php b/libraries/classes/Config/Forms/Setup/FeaturesForm.php
@@ -49,6 +49,7 @@ public static function getForms()
             'LoginCookieDeleteAll',
             'CaptchaLoginPublicKey',
             'CaptchaLoginPrivateKey',
+            'CaptchaSiteVerifyURL',
         ];
         $result['Developer'] = [
             'UserprefsDeveloperTab',

diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -268,20 +268,22 @@ public function readCredentials()
                 && ! empty($GLOBALS['cfg']['CaptchaLoginPublicKey'])
             ) {
                 if (! empty($_POST['g-recaptcha-response'])) {
+                    $captchaSiteVerifyURL = $GLOBALS['cfg']['CaptchaSiteVerifyURL'] ?? '';
+                    $captchaSiteVerifyURL = empty($captchaSiteVerifyURL) ? null : $captchaSiteVerifyURL;
                     if (function_exists('curl_init')) {
                         $reCaptcha = new ReCaptcha\ReCaptcha(
                             $GLOBALS['cfg']['CaptchaLoginPrivateKey'],
-                            new ReCaptcha\RequestMethod\CurlPost()
+                            new ReCaptcha\RequestMethod\CurlPost(null, $captchaSiteVerifyURL)
                         );
                     } elseif (ini_get('allow_url_fopen')) {
                         $reCaptcha = new ReCaptcha\ReCaptcha(
                             $GLOBALS['cfg']['CaptchaLoginPrivateKey'],
-                            new ReCaptcha\RequestMethod\Post()
+                            new ReCaptcha\RequestMethod\Post($captchaSiteVerifyURL)
                         );
                     } else {
                         $reCaptcha = new ReCaptcha\ReCaptcha(
                             $GLOBALS['cfg']['CaptchaLoginPrivateKey'],
-                            new ReCaptcha\RequestMethod\SocketPost()
+                            new ReCaptcha\RequestMethod\SocketPost(null, $captchaSiteVerifyURL)
                         );
                     }
 

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -848,6 +848,13 @@
  */
 $cfg['CaptchaLoginPrivateKey'] = '';
 
+/**
+ * if reCaptcha is enabled may need an URL for site verify
+ *
+ * @global string $cfg['CaptchaSiteVerifyURL']
+ */
+$cfg['CaptchaSiteVerifyURL'] = '';
+
 /**
  * Enable drag and drop import
  *