www/adiumxtras.com 40:1141e83f2035: Added support for re-captcha...
commits at adium.im
commits at adium.im
Thu Mar 1 19:52:34 UTC 2012
details: http://hg.adium.im/www/adiumxtras.com/rev/1141e83f2035
revision: 40:1141e83f2035
branch: adiumxtras.com
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Mar 01 20:37:01 2012 +0100
Added support for re-captcha on adiumxtras.com.
Subject: www/adiumxtras.com 41:4e45bc59a498: The public and private key should be in ../recaptcha_keys.php.
details: http://hg.adium.im/www/adiumxtras.com/rev/4e45bc59a498
revision: 41:4e45bc59a498
branch: adiumxtras.com
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Mar 01 20:48:57 2012 +0100
The public and private key should be in ../recaptcha_keys.php.
diffs (436 lines):
diff -r 41976c149346 -r 4e45bc59a498 recaptchalib.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/recaptchalib.php Thu Mar 01 20:48:57 2012 +0100
@@ -0,0 +1,277 @@
+<?php
+/*
+ * This is a PHP library that handles calling reCAPTCHA.
+ * - Documentation and latest version
+ * http://recaptcha.net/plugins/php/
+ * - Get a reCAPTCHA API Key
+ * https://www.google.com/recaptcha/admin/create
+ * - Discussion group
+ * http://groups.google.com/group/recaptcha
+ *
+ * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
+ * AUTHORS:
+ * Mike Crawford
+ * Ben Maurer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * The reCAPTCHA server URL's
+ */
+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) {
+ $req = "";
+ foreach ( $data as $key => $value )
+ $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+
+ // Cut the last '&'
+ $req=substr($req,0,strlen($req)-1);
+ return $req;
+}
+
+
+
+/**
+ * Submits an HTTP POST to a reCAPTCHA server
+ * @param string $host
+ * @param string $path
+ * @param array $data
+ * @param int port
+ * @return array response
+ */
+function _recaptcha_http_post($host, $path, $data, $port = 80) {
+
+ $req = _recaptcha_qsencode ($data);
+
+ $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');
+ }
+
+ 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;
+ } else {
+ $server = RECAPTCHA_API_SERVER;
+ }
+
+ $errorpart = "";
+ if ($error) {
+ $errorpart = "&error=" . $error;
+ }
+ 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()
+ */
+class ReCaptchaResponse {
+ var $is_valid;
+ 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, $extra_params = array())
+{
+ if ($privkey == null || $privkey == '') {
+ 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();
+ $recaptcha_response->is_valid = false;
+ $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
+ ) + $extra_params
+ );
+
+ $answers = explode ("\n", $response [1]);
+ $recaptcha_response = new ReCaptchaResponse();
+
+ if (trim ($answers [0]) == 'true') {
+ $recaptcha_response->is_valid = true;
+ }
+ 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 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>");
+ }
+
+
+ $ky = pack('H*', $privkey);
+ $cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+
+ 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 at example,com return ["john", "example.com"].
+ * the email is then displayed as john... at 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]);
+
+}
+
+
+?>
diff -r 41976c149346 -r 4e45bc59a498 templates/xtras.tpl
--- a/templates/xtras.tpl Sun Dec 04 22:18:08 2011 -0500
+++ b/templates/xtras.tpl Thu Mar 01 20:48:57 2012 +0100
@@ -60,12 +60,14 @@
<div style="margin-top: 8px; background-color: #F7FEFF; padding: 10px 10px 10px 10px; border: 1px solid #BCDFE4;">
<h3>Post a New Comment</h3>
{if $loggedIn}
- <form method="post" action="index.php">
+ <form method="post" action="index.php?a=xtras&xtra_id={$xtra.xtra_id}">
<input type="hidden" name="xtra_id" value="{$xtra.xtra_id}" />
<input type="hidden" name="a" value="xtras" />
<input type="hidden" name="do" value="add_comment" />
- <textarea cols="6" rows="8" name="comment" style="width: 100%;"></textarea>
- <input type="submit" value="Add Comment" />
+ <textarea cols="6" rows="8" name="comment" style="width: 100%;">{$old_comment}</textarea>
+ {$error}
+ {$recaptcha_html}
+ <input type="submit" value="Add Comment" />
</form>
{else}<em>You must be <a href="index.php?a=users&do=login">logged in</a> to post comments.</em>{/if}
</div>
diff -r 41976c149346 -r 4e45bc59a498 xtras.php
--- a/xtras.php Sun Dec 04 22:18:08 2011 -0500
+++ b/xtras.php Thu Mar 01 20:48:57 2012 +0100
@@ -2,52 +2,6 @@
include("include.php");
switch ($_GET['do']) {
- case "add_comment":
- if ($_POST['comment'] && $_POST['xtra_id']) {
- if (currentUID()) {
- $sql->query("INSERT INTO comments (xtra_id, parent_id, comment, user_id, posted) VALUES ('%d', '%d', '%s', '%d', NOW())", intval($_POST['xtra_id']), intval($_POST['parent_id']), strip_tags($_POST['comment']), currentUID());
- $newCommentID = $sql->insert_id();
-
- // Email the author about the new comment.
- $sql->query("SELECT xtras.title, users.username, users.email FROM xtras, users WHERE xtras.user_id=users.user_id AND xtras.xtra_id='%d'", intval($_POST['xtra_id']));
- $emailInfo = $sql->fetch_assoc();
- $message = sprintf("%s\n\nA new comment has been added to one of your xtras.\n\n", $emailInfo['username']);
- $message .= sprintf("*******************\n%s\n<http://adiumxtras.com/index.php?a=xtras&xtra_id=%d#c%d>\n*******************\n\n", $emailInfo['title'], $_POST['xtra_id'], $newCommentID);
- $message .= sprintf("Comment by: %s\n\nComment:\n\n%s", $_COOKIE['xtras_user'], $_POST['comment']);
-
- mail($emailInfo['email'], "New Comment on Xtras", $message, "From: xtras at adiumxtras.com");
-
- if ($_POST['parent_id']) {
- $emails = array();
- $sql->query("SELECT comments.*, users.* FROM comments, users WHERE comments.comment_id IN (%s) AND users.user_id = comments.user_id", implode(",", commentsWithParent(intval($_POST['parent_id']))));
- while ($row = $sql->fetch_assoc()) {
- if ($row['email'] == $emailInfo['email'] || $row['comment_id'] == $newCommentID)
- continue;
- $emails[] = $row['email'];
- }
-
- $emails = array_unique($emails);
-
- foreach ($emails as $email) {
- $message = sprintf("Hello:\n\nA new comment has been added to a comment thread that you are participating in:\n\n");
- $message .= sprintf("*******************\n%s\n<http://adiumxtras.com/index.php?a=xtras&xtra_id=%d#c%d>\n*******************\n\n", $emailInfo['title'], $_POST['xtra_id'], $newCommentID);
- $message .= sprintf("Comment by: %s\n\nComment:\n\n%s", $_COOKIE['xtrauser'], $_POST['comment']);
- mail($email, "New Comment on Xtras Thread", $message, "From: xtras at adiumxtras.com");
- }
- }
-
- // Send the person back to whence-forth they came.
- header(sprintf("Location: index.php?a=xtras&xtra_id=%d", $_POST['xtra_id']));
- } else {
- // There was code in the old version for anonymous posting.
- // I'm totally not replicating it.
- $smarty->assign("message", "Somehow you submitted the form without logging in. That's neat. But, first, you must login.");
- $smarty->display("loginForm.tpl");
- }
- } else
- header(sprintf("Location: index.php?a=xtras&xtra_id=%d", $_POST['xtra_id']));
- break;
-
case "rate":
if ($_GET['rating'] < 0 || $_GET['rating'] > 5) {
header(sprintf("Location: %s", $_SERVER['HTTP_REFERER']));
@@ -83,6 +37,60 @@
header(sprintf("Location: %s", $_SERVER['HTTP_REFERER']));
break;
+
+ case "add_comment":
+ require_once('../recaptcha_keys.php');
+ require_once('recaptchalib.php');
+ $resp = recaptcha_check_answer (RECAPTCHA_PRIV_KEY,
+ $_SERVER["REMOTE_ADDR"],
+ $_POST["recaptcha_challenge_field"],
+ $_POST["recaptcha_response_field"]);
+ if ($resp->is_valid) {
+ if ($_POST['comment'] && $_POST['xtra_id']) {
+ if (currentUID()) {
+ $sql->query("INSERT INTO comments (xtra_id, parent_id, comment, user_id, posted) VALUES ('%d', '%d', '%s', '%d', NOW())", intval($_POST['xtra_id']), intval($_POST['parent_id']), strip_tags($_POST['comment']), currentUID());
+ $newCommentID = $sql->insert_id();
+
+ // Email the author about the new comment.
+ $sql->query("SELECT xtras.title, users.username, users.email FROM xtras, users WHERE xtras.user_id=users.user_id AND xtras.xtra_id='%d'", intval($_POST['xtra_id']));
+ $emailInfo = $sql->fetch_assoc();
+ $message = sprintf("%s\n\nA new comment has been added to one of your xtras.\n\n", $emailInfo['username']);
+ $message .= sprintf("*******************\n%s\n<http://adiumxtras.com/index.php?a=xtras&xtra_id=%d#c%d>\n*******************\n\n", $emailInfo['title'], $_POST['xtra_id'], $newCommentID);
+ $message .= sprintf("Comment by: %s\n\nComment:\n\n%s", $_COOKIE['xtras_user'], $_POST['comment']);
+
+ mail($emailInfo['email'], "New Comment on Xtras", $message, "From: xtras at adiumxtras.com");
+
+ if ($_POST['parent_id']) {
+ $emails = array();
+ $sql->query("SELECT comments.*, users.* FROM comments, users WHERE comments.comment_id IN (%s) AND users.user_id = comments.user_id", implode(",", commentsWithParent(intval($_POST['parent_id']))));
+ while ($row = $sql->fetch_assoc()) {
+ if ($row['email'] == $emailInfo['email'] || $row['comment_id'] == $newCommentID)
+ continue;
+ $emails[] = $row['email'];
+ }
+
+ $emails = array_unique($emails);
+
+ foreach ($emails as $email) {
+ $message = sprintf("Hello:\n\nA new comment has been added to a comment thread that you are participating in:\n\n");
+ $message .= sprintf("*******************\n%s\n<http://adiumxtras.com/index.php?a=xtras&xtra_id=%d#c%d>\n*******************\n\n", $emailInfo['title'], $_POST['xtra_id'], $newCommentID);
+ $message .= sprintf("Comment by: %s\n\nComment:\n\n%s", $_COOKIE['xtrauser'], $_POST['comment']);
+ mail($email, "New Comment on Xtras Thread", $message, "From: xtras at adiumxtras.com");
+ }
+ }
+
+ // Send the person back to whence-forth they came.
+ header(sprintf("Location: index.php?a=xtras&xtra_id=%d", $_POST['xtra_id']));
+ } else {
+ // There was code in the old version for anonymous posting.
+ // I'm totally not replicating it.
+ $smarty->assign("message", "Somehow you submitted the form without logging in. That's neat. But, first, you must login.");
+ $smarty->display("loginForm.tpl");
+ }
+ } else
+ header(sprintf("Location: index.php?a=xtras&xtra_id=%d", $_POST['xtra_id']));
+ break;
+ } // intentional fallthrough, they failed the captcha, but let's be nice and allow them to try again
default:
$sql->query("SELECT xtras.*, cats.*, users.*, UNIX_TIMESTAMP(xtras.date_added) AS date_added, UNIX_TIMESTAMP(xtras.bin_updated) AS bin_updated, xtras.status as status FROM xtras, cats, users, assoc WHERE xtras.xtra_id=assoc.xtra_id AND xtras.user_id=users.user_id AND cats.cat_id = assoc.cat_id AND xtras.xtra_id='%d'", intval($_GET['xtra_id']));
@@ -151,6 +159,16 @@
include("minicat.php");
$smarty->assign("categories", $categories);
$smarty->assign("comments", compileComments(intval($_GET['xtra_id']), 0));
+ if (isset($_POST['comment'])) {
+ $smarty->assign("old_comment", $_POST['comment']);
+ $smarty->assign("error", '<b>Wrong verification. Please try again.</b>');
+ } else {
+ $smarty->assign("old_comment", '');
+ $smarty->assign("error", '');
+ }
+ require_once('../recaptcha_keys.php');
+ require_once('recaptchalib.php');
+ $smarty->assign("recaptcha_html", recaptcha_get_html(RECAPTCHA_PUB_KEY));
$smarty->display("xtras.tpl");
}
break;
More information about the commits
mailing list