Digitalstack/ZnoteAAC
2
0
Fork 0
mirror of https://github.com/Znote/ZnoteAAC.git synced 2025-05-10 08:09:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Google ReCaptcha code (#325)

Browse Source 
Removed duplicated code (store it in function/general.php)

Captcha doesn't need cURL (made it configurable and optional)
This commit is contained in:
slawkens 2018-06-04 12:41:49 +02:00 committed by Stefan A. Brannfjell
parent b6f30e63fc
commit 0478566020
5 changed files with 36 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.php
View File

@ -780,6 +780,7 @@
$config['use_captcha'] = false; $config['use_captcha'] = false;
$config['captcha_site_key'] = "Site key"; $config['captcha_site_key'] = "Site key";
$config['captcha_secret_key'] = "Secret key"; $config['captcha_secret_key'] = "Secret key";
$config['captcha_use_curl'] = false; // Set to false if you don't have cURL installed, otherwise set it to true
// Session prefix, if you are hosting multiple sites, make the session name different to avoid conflict. // Session prefix, if you are hosting multiple sites, make the session name different to avoid conflict.
$config['session_prefix'] = 'znote_'; $config['session_prefix'] = 'znote_';

30
engine/function/general.php
View File

@ -527,4 +527,34 @@ function generateRandomString($length = 16) {
return $randomString; return $randomString;
} }
function verifyGoogleReCaptcha($postResponse = null) {
if(!isset($postResponse) || empty($postResponse)) {
return false;
}
$recaptcha_api_url = 'https://www.google.com/recaptcha/api/siteverify';
$secretKey = config('captcha_secret_key');
$ip = $_SERVER['REMOTE_ADDR'];
$params = 'secret='.$secretKey.'&response='.$postResponse.'&remoteip='.$ip;
$useCurl = config('captcha_use_curl');
if($useCurl) {
$curl_connection = curl_init($recaptcha_api_url);
curl_setopt($curl_connection, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curl_connection, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl_connection, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl_connection, CURLOPT_FOLLOWLOCATION, 0);
curl_setopt($curl_connection, CURLOPT_POSTFIELDS, $params);
$response = curl_exec($curl_connection);
curl_close($curl_connection);
} else {
$response = file_get_contents($recaptcha_api_url . '?' . $params);
}
$json = json_decode($response);
return isset($json->success) && $json->success;
}
?> ?>

23
helpdesk.php
View File

@ -108,27 +108,8 @@ if ($view !== false) {
$errors[] = 'Token is invalid.'; $errors[] = 'Token is invalid.';
} }
if ($config['use_captcha']) { if ($config['use_captcha']) {
$captcha = (isset($_POST['g-recaptcha-response'])) ? $_POST['g-recaptcha-response'] : false; if(!verifyGoogleReCaptcha($_POST['g-recaptcha-response'])) {
if(!$captcha) { $errors[] = "Please confirm that you're not a robot.";
$errors[] = 'Please check the the captcha form.';
} else {
$secretKey = $config['captcha_secret_key'];
$ip = $_SERVER['REMOTE_ADDR'];
// curl start
$curl_connection = curl_init("https://www.google.com/recaptcha/api/siteverify");
$post_string = "secret=".$secretKey."&response=".$captcha."&remoteip=".$ip;
curl_setopt($curl_connection, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curl_connection, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl_connection, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl_connection, CURLOPT_FOLLOWLOCATION, 0);
curl_setopt($curl_connection, CURLOPT_POSTFIELDS, $post_string);
$response = curl_exec($curl_connection);
curl_close($curl_connection);
// Curl end
$responseKeys = json_decode($response,true);
if(intval($responseKeys["success"]) !== 1) {
$errors[] = 'Captcha failed.';
}
} }
} }
// Reversed this if, so: first check if you need to validate, then validate. // Reversed this if, so: first check if you need to validate, then validate.

21
recovery.php
View File

@ -13,27 +13,8 @@ if ($config['mailserver']['accountRecovery']) {
if (!empty($_POST)) { if (!empty($_POST)) {
$status = true; $status = true;
if ($config['use_captcha']) { if ($config['use_captcha']) {
$captcha = (isset($_POST['g-recaptcha-response'])) ? $_POST['g-recaptcha-response'] : false; if(!verifyGoogleReCaptcha($_POST['g-recaptcha-response'])) {
if(!$captcha) {
$status = false; $status = false;
} else {
$secretKey = $config['captcha_secret_key'];
$ip = $_SERVER['REMOTE_ADDR'];
// curl start
$curl_connection = curl_init("https://www.google.com/recaptcha/api/siteverify");
$post_string = "secret=".$secretKey."&response=".$captcha."&remoteip=".$ip;
curl_setopt($curl_connection, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curl_connection, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl_connection, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl_connection, CURLOPT_FOLLOWLOCATION, 0);
curl_setopt($curl_connection, CURLOPT_POSTFIELDS, $post_string);
$response = curl_exec($curl_connection);
curl_close($curl_connection);
// Curl end
$responseKeys = json_decode($response,true);
if(intval($responseKeys["success"]) !== 1) {
$status = false;
}
} }
} }
if ($status) { if ($status) {

23
register.php
View File

@ -22,27 +22,8 @@ if (empty($_POST) === false) {
} }
if ($config['use_captcha']) { if ($config['use_captcha']) {
$captcha = (isset($_POST['g-recaptcha-response'])) ? $_POST['g-recaptcha-response'] : false; if(!verifyGoogleReCaptcha($_POST['g-recaptcha-response'])) {
if(!$captcha) { $errors[] = "Please confirm that you're not a robot.";
$errors[] = 'Please check the the captcha form.';
} else {
$secretKey = $config['captcha_secret_key'];
$ip = $_SERVER['REMOTE_ADDR'];
// curl start
$curl_connection = curl_init("https://www.google.com/recaptcha/api/siteverify");
$post_string = "secret=".$secretKey."&response=".$captcha."&remoteip=".$ip;
curl_setopt($curl_connection, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curl_connection, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl_connection, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl_connection, CURLOPT_FOLLOWLOCATION, 0);
curl_setopt($curl_connection, CURLOPT_POSTFIELDS, $post_string);
$response = curl_exec($curl_connection);
curl_close($curl_connection);
// Curl end
$responseKeys = json_decode($response,true);
if(intval($responseKeys["success"]) !== 1) {
$errors[] = 'Captcha failed.';
}
} }
} }