* (bug 31252) ReCaptcha HTTPS support, avoids mixed-content security warnings

Patch from Alex Legler with a slight tweak for easier 1.17 compat (use $_SERVER['HTTPS'] directly as WebRequest::detectPort() isn't there yet)

Updates recaptchalib.php to current: version 1.11 from http://code.google.com/p/recaptcha/downloads/detail?name=recaptcha-php-1.11.zip&can=2&q=

diff --git a/ReCaptcha.php b/ReCaptcha.php
index 36a74ed7b7df171cdfa457e030e012ecc3ef4102..b068b86eab87a093db41451d2456682942d2707b 100644 (file)
--- a/ReCaptcha.php
+++ b/ReCaptcha.php
@@ -63,8 +63,9 @@ class ReCaptcha extends SimpleCaptcha {
          */
        function getForm() {
                global $wgReCaptchaPublicKey;
+               $useHttps = ( isset( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] == 'on' );
                return "<script>var RecaptchaOptions = { tabindex : 1 }; </script> " .
-               recaptcha_get_html($wgReCaptchaPublicKey, $this->recaptcha_error);
+                       recaptcha_get_html($wgReCaptchaPublicKey, $this->recaptcha_error, $useHttps);
        }
 
        /**

diff --git a/recaptchalib.php b/recaptchalib.php
index b24997b48ad42255ee5676997c0eefe4d1bf4cb6..32c4f4d75826d3be5409cbbc626083fe826cf3d5 100644 (file)
--- a/recaptchalib.php
+++ b/recaptchalib.php
@@ -4,7 +4,7 @@
  *    - Documentation and latest version
  *          http://recaptcha.net/plugins/php/
  *    - Get a reCAPTCHA API Key
- *          http://recaptcha.net/api/getkey
+ *          https://www.google.com/recaptcha/admin/create
  *    - Discussion group
  *          http://groups.google.com/group/recaptcha
  *
@@ -35,10 +35,9 @@
 /**
  * The reCAPTCHA server URL's
  */
-$recaptcha_api_server = 'http://api.recaptcha.net';
-$recaptcha_api_secure_server = 'https://api-secure.recaptcha.net';
-$recaptcha_verify_server = 'api-verify.recaptcha.net';
-
+define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
+define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
+define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
 
 /**
  * Encodes the given data into a query string format
@@ -92,6 +91,8 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) {
         return $response;
 }
 
+
+
 /**
  * Gets the challenge HTML (javascript and non-javascript version).
  * This is called from the browser, and the resulting reCAPTCHA HTML widget
@@ -104,17 +105,16 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) {
  */
 function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
 {
-        global $recaptcha_api_server, $recaptcha_api_ssl_server;
-
        if ($pubkey == null || $pubkey == '') {
-               die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
+               die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
        }
-
+       
        if ($use_ssl) {
-           $server = $recaptcha_api_ssl_server;
+                $server = RECAPTCHA_API_SECURE_SERVER;
         } else {
-           $server = $recaptcha_api_server;
+                $server = RECAPTCHA_API_SERVER;
         }
+
         $errorpart = "";
         if ($error) {
            $errorpart = "&amp;error=" . $error;
@@ -122,12 +122,15 @@ function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
         return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 
        <noscript>
-               <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br>
+               <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
                <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-               <input type="hidden" name="recaptcha_response_field" value="manual_challenge">
+               <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
        </noscript>';
 }
 
+
+
+
 /**
  * A ReCaptchaResponse is returned from recaptcha_check_answer()
  */
@@ -136,24 +139,28 @@ class ReCaptchaResponse {
         var $error;
 }
 
+
 /**
   * Calls an HTTP POST function to verify if the user's guess was correct
   * @param string $privkey
   * @param string $remoteip
   * @param string $challenge
   * @param string $response
+  * @param array $extra_params an array of extra variables to post to the server
   * @return ReCaptchaResponse
   */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response)
+function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
        if ($privkey == null || $privkey == '') {
-               die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
+               die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
        }
 
        if ($remoteip == null || $remoteip == '') {
                die ("For security reasons, you must pass the remote ip to reCAPTCHA");
        }
 
+       
+       
         //discard spam submissions
         if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
                 $recaptcha_response = new ReCaptchaResponse();
@@ -162,14 +169,13 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response)
                 return $recaptcha_response;
         }
 
-        global $recaptcha_verify_server;
-        $response = _recaptcha_http_post ($recaptcha_verify_server, "/verify",
+        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
                                           array (
                                                  'privatekey' => $privkey,
                                                  'remoteip' => $remoteip,
                                                  'challenge' => $challenge,
                                                  'response' => $response
-                                                 )
+                                                 ) + $extra_params
                                           );
 
         $answers = explode ("\n", $response [1]);
@@ -194,7 +200,13 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response)
  * @param string $appname The name of your application
  */
 function recaptcha_get_signup_url ($domain = null, $appname = null) {
-       return "http://recaptcha.net/api/getkey?" .  _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname));
+       return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+}
+
+function _recaptcha_aes_pad($val) {
+       $block_size = 16;
+       $numpad = $block_size - (strlen ($val) % $block_size);
+       return str_pad($val, strlen ($val) + $numpad, chr($numpad));
 }
 
 /* Mailhide related code */
@@ -203,9 +215,9 @@ function _recaptcha_aes_encrypt($val,$ky) {
        if (! function_exists ("mcrypt_encrypt")) {
                die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
        }
-       $mode=MCRYPT_MODE_CBC;
+       $mode=MCRYPT_MODE_CBC;   
        $enc=MCRYPT_RIJNDAEL_128;
-       $val=str_pad($val, (16*(floor(strlen($val) / 16)+(strlen($val) % 16==0?2:1))), chr(16-(strlen($val) % 16)));
+       $val=_recaptcha_aes_pad($val);
        return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
@@ -218,13 +230,14 @@ function _recaptcha_mailhide_urlbase64 ($x) {
 function recaptcha_mailhide_url($pubkey, $privkey, $email) {
        if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
                die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-                    "you can do so at <a href='http://mailhide.recaptcha.net/apikey'>http://mailhide.recaptcha.net/apikey</a>");
+                    "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
        }
+       
 
        $ky = pack('H*', $privkey);
        $cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-
-       return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+       
+       return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
 }
 
 /**
@@ -237,7 +250,7 @@ function _recaptcha_mailhide_email_parts ($email) {
 
        if (strlen ($arr[0]) <= 4) {
                $arr[0] = substr ($arr[0], 0, 1);
-       } elseif (strlen ($arr[0]) <= 6) {
+       } else if (strlen ($arr[0]) <= 6) {
                $arr[0] = substr ($arr[0], 0, 3);
        } else {
                $arr[0] = substr ($arr[0], 0, 4);
@@ -249,14 +262,16 @@ function _recaptcha_mailhide_email_parts ($email) {
  * Gets html to display an email address given a public an private key.
  * to get a key, go to:
  *
- * http://mailhide.recaptcha.net/apikey
+ * http://www.google.com/recaptcha/mailhide/apikey
  */
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
        $emailparts = _recaptcha_mailhide_email_parts ($email);
        $url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-
+       
        return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
                "' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
 
 }
 
+
+?>