X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..3d39054f012aefe514b3f5509e32f09fc4feda44:/wp-content/plugins/akismet/class.akismet.php?ds=sidebyside
diff --git a/wp-content/plugins/akismet/class.akismet.php b/wp-content/plugins/akismet/class.akismet.php
index 7cf813d8..0d312e98 100644
--- a/wp-content/plugins/akismet/class.akismet.php
+++ b/wp-content/plugins/akismet/class.akismet.php
@@ -9,7 +9,8 @@ class Akismet {
private static $initiated = false;
private static $prevent_moderation_email_for_these_comments = array();
private static $last_comment_result = null;
-
+ private static $comment_as_submitted_allowed_keys = array( 'blog' => '', 'blog_charset' => '', 'blog_lang' => '', 'blog_ua' => '', 'comment_agent' => '', 'comment_author' => '', 'comment_author_IP' => '', 'comment_author_email' => '', 'comment_author_url' => '', 'comment_content' => '', 'comment_date_gmt' => '', 'comment_tags' => '', 'comment_type' => '', 'guid' => '', 'is_test' => '', 'permalink' => '', 'reporter' => '', 'site_domain' => '', 'submit_referer' => '', 'submit_uri' => '', 'user_ID' => '', 'user_agent' => '', 'user_id' => '', 'user_ip' => '' );
+
public static function init() {
if ( ! self::$initiated ) {
self::init_hooks();
@@ -23,36 +24,47 @@ class Akismet {
self::$initiated = true;
add_action( 'wp_insert_comment', array( 'Akismet', 'auto_check_update_meta' ), 10, 2 );
- add_action( 'preprocess_comment', array( 'Akismet', 'auto_check_comment' ), 1 );
+ add_filter( 'preprocess_comment', array( 'Akismet', 'auto_check_comment' ), 1 );
add_action( 'akismet_scheduled_delete', array( 'Akismet', 'delete_old_comments' ) );
add_action( 'akismet_scheduled_delete', array( 'Akismet', 'delete_old_comments_meta' ) );
add_action( 'akismet_schedule_cron_recheck', array( 'Akismet', 'cron_recheck' ) );
+ /**
+ * To disable the Akismet comment nonce, add a filter for the 'akismet_comment_nonce' tag
+ * and return any string value that is not 'true' or '' (empty string).
+ *
+ * Don't return boolean false, because that implies that the 'akismet_comment_nonce' option
+ * has not been set and that Akismet should just choose the default behavior for that
+ * situation.
+ */
$akismet_comment_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
if ( $akismet_comment_nonce_option == 'true' || $akismet_comment_nonce_option == '' )
add_action( 'comment_form', array( 'Akismet', 'add_comment_nonce' ), 1 );
- add_action( 'admin_footer-edit-comments.php', array( 'Akismet', 'load_form_js' ) );
+ add_action( 'admin_head-edit-comments.php', array( 'Akismet', 'load_form_js' ) );
add_action( 'comment_form', array( 'Akismet', 'load_form_js' ) );
add_action( 'comment_form', array( 'Akismet', 'inject_ak_js' ) );
add_filter( 'comment_moderation_recipients', array( 'Akismet', 'disable_moderation_emails_if_unreachable' ), 1000, 2 );
add_filter( 'pre_comment_approved', array( 'Akismet', 'last_comment_status' ), 10, 2 );
+
+ add_action( 'transition_comment_status', array( 'Akismet', 'transition_comment_status' ), 10, 3 );
- if ( '3.0.5' == $GLOBALS['wp_version'] ) {
- remove_filter( 'comment_text', 'wp_kses_data' );
- if ( is_admin() )
- add_filter( 'comment_text', 'wp_kses_post' );
- }
+ // Run this early in the pingback call, before doing a remote fetch of the source uri
+ add_action( 'xmlrpc_call', array( 'Akismet', 'pre_check_pingback' ) );
+
+ // Jetpack compatibility
+ add_filter( 'jetpack_options_whitelist', array( 'Akismet', 'add_to_jetpack_options_whitelist' ) );
+ add_action( 'update_option_wordpress_api_key', array( 'Akismet', 'updated_option' ), 10, 2 );
}
public static function get_api_key() {
- return defined('WPCOM_API_KEY') ? constant('WPCOM_API_KEY') : get_option('wordpress_api_key');
+ return apply_filters( 'akismet_get_api_key', defined('WPCOM_API_KEY') ? constant('WPCOM_API_KEY') : get_option('wordpress_api_key') );
}
public static function check_key_status( $key, $ip = null ) {
- return self::http_post( http_build_query( array( 'key' => $key, 'blog' => get_option('home') ) ), 'verify-key', $ip );
+ return self::http_post( Akismet::build_query( array( 'key' => $key, 'blog' => get_option( 'home' ) ) ), 'verify-key', $ip );
}
public static function verify_key( $key, $ip = null ) {
@@ -61,11 +73,49 @@ class Akismet {
if ( $response[1] != 'valid' && $response[1] != 'invalid' )
return 'failed';
- self::update_alert( $response );
+ return $response[1];
+ }
+
+ public static function deactivate_key( $key ) {
+ $response = self::http_post( Akismet::build_query( array( 'key' => $key, 'blog' => get_option( 'home' ) ) ), 'deactivate' );
+
+ if ( $response[1] != 'deactivated' )
+ return 'failed';
return $response[1];
}
+ /**
+ * Add the akismet option to the Jetpack options management whitelist.
+ *
+ * @param array $options The list of whitelisted option names.
+ * @return array The updated whitelist
+ */
+ public static function add_to_jetpack_options_whitelist( $options ) {
+ $options[] = 'wordpress_api_key';
+ return $options;
+ }
+
+ /**
+ * When the akismet option is updated, run the registration call.
+ *
+ * This should only be run when the option is updated from the Jetpack/WP.com
+ * API call, and only if the new key is different than the old key.
+ *
+ * @param mixed $old_value The old option value.
+ * @param mixed $value The new option value.
+ */
+ public static function updated_option( $old_value, $value ) {
+ // Not an API call
+ if ( ! class_exists( 'WPCOM_JSON_API_Update_Option_Endpoint' ) ) {
+ return;
+ }
+ // Only run the registration if the old key is different.
+ if ( $old_value !== $value ) {
+ self::verify_key( $value );
+ }
+ }
+
public static function auto_check_comment( $commentdata ) {
self::$last_comment_result = null;
@@ -74,7 +124,7 @@ class Akismet {
$comment['user_ip'] = self::get_ip_address();
$comment['user_agent'] = self::get_user_agent();
$comment['referrer'] = self::get_referer();
- $comment['blog'] = get_option('home');
+ $comment['blog'] = get_option( 'home' );
$comment['blog_lang'] = get_locale();
$comment['blog_charset'] = get_option('blog_charset');
$comment['permalink'] = get_permalink( $comment['comment_post_ID'] );
@@ -82,6 +132,7 @@ class Akismet {
if ( !empty( $comment['user_ID'] ) )
$comment['user_role'] = Akismet::get_user_roles( $comment['user_ID'] );
+ /** See filter documentation in init_hooks(). */
$akismet_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
$comment['akismet_comment_nonce'] = 'inactive';
if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
@@ -103,31 +154,40 @@ class Akismet {
$comment["POST_{$key}"] = $value;
}
- $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
-
foreach ( $_SERVER as $key => $value ) {
- if ( !in_array( $key, $ignore ) && is_string($value) )
- $comment["$key"] = $value;
- else
- $comment["$key"] = '';
+ if ( ! is_string( $value ) ) {
+ continue;
+ }
+
+ if ( preg_match( "/^HTTP_COOKIE/", $key ) ) {
+ continue;
+ }
+
+ // Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
+ if ( preg_match( "/^(HTTP_|REMOTE_ADDR|REQUEST_URI|DOCUMENT_URI)/", $key ) ) {
+ $comment[ "$key" ] = $value;
+ }
}
$post = get_post( $comment['comment_post_ID'] );
$comment[ 'comment_post_modified_gmt' ] = $post->post_modified_gmt;
- $response = self::http_post( http_build_query( $comment ), 'comment-check' );
+ $response = self::http_post( Akismet::build_query( $comment ), 'comment-check' );
do_action( 'akismet_comment_check_response', $response );
- self::update_alert( $response );
-
- $commentdata['comment_as_submitted'] = $comment;
+ $commentdata['comment_as_submitted'] = array_intersect_key( $comment, self::$comment_as_submitted_allowed_keys );
$commentdata['akismet_result'] = $response[1];
if ( isset( $response[0]['x-akismet-pro-tip'] ) )
$commentdata['akismet_pro_tip'] = $response[0]['x-akismet-pro-tip'];
- if ( 'true' == $response[1] ) {
+ if ( isset( $response[0]['x-akismet-error'] ) ) {
+ // An error occurred that we anticipated (like a suspended key) and want the user to act on.
+ // Send to moderation.
+ self::$last_comment_result = '0';
+ }
+ else if ( 'true' == $response[1] ) {
// akismet_spam_count will be incremented later by comment_is_spam()
self::$last_comment_result = 'spam';
@@ -154,6 +214,7 @@ class Akismet {
if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_single_event') ) {
if ( !wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'invalid-response-' . $response[1] );
}
}
@@ -173,7 +234,7 @@ class Akismet {
self::set_last_comment( $commentdata );
self::fix_scheduled_recheck();
- return self::$last_comment;
+ return $commentdata;
}
public static function get_last_comment() {
@@ -217,23 +278,34 @@ class Akismet {
// normal result: true or false
if ( self::$last_comment['akismet_result'] == 'true' ) {
update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
- self::update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam', 'akismet'), 'check-spam' );
+ self::update_comment_history( $comment->comment_ID, '', 'check-spam' );
if ( $comment->comment_approved != 'spam' )
- self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
+ self::update_comment_history(
+ $comment->comment_ID,
+ '',
+ 'status-changed-'.$comment->comment_approved
+ );
}
elseif ( self::$last_comment['akismet_result'] == 'false' ) {
update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
- self::update_comment_history( $comment->comment_ID, __('Akismet cleared this comment', 'akismet'), 'check-ham' );
- if ( $comment->comment_approved == 'spam' ) {
+ self::update_comment_history( $comment->comment_ID, '', 'check-ham' );
+ // Status could be spam or trash, depending on the WP version and whether this change applies:
+ // https://core.trac.wordpress.org/changeset/34726
+ if ( $comment->comment_approved == 'spam' || $comment->comment_approved == 'trash' ) {
if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) )
- self::update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check', 'akismet'), 'wp-blacklisted' );
+ self::update_comment_history( $comment->comment_ID, '', 'wp-blacklisted' );
else
- self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
+ self::update_comment_history( $comment->comment_ID, '', 'status-changed-'.$comment->comment_approved );
}
} // abnormal result: error
else {
update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
- self::update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.', 'akismet'), substr(self::$last_comment['akismet_result'], 0, 50)), 'check-error' );
+ self::update_comment_history(
+ $comment->comment_ID,
+ '',
+ 'check-error',
+ array( 'response' => substr( self::$last_comment['akismet_result'], 0, 50 ) )
+ );
}
// record the complete original data as submitted for checking
@@ -249,18 +321,37 @@ class Akismet {
public static function delete_old_comments() {
global $wpdb;
- while( $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_id FROM {$wpdb->comments} WHERE DATE_SUB(NOW(), INTERVAL 15 DAY) > comment_date_gmt AND comment_approved = 'spam' LIMIT %d", defined( 'AKISMET_DELETE_LIMIT' ) ? AKISMET_DELETE_LIMIT : 10000 ) ) ) {
+ /**
+ * Determines how many comments will be deleted in each batch.
+ *
+ * @param int The default, as defined by AKISMET_DELETE_LIMIT.
+ */
+ $delete_limit = apply_filters( 'akismet_delete_comment_limit', defined( 'AKISMET_DELETE_LIMIT' ) ? AKISMET_DELETE_LIMIT : 10000 );
+ $delete_limit = max( 1, intval( $delete_limit ) );
+
+ /**
+ * Determines how many days a comment will be left in the Spam queue before being deleted.
+ *
+ * @param int The default number of days.
+ */
+ $delete_interval = apply_filters( 'akismet_delete_comment_interval', 15 );
+ $delete_interval = max( 1, intval( $delete_interval ) );
+
+ while ( $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_id FROM {$wpdb->comments} WHERE DATE_SUB(NOW(), INTERVAL %d DAY) > comment_date_gmt AND comment_approved = 'spam' LIMIT %d", $delete_interval, $delete_limit ) ) ) {
if ( empty( $comment_ids ) )
return;
$wpdb->queries = array();
- do_action( 'delete_comment', $comment_ids );
+ foreach ( $comment_ids as $comment_id ) {
+ do_action( 'delete_comment', $comment_id );
+ }
- $comma_comment_ids = implode( ', ', array_map('intval', $comment_ids) );
+ // Prepared as strings since comment_id is an unsigned BIGINT, and using %d will constrain the value to the maximum signed BIGINT.
+ $format_string = implode( ", ", array_fill( 0, count( $comment_ids ), '%s' ) );
- $wpdb->query("DELETE FROM {$wpdb->comments} WHERE comment_id IN ( $comma_comment_ids )");
- $wpdb->query("DELETE FROM {$wpdb->commentmeta} WHERE comment_id IN ( $comma_comment_ids )");
+ $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->comments} WHERE comment_id IN ( " . $format_string . " )", $comment_ids ) );
+ $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->commentmeta} WHERE comment_id IN ( " . $format_string . " )", $comment_ids ) );
clean_comment_cache( $comment_ids );
}
@@ -321,8 +412,15 @@ class Akismet {
return $history;
}
- // log an event for a given comment, storing it in comment_meta
- public static function update_comment_history( $comment_id, $message, $event=null ) {
+ /**
+ * Log an event for a given comment, storing it in comment_meta.
+ *
+ * @param int $comment_id The ID of the relevant comment.
+ * @param string $message The string description of the event. No longer used.
+ * @param string $event The event code.
+ * @param array $meta Metadata about the history entry. e.g., the user that reported or changed the status of a given comment.
+ */
+ public static function update_comment_history( $comment_id, $message, $event=null, $meta=null ) {
global $current_user;
// failsafe for old WP versions
@@ -330,15 +428,19 @@ class Akismet {
return false;
$user = '';
- if ( is_object( $current_user ) && isset( $current_user->user_login ) )
- $user = $current_user->user_login;
$event = array(
'time' => self::_get_microtime(),
- 'message' => $message,
'event' => $event,
- 'user' => $user,
);
+
+ if ( is_object( $current_user ) && isset( $current_user->user_login ) ) {
+ $event['user'] = $current_user->user_login;
+ }
+
+ if ( ! empty( $meta ) ) {
+ $event['meta'] = $meta;
+ }
// $unique = false so as to allow multiple values per comment
$r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
@@ -348,24 +450,215 @@ class Akismet {
global $wpdb;
$c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $id ), ARRAY_A );
- if ( !$c )
- return;
+
+ if ( ! $c ) {
+ return new WP_Error( 'invalid-comment-id', __( 'Comment not found.', 'akismet' ) );
+ }
$c['user_ip'] = $c['comment_author_IP'];
$c['user_agent'] = $c['comment_agent'];
$c['referrer'] = '';
- $c['blog'] = get_option('home');
+ $c['blog'] = get_option( 'home' );
$c['blog_lang'] = get_locale();
$c['blog_charset'] = get_option('blog_charset');
$c['permalink'] = get_permalink($c['comment_post_ID']);
$c['recheck_reason'] = $recheck_reason;
+ $c['user_role'] = '';
+ if ( isset( $c['user_ID'] ) )
+ $c['user_role'] = Akismet::get_user_roles($c['user_ID']);
+
if ( self::is_test_mode() )
$c['is_test'] = 'true';
- $response = self::http_post( http_build_query( $c ), 'comment-check' );
+ $response = self::http_post( Akismet::build_query( $c ), 'comment-check' );
+
+ if ( ! empty( $response[1] ) ) {
+ return $response[1];
+ }
+
+ return false;
+ }
+
+ public static function recheck_comment( $id, $recheck_reason = 'recheck_queue' ) {
+ add_comment_meta( $id, 'akismet_rechecking', true );
+
+ $api_response = self::check_db_comment( $id, $recheck_reason );
+
+ delete_comment_meta( $id, 'akismet_rechecking' );
+
+ if ( is_wp_error( $api_response ) ) {
+ // Invalid comment ID.
+ }
+ else if ( 'true' === $api_response ) {
+ wp_set_comment_status( $id, 'spam' );
+ update_comment_meta( $id, 'akismet_result', 'true' );
+ delete_comment_meta( $id, 'akismet_error' );
+ delete_comment_meta( $id, 'akismet_delayed_moderation_email' );
+ Akismet::update_comment_history( $id, '', 'recheck-spam' );
+ }
+ elseif ( 'false' === $api_response ) {
+ update_comment_meta( $id, 'akismet_result', 'false' );
+ delete_comment_meta( $id, 'akismet_error' );
+ delete_comment_meta( $id, 'akismet_delayed_moderation_email' );
+ Akismet::update_comment_history( $id, '', 'recheck-ham' );
+ }
+ else {
+ // abnormal result: error
+ update_comment_meta( $id, 'akismet_result', 'error' );
+ Akismet::update_comment_history(
+ $id,
+ '',
+ 'recheck-error',
+ array( 'response' => substr( $api_response, 0, 50 ) )
+ );
+ }
+
+ return $api_response;
+ }
+
+ public static function transition_comment_status( $new_status, $old_status, $comment ) {
+
+ if ( $new_status == $old_status )
+ return;
+
+ # we don't need to record a history item for deleted comments
+ if ( $new_status == 'delete' )
+ return;
+
+ if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
+ return;
+
+ if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
+ return;
+
+ // if this is present, it means the status has been changed by a re-check, not an explicit user action
+ if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
+ return;
+
+ global $current_user;
+ $reporter = '';
+ if ( is_object( $current_user ) )
+ $reporter = $current_user->user_login;
+
+ // Assumption alert:
+ // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
+ // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
+ // determine why the transition_comment_status action was triggered. And there are several different ways by which
+ // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
+ // We'll assume that this is an explicit user action if certain POST/GET variables exist.
+ if ( ( isset( $_POST['status'] ) && in_array( $_POST['status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['spam'] ) && (int) $_POST['spam'] == 1 ) ||
+ ( isset( $_POST['unspam'] ) && (int) $_POST['unspam'] == 1 ) ||
+ ( isset( $_POST['comment_status'] ) && in_array( $_POST['comment_status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'spam', 'unspam', 'spamcomment', 'unspamcomment', ) ) ) ||
+ ( isset( $_POST['action'] ) && in_array( $_POST['action'], array( 'editedcomment' ) ) ) ||
+ ( isset( $_GET['for'] ) && ( 'jetpack' == $_GET['for'] ) ) // Moderation via WP.com notifications/WP app/etc.
+ ) {
+ if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
+ return self::submit_spam_comment( $comment->comment_ID );
+ } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
+ return self::submit_nonspam_comment( $comment->comment_ID );
+ }
+ }
+
+ self::update_comment_history( $comment->comment_ID, '', 'status-' . $new_status );
+ }
+
+ public static function submit_spam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+
+ if ( !$comment ) // it was deleted
+ return;
+
+ if ( 'spam' != $comment->comment_approved )
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = self::sanitize_comment_as_submitted( get_comment_meta( $comment_id, 'akismet_as_submitted', true ) );
+
+ if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_option( 'home' );
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink($comment->comment_post_ID);
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ $comment->user_role = '';
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles( $comment->user_ID );
+
+ if ( self::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
- return ( is_array( $response ) && ! empty( $response[1] ) ) ? $response[1] : false;
+ $response = Akismet::http_post( Akismet::build_query( $comment ), 'submit-spam' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, '', 'report-spam' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
+ }
+
+ public static function submit_nonspam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+ if ( !$comment ) // it was deleted
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = self::sanitize_comment_as_submitted( get_comment_meta( $comment_id, 'akismet_as_submitted', true ) );
+
+ if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_option( 'home' );
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink( $comment->comment_post_ID );
+ $comment->user_role = '';
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles($comment->user_ID);
+
+ if ( Akismet::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = self::http_post( Akismet::build_query( $comment ), 'submit-ham' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, '', 'report-ham' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
}
public static function cron_recheck() {
@@ -377,6 +670,7 @@ class Akismet {
if ( get_option( 'akismet_alert_code' ) || $status == 'invalid' ) {
// since there is currently a problem with the key, reschedule a check for 6 hours hence
wp_schedule_single_event( time() + 21600, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'key-problem-' . get_option( 'akismet_alert_code' ) . '-' . $status );
return false;
}
@@ -398,19 +692,19 @@ class Akismet {
add_comment_meta( $comment_id, 'akismet_rechecking', true );
$status = self::check_db_comment( $comment_id, 'retry' );
- $msg = '';
+ $event = '';
if ( $status == 'true' ) {
- $msg = __( 'Akismet caught this comment as spam during an automatic retry.' , 'akismet');
+ $event = 'cron-retry-spam';
} elseif ( $status == 'false' ) {
- $msg = __( 'Akismet cleared this comment during an automatic retry.' , 'akismet');
+ $event = 'cron-retry-ham';
}
// If we got back a legit response then update the comment history
// other wise just bail now and try again later. No point in
// re-trying all the comments once we hit one failure.
- if ( !empty( $msg ) ) {
+ if ( !empty( $event ) ) {
delete_comment_meta( $comment_id, 'akismet_error' );
- self::update_comment_history( $comment_id, $msg, 'cron-retry' );
+ self::update_comment_history( $comment_id, '', $event );
update_comment_meta( $comment_id, 'akismet_result', $status );
// make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere.
$comment = get_comment( $comment_id );
@@ -438,6 +732,7 @@ class Akismet {
delete_comment_meta( $comment_id, 'akismet_rechecking' );
wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'check-db-comment-' . $status );
return;
}
delete_comment_meta( $comment_id, 'akismet_rechecking' );
@@ -446,6 +741,7 @@ class Akismet {
$remaining = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error'" );
if ( $remaining && !wp_next_scheduled('akismet_schedule_cron_recheck') ) {
wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'remaining' );
}
}
@@ -463,6 +759,7 @@ class Akismet {
if ( $future_check > $check_range ) {
wp_clear_scheduled_hook( 'akismet_schedule_cron_recheck' );
wp_schedule_single_event( time() + 300, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'fix-scheduled-recheck' );
}
}
@@ -500,12 +797,35 @@ class Akismet {
$comment1 = (array) $comment1;
$comment2 = (array) $comment2;
- return (
+ $comments_match = (
isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] )
&& intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] )
- && $comment1['comment_author'] == $comment2['comment_author']
- && $comment1['comment_author_email'] == $comment2['comment_author_email']
+ && (
+ // The comment author length max is 255 characters, limited by the TINYTEXT column type.
+ // If the comment author includes multibyte characters right around the 255-byte mark, they
+ // may be stripped when the author is saved in the DB, so a 300+ char author may turn into
+ // a 253-char author when it's saved, not 255 exactly. The longest possible character is
+ // theoretically 6 bytes, so we'll only look at the first 248 bytes to be safe.
+ substr( $comment1['comment_author'], 0, 248 ) == substr( $comment2['comment_author'], 0, 248 )
+ || substr( stripslashes( $comment1['comment_author'] ), 0, 248 ) == substr( $comment2['comment_author'], 0, 248 )
+ || substr( $comment1['comment_author'], 0, 248 ) == substr( stripslashes( $comment2['comment_author'] ), 0, 248 )
+ // Certain long comment author names will be truncated to nothing, depending on their encoding.
+ || ( ! $comment1['comment_author'] && strlen( $comment2['comment_author'] ) > 248 )
+ || ( ! $comment2['comment_author'] && strlen( $comment1['comment_author'] ) > 248 )
+ )
+ && (
+ // The email max length is 100 characters, limited by the VARCHAR(100) column type.
+ // Same argument as above for only looking at the first 93 characters.
+ substr( $comment1['comment_author_email'], 0, 93 ) == substr( $comment2['comment_author_email'], 0, 93 )
+ || substr( stripslashes( $comment1['comment_author_email'] ), 0, 93 ) == substr( $comment2['comment_author_email'], 0, 93 )
+ || substr( $comment1['comment_author_email'], 0, 93 ) == substr( stripslashes( $comment2['comment_author_email'] ), 0, 93 )
+ // Very long emails can be truncated and then stripped if the [0:100] substring isn't a valid address.
+ || ( ! $comment1['comment_author_email'] && strlen( $comment2['comment_author_email'] ) > 100 )
+ || ( ! $comment2['comment_author_email'] && strlen( $comment1['comment_author_email'] ) > 100 )
+ )
);
+
+ return $comments_match;
}
// Does the supplied comment match the details of the one most recently stored in self::$last_comment?
@@ -551,8 +871,13 @@ class Akismet {
// filter handler used to return a spam result to pre_comment_approved
public static function last_comment_status( $approved, $comment ) {
+ if ( is_null( self::$last_comment_result ) ) {
+ // We didn't have reason to store the result of the last check.
+ return $approved;
+ }
+
// Only do this if it's the correct comment
- if ( is_null(self::$last_comment_result) || ! self::matches_last_comment( $comment ) ) {
+ if ( ! self::matches_last_comment( $comment ) ) {
self::log( "comment_is_spam mismatched comment, returning unaltered $approved" );
return $approved;
}
@@ -639,13 +964,77 @@ class Akismet {
'timeout' => 15
);
- $akismet_url = "http://{$http_host}/1.1/{$path}";
+ $akismet_url = $http_akismet_url = "http://{$http_host}/1.1/{$path}";
+
+ /**
+ * Try SSL first; if that fails, try without it and don't try it again for a while.
+ */
+
+ $ssl = $ssl_failed = false;
+
+ // Check if SSL requests were disabled fewer than X hours ago.
+ $ssl_disabled = get_option( 'akismet_ssl_disabled' );
+
+ if ( $ssl_disabled && $ssl_disabled < ( time() - 60 * 60 * 24 ) ) { // 24 hours
+ $ssl_disabled = false;
+ delete_option( 'akismet_ssl_disabled' );
+ }
+ else if ( $ssl_disabled ) {
+ do_action( 'akismet_ssl_disabled' );
+ }
+
+ if ( ! $ssl_disabled && function_exists( 'wp_http_supports') && ( $ssl = wp_http_supports( array( 'ssl' ) ) ) ) {
+ $akismet_url = set_url_scheme( $akismet_url, 'https' );
+
+ do_action( 'akismet_https_request_pre' );
+ }
+
$response = wp_remote_post( $akismet_url, $http_args );
+
Akismet::log( compact( 'akismet_url', 'http_args', 'response' ) );
- if ( is_wp_error( $response ) )
+
+ if ( $ssl && is_wp_error( $response ) ) {
+ do_action( 'akismet_https_request_failure', $response );
+
+ // Intermittent connection problems may cause the first HTTPS
+ // request to fail and subsequent HTTP requests to succeed randomly.
+ // Retry the HTTPS request once before disabling SSL for a time.
+ $response = wp_remote_post( $akismet_url, $http_args );
+
+ Akismet::log( compact( 'akismet_url', 'http_args', 'response' ) );
+
+ if ( is_wp_error( $response ) ) {
+ $ssl_failed = true;
+
+ do_action( 'akismet_https_request_failure', $response );
+
+ do_action( 'akismet_http_request_pre' );
+
+ // Try the request again without SSL.
+ $response = wp_remote_post( $http_akismet_url, $http_args );
+
+ Akismet::log( compact( 'http_akismet_url', 'http_args', 'response' ) );
+ }
+ }
+
+ if ( is_wp_error( $response ) ) {
+ do_action( 'akismet_request_failure', $response );
+
return array( '', '' );
+ }
+
+ if ( $ssl_failed ) {
+ // The request failed when using SSL but succeeded without it. Disable SSL for future requests.
+ update_option( 'akismet_ssl_disabled', time() );
+
+ do_action( 'akismet_https_disabled' );
+ }
+
+ $simplified_response = array( $response['headers'], $response['body'] );
+
+ self::update_alert( $simplified_response );
- return array( $response['headers'], $response['body'] );
+ return $simplified_response;
}
// given a response from an API call like check_key_status(), update the alert code options if an alert is present.
@@ -670,7 +1059,14 @@ class Akismet {
}
public static function load_form_js() {
- wp_enqueue_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array( 'jquery' ), AKISMET_VERSION );
+ // WP < 3.3 can't enqueue a script this late in the game and still have it appear in the footer.
+ // Once we drop support for everything pre-3.3, this can change back to a single enqueue call.
+ wp_register_script( 'akismet-form', plugin_dir_url( __FILE__ ) . '_inc/form.js', array(), AKISMET_VERSION, true );
+ add_action( 'wp_footer', array( 'Akismet', 'print_form_js' ) );
+ add_action( 'admin_footer', array( 'Akismet', 'print_form_js' ) );
+ }
+
+ public static function print_form_js() {
wp_print_scripts( 'akismet-form' );
}
@@ -743,7 +1139,7 @@ p {
if ( version_compare( $GLOBALS['wp_version'], AKISMET__MINIMUM_WP_VERSION, '<' ) ) {
load_plugin_textdomain( 'akismet' );
- $message = ''.sprintf(esc_html__( 'Akismet %s requires WordPress %s or higher.' , 'akismet'), AKISMET_VERSION, AKISMET__MINIMUM_WP_VERSION ).' '.sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/');
+ $message = ''.sprintf(esc_html__( 'Akismet %s requires WordPress %s or higher.' , 'akismet'), AKISMET_VERSION, AKISMET__MINIMUM_WP_VERSION ).' '.sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'https://wordpress.org/extend/plugins/akismet/download/');
Akismet::bail_on_activation( $message );
}
@@ -754,11 +1150,114 @@ p {
* @static
*/
public static function plugin_deactivation( ) {
- //tidy up
+ return self::deactivate_key( self::get_api_key() );
+ }
+
+ /**
+ * Essentially a copy of WP's build_query but one that doesn't expect pre-urlencoded values.
+ *
+ * @param array $args An array of key => value pairs
+ * @return string A string ready for use as a URL query string.
+ */
+ public static function build_query( $args ) {
+ return _http_build_query( $args, '', '&' );
}
+ /**
+ * Log debugging info to the error log.
+ *
+ * Enabled when WP_DEBUG_LOG is enabled (and WP_DEBUG, since according to
+ * core, "WP_DEBUG_DISPLAY and WP_DEBUG_LOG perform no function unless
+ * WP_DEBUG is true), but can be disabled via the akismet_debug_log filter.
+ *
+ * @param mixed $akismet_debug The data to log.
+ */
public static function log( $akismet_debug ) {
- if ( defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG )
- error_log( print_r( compact( 'akismet_debug' ), 1 ) ); //send message to debug.log when in debug mode
+ if ( apply_filters( 'akismet_debug_log', defined( 'WP_DEBUG' ) && WP_DEBUG && defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG ) ) {
+ error_log( print_r( compact( 'akismet_debug' ), true ) );
+ }
}
-}
\ No newline at end of file
+
+ public static function pre_check_pingback( $method ) {
+ if ( $method !== 'pingback.ping' )
+ return;
+
+ global $wp_xmlrpc_server;
+
+ if ( !is_object( $wp_xmlrpc_server ) )
+ return false;
+
+ // Lame: tightly coupled with the IXR class.
+ $args = $wp_xmlrpc_server->message->params;
+
+ if ( !empty( $args[1] ) ) {
+ $post_id = url_to_postid( $args[1] );
+
+ // If this gets through the pre-check, make sure we properly identify the outbound request as a pingback verification
+ Akismet::pingback_forwarded_for( null, $args[0] );
+ add_filter( 'http_request_args', array( 'Akismet', 'pingback_forwarded_for' ), 10, 2 );
+
+ $comment = array(
+ 'comment_author_url' => $args[0],
+ 'comment_post_ID' => $post_id,
+ 'comment_author' => '',
+ 'comment_author_email' => '',
+ 'comment_content' => '',
+ 'comment_type' => 'pingback',
+ 'akismet_pre_check' => '1',
+ 'comment_pingback_target' => $args[1],
+ );
+
+ $comment = Akismet::auto_check_comment( $comment );
+
+ if ( isset( $comment['akismet_result'] ) && 'true' == $comment['akismet_result'] ) {
+ // Lame: tightly coupled with the IXR classes. Unfortunately the action provides no context and no way to return anything.
+ $wp_xmlrpc_server->error( new IXR_Error( 0, 'Invalid discovery target' ) );
+ }
+ }
+ }
+
+ public static function pingback_forwarded_for( $r, $url ) {
+ static $urls = array();
+
+ // Call this with $r == null to prime the callback to add headers on a specific URL
+ if ( is_null( $r ) && !in_array( $url, $urls ) ) {
+ $urls[] = $url;
+ }
+
+ // Add X-Pingback-Forwarded-For header, but only for requests to a specific URL (the apparent pingback source)
+ if ( is_array( $r ) && is_array( $r['headers'] ) && !isset( $r['headers']['X-Pingback-Forwarded-For'] ) && in_array( $url, $urls ) ) {
+ $remote_ip = preg_replace( '/[^a-fx0-9:.,]/i', '', $_SERVER['REMOTE_ADDR'] );
+
+ // Note: this assumes REMOTE_ADDR is correct, and it may not be if a reverse proxy or CDN is in use
+ $r['headers']['X-Pingback-Forwarded-For'] = $remote_ip;
+
+ // Also identify the request as a pingback verification in the UA string so it appears in logs
+ $r['user-agent'] .= '; verifying pingback from ' . $remote_ip;
+ }
+
+ return $r;
+ }
+
+ /**
+ * Ensure that we are loading expected scalar values from akismet_as_submitted commentmeta.
+ *
+ * @param mixed $meta_value
+ * @return mixed
+ */
+ private static function sanitize_comment_as_submitted( $meta_value ) {
+ if ( empty( $meta_value ) ) {
+ return $meta_value;
+ }
+
+ $meta_value = (array) $meta_value;
+
+ foreach ( $meta_value as $key => $value ) {
+ if ( ! isset( self::$comment_as_submitted_allowed_keys[$key] ) || ! is_scalar( $value ) ) {
+ unset( $meta_value[$key] );
+ }
+ }
+
+ return $meta_value;
+ }
+}