Ticket #10975: wp-comment-nonce.patch

wp-comments-post.php

@@ -19 +19 @@
 
 $comment_post_ID = (int) $_POST['comment_post_ID'];
 
+// required for the nonce to work
+$user = wp_get_current_user();
+
+// see comment_form_nonce() in wp-includes/comment.php
+if ( !wp_verify_nonce($_POST['_wpnonce'], "comment_form_{$comment_post_ID}") ) {
+        do_action('comment_nonce_failed', $comment_post_ID);
+        wp_die( __('Sorry, automated comments are not accepted.') );
+}
+
 $status = $wpdb->get_row( $wpdb->prepare("SELECT post_status, comment_status FROM $wpdb->posts WHERE ID = %d", $comment_post_ID) );
 
 if ( empty($status->comment_status) ) {
@@ -40 +49 @@
 $comment_content      = ( isset($_POST['comment']) ) ? trim($_POST['comment']) : null;
 
 // If the user is logged in
-$user = wp_get_current_user();
 if ( $user->ID ) {
         if ( empty( $user->display_name ) )
                 $user->display_name=$user->user_login;

wp-includes/comment.php

@@ -1642 +1642 @@
         return $open;
 }
 
+/**
+ * Include a nonce in comment forms.
+ */
+function comment_form_nonce($post_id) {
+        wp_nonce_field("comment_form_{$post_id}", '_wpnonce', false);
+}
+
+add_action('comment_form', 'comment_form_nonce');
+
 ?>