Skip to content

Q
question2answer
Commit 26f80b27 by Scott
Options

Update Google reCAPTCHA plugin 

Switch to new “no CAPTCHA”
parent 54dedd00
Showing with 161 additions and 270 deletions
qa-plugin/recaptcha-captcha/qa-recaptcha-captcha.php
...@@ -23,39 +23,56 @@ ...@@ -23,39 +23,56 @@
class qa_recaptcha_captcha class qa_recaptcha_captcha
{ {
private $directory; private $directory;
private $errorCodeMessages;
public function load_module($directory, $urltoroot) public function load_module($directory, $urltoroot)
{ {
$this->directory=$directory; $this->directory = $directory;
// human-readable error messages (though these are not currently displayed anywhere)
$this->errorCodeMessages = array(
'missing-input-secret' => 'The secret parameter is missing.',
'invalid-input-secret' => 'The secret parameter is invalid or malformed.',
'missing-input-response' => 'The response parameter is missing.',
'invalid-input-response' => 'The response parameter is invalid or malformed.',
);
} }
public function admin_form() public function admin_form()
{ {
$saved=false; $saved = false;
if (qa_clicked('recaptcha_save_button')) { if (qa_clicked('recaptcha_save_button')) {
qa_opt('recaptcha_public_key', qa_post_text('recaptcha_public_key_field')); qa_opt('recaptcha_public_key', qa_post_text('recaptcha_public_key_field'));
qa_opt('recaptcha_private_key', qa_post_text('recaptcha_private_key_field')); qa_opt('recaptcha_private_key', qa_post_text('recaptcha_private_key_field'));
$saved=true; $saved = true;
}
$pub = trim(qa_opt('recaptcha_public_key'));
$pri = trim(qa_opt('recaptcha_private_key'));
$error = null;
if (!strlen($pub) || !strlen($pri)) {
require_once $this->directory.'recaptchalib.php';
$error = 'To use reCAPTCHA, you must <a href="'.qa_html(ReCaptcha::getSignupUrl()).'" target="_blank">sign up</a> to get these keys.';
} }
$form=array( $form = array(
'ok' => $saved ? 'reCAPTCHA settings saved' : null, 'ok' => $saved ? 'reCAPTCHA settings saved' : null,
'fields' => array( 'fields' => array(
'public' => array( 'public' => array(
'label' => 'reCAPTCHA public key:', 'label' => 'reCAPTCHA public key:',
'value' => qa_opt('recaptcha_public_key'), 'value' => $pub,
'tags' => 'name="recaptcha_public_key_field"', 'tags' => 'name="recaptcha_public_key_field"',
), ),
'private' => array( 'private' => array(
'label' => 'reCAPTCHA private key:', 'label' => 'reCAPTCHA private key:',
'value' => qa_opt('recaptcha_private_key'), 'value' => $pri,
'tags' => 'name="recaptcha_private_key_field"', 'tags' => 'name="recaptcha_private_key_field"',
'error' => $this->recaptcha_error_html(), 'error' => $error,
), ),
), ),
...@@ -70,67 +87,73 @@ class qa_recaptcha_captcha ...@@ -70,67 +87,73 @@ class qa_recaptcha_captcha
return $form; return $form;
} }
/**
public function recaptcha_error_html() * Only allow reCAPTCHA if the keys are set up (new reCAPTCHA has no special requirements)
{ */
if (!function_exists('fsockopen'))
return 'To use reCAPTCHA, the fsockopen() PHP function must be enabled on your server. Please check with your system administrator.';
elseif ( (!strlen(trim(qa_opt('recaptcha_public_key')))) || (!strlen(trim(qa_opt('recaptcha_private_key')))) ) {
require_once $this->directory.'recaptchalib.php';
$url=recaptcha_get_signup_url(@$_SERVER['HTTP_HOST'], qa_opt('site_title'));
return 'To use reCAPTCHA, you must <a href="'.qa_html($url).'">sign up</a> to get these keys.';
}
return null;
}
public function allow_captcha() public function allow_captcha()
{ {
return function_exists('fsockopen') && strlen(trim(qa_opt('recaptcha_public_key'))) && strlen(trim(qa_opt('recaptcha_private_key'))); $pub = trim(qa_opt('recaptcha_public_key'));
} $pri = trim(qa_opt('recaptcha_private_key'));
return strlen($pub) && strlen($pri);
}
/**
* Return HTML for reCAPTCHA, including non-JS fallback. New reCAPTCHA auto-detects the user's language.
*/
public function form_html(&$qa_content, $error) public function form_html(&$qa_content, $error)
{ {
require_once $this->directory.'recaptchalib.php'; $pub = qa_opt('recaptcha_public_key');
$language=qa_opt('site_language'); $htmlLines = array(
if (strpos('|en|nl|fr|de|pt|ru|es|tr|', '|'.$language.'|')===false) // supported as of 3/2010 // currently we cannot add async/defer attributes via $qa_content so we insert script here
$language='en'; '<script src="https://www.google.com/recaptcha/api.js" async defer></script>',
'<div class="g-recaptcha" data-sitekey="'.$pub.'"></div>',
$qa_content['script_lines'][]=array(
"var RecaptchaOptions={", // non-JS falback
"\ttheme:'white',", '<noscript>',
"\tlang:".qa_js($language), ' <div style="width: 302px; height: 352px;">',
"};", ' <div style="width: 302px; height: 352px; position: relative;">',
' <div style="width: 302px; height: 352px; position: absolute;">',
' <iframe src="https://www.google.com/recaptcha/api/fallback?k='.$pub.'"',
' frameborder="0" scrolling="no"',
' style="width: 302px; height:352px; border-style: none;">',
' </iframe>',
' </div>',
' <div style="width: 250px; height: 80px; position: absolute; border-style: none;',
' bottom: 21px; left: 25px; margin: 0px; padding: 0px; right: 25px;">',
' <textarea id="g-recaptcha-response" name="g-recaptcha-response"',
' class="g-recaptcha-response"',
' style="width: 250px; height: 80px; border: 1px solid #c1c1c1;',
' margin: 0px; padding: 0px; resize: none;" value=""></textarea>',
' </div>',
' </div>',
' </div>',
'</noscript>',
); );
return recaptcha_get_html(qa_opt('recaptcha_public_key'), $error, qa_is_https_probably()); return implode("\n", $htmlLines);
} }
/**
* Check that the CAPTCHA was entered correctly. reCAPTCHA sets a long string in 'g-recaptcha-response'
* when the CAPTCHA is completed; we check that with the reCAPTCHA API.
*/
public function validate_post(&$error) public function validate_post(&$error)
{ {
if ( (!empty($_POST['recaptcha_challenge_field'])) && (!empty($_POST['recaptcha_response_field'])) ) {
require_once $this->directory.'recaptchalib.php'; require_once $this->directory.'recaptchalib.php';
$answer=recaptcha_check_answer( $recaptcha = new ReCaptcha(qa_opt('recaptcha_private_key'));
qa_opt('recaptcha_private_key'), $remoteIp = qa_remote_ip_address();
qa_remote_ip_address(), $userResponse = qa_post_text('g-recaptcha-response');
$_POST['recaptcha_challenge_field'],
$_POST['recaptcha_response_field']
);
if ($answer->is_valid) $recResponse = $recaptcha->verifyResponse($remoteIp, $userResponse);
return true;
$error=@$answer->error; foreach ($recResponse->errorCodes as $code) {
if (isset($this->errorCodeMessages[$code]))
$error .= $this->errorCodeMessages[$code] . "\n";
} }
return false; return $recResponse->success;
} }
} }
qa-plugin/recaptcha-captcha/recaptchalib.php 100644 → 100755
<?php <?php
/* /**
* This is a PHP library that handles calling reCAPTCHA. * This is a PHP library that handles calling reCAPTCHA.
* - Documentation and latest version * - Documentation and latest version
* http://recaptcha.net/plugins/php/ * https://developers.google.com/recaptcha/docs/php
* - Get a reCAPTCHA API Key * - Get a reCAPTCHA API Key
* https://www.google.com/recaptcha/admin/create * https://www.google.com/recaptcha/admin/create
* - Discussion group * - Discussion group
* http://groups.google.com/group/recaptcha * http://groups.google.com/group/recaptcha
* *
* Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net * @copyright Copyright (c) 2014, Google Inc.
* AUTHORS: * @link http://www.google.com/recaptcha
* Mike Crawford
* Ben Maurer
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
...@@ -33,242 +31,112 @@ ...@@ -33,242 +31,112 @@
*/ */
/** /**
* The reCAPTCHA server URL's * A ReCaptchaResponse is returned from verifyResponse().
*/
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
* @param $data - array of string elements to be encoded
* @return string - encoded request
*/ */
function _recaptcha_qsencode ($data) { class ReCaptchaResponse
$req = ""; {
foreach ( $data as $key => $value ) public $success;
$req .= $key . '=' . urlencode( stripslashes($value) ) . '&'; public $errorCodes = array();
// Cut the last '&'
$req=substr($req,0,strlen($req)-1);
return $req;
} }
class ReCaptcha
{
private static $_signupUrl = 'https://www.google.com/recaptcha/admin';
private static $_siteVerifyUrl = 'https://www.google.com/recaptcha/api/siteverify?';
private $_secret;
private static $_version = 'php_1.0';
/**
/** * Constructor.
* Submits an HTTP POST to a reCAPTCHA server *
* @param string $host * @param string $secret shared secret between site and ReCAPTCHA server.
* @param string $path
* @param array $data
* @param int port
* @return array response
*/ */
function _recaptcha_http_post($host, $path, $data, $port = 80) { public function __construct($secret)
{
$req = _recaptcha_qsencode ($data); if ($secret == null || $secret == '') {
die('To use reCAPTCHA you must get an API key from <a href="' . self::$_signupUrl . '">' . self::$_signupUrl . '</a>');
$http_request = "POST $path HTTP/1.0\r\n";
$http_request .= "Host: $host\r\n";
$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
$http_request .= "Content-Length: " . strlen($req) . "\r\n";
$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
$http_request .= "\r\n";
$http_request .= $req;
$response = '';
if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
die ('Could not open socket');
} }
$this->_secret = $secret;
fwrite($fs, $http_request);
while ( !feof($fs) )
$response .= fgets($fs, 1160); // One TCP-IP packet
fclose($fs);
$response = explode("\r\n\r\n", $response, 2);
return $response;
}
/**
* Gets the challenge HTML (javascript and non-javascript version).
* This is called from the browser, and the resulting reCAPTCHA HTML widget
* is embedded within the HTML form it was called from.
* @param string $pubkey A public key for reCAPTCHA
* @param string $error The error given by reCAPTCHA (optional, default is null)
* @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
* @return string - The HTML to be embedded in the user's form.
*/
function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
{
if ($pubkey == null || $pubkey == '') {
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_SECURE_SERVER; * Encodes the given data into a query string format.
} else { *
$server = RECAPTCHA_API_SERVER; * @param array $data array of string elements to be encoded.
*
* @return string - encoded request.
*/
private function _encodeQS($data)
{
$req = "";
foreach ($data as $key => $value) {
$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
} }
$errorpart = ""; // Cut the last '&'
if ($error) { $req = substr($req, 0, strlen($req)-1);
$errorpart = "&amp;error=" . $error; return $req;
} }
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/>
<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
</noscript>';
}
/** /**
* A ReCaptchaResponse is returned from recaptcha_check_answer() * Submits an HTTP GET to a reCAPTCHA server.
*
* @param string $path url path to recaptcha server.
* @param array $data array of parameters to be sent.
*
* @return array response
*/ */
class ReCaptchaResponse { private function _submitHTTPGet($path, $data)
var $is_valid; {
var $error; $req = $this->_encodeQS($data);
} $response = file_get_contents($path . $req);
return $response;
}
/** /**
* Calls an HTTP POST function to verify if the user's guess was correct * Calls the reCAPTCHA siteverify API to verify whether the user passes
* @param string $privkey * CAPTCHA test.
* @param string $remoteip *
* @param string $challenge * @param string $remoteIp IP address of end user.
* @param string $response * @param string $response response string from recaptcha verification.
* @param array $extra_params an array of extra variables to post to the server *
* @return ReCaptchaResponse * @return ReCaptchaResponse
*/ */
function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) public function verifyResponse($remoteIp, $response)
{ {
if ($privkey == null || $privkey == '') { // Discard empty solution submissions
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 ($response == null || strlen($response) == 0) {
} $recaptchaResponse = new ReCaptchaResponse();
$recaptchaResponse->success = false;
if ($remoteip == null || $remoteip == '') { $recaptchaResponse->errorCodes = array('missing-input-response');
die ("For security reasons, you must pass the remote ip to reCAPTCHA"); return $recaptchaResponse;
} }
$getResponse = $this->_submitHttpGet(
self::$_siteVerifyUrl,
//discard spam submissions array(
if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { 'secret' => $this->_secret,
$recaptcha_response = new ReCaptchaResponse(); 'remoteip' => $remoteIp,
$recaptcha_response->is_valid = false; 'v' => self::$_version,
$recaptcha_response->error = 'incorrect-captcha-sol';
return $recaptcha_response;
}
$response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
array (
'privatekey' => $privkey,
'remoteip' => $remoteip,
'challenge' => $challenge,
'response' => $response 'response' => $response
) + $extra_params )
); );
$answers = json_decode($getResponse, true);
$recaptchaResponse = new ReCaptchaResponse();
$answers = explode ("\n", $response [1]); if (trim($answers['success']) == true) {
$recaptcha_response = new ReCaptchaResponse(); $recaptchaResponse->success = true;
} else {
if (trim ($answers [0]) == 'true') { $recaptchaResponse->success = false;
$recaptcha_response->is_valid = true; if (isset($answers['error-codes']))
} $recaptchaResponse->errorCodes = $answers['error-codes'];
else {
$recaptcha_response->is_valid = false;
$recaptcha_response->error = $answers [1];
}
return $recaptcha_response;
}
/**
* gets a URL where the user can sign up for reCAPTCHA. If your application
* has a configuration page where you enter a key, you should provide a link
* using this function.
* @param string $domain The domain where the page is hosted
* @param string $appname The name of your application
*/
function recaptcha_get_signup_url ($domain = null, $appname = null) {
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 */
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;
$enc=MCRYPT_RIJNDAEL_128;
$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");
}
function _recaptcha_mailhide_urlbase64 ($x) { return $recaptchaResponse;
return strtr(base64_encode ($x), '+/', '-_');
}
/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
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://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
} }
public static function getSignupUrl()
$ky = pack('H*', $privkey); {
$cryptmail = _recaptcha_aes_encrypt ($email, $ky); return self::$_signupUrl;
return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
}
/**
* gets the parts of the email to expose to the user.
* eg, given johndoe@example,com return ["john", "example.com"].
* the email is then displayed as john...@example.com
*/
function _recaptcha_mailhide_email_parts ($email) {
$arr = preg_split("/@/", $email );
if (strlen ($arr[0]) <= 4) {
$arr[0] = substr ($arr[0], 0, 1);
} else if (strlen ($arr[0]) <= 6) {
$arr[0] = substr ($arr[0], 0, 3);
} else {
$arr[0] = substr ($arr[0], 0, 4);
} }
return $arr;
}
/**
* Gets html to display an email address given a public an private key.
* to get a key, go to:
*
* 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]);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment