Changeset 5039

Timestamp:

03/14/2007 11:10:57 PM (18 years ago)

Author:

markjaquith

Message:

nonce-protect comments by users with unfiltered_html cap to prevent xsrf/xss. fixes #3973 for trunk

Location:

trunk

Files:

• wp-comments-post.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-comments-post.php

@@ -26 +26 @@
 // If the user is logged in
 $user = wp_get_current_user();
-if ( $user->ID ) :
+if ( $user->ID ) {
     $comment_author       = $wpdb->escape($user->display_name);
     $comment_author_email = $wpdb->escape($user->user_email);
     $comment_author_url   = $wpdb->escape($user->user_url);
-else :
+    if ( current_user_can('unfiltered_html') ) {
+        if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
+            kses_remove_filters(); // start with a clean slate
+            kses_init_filters(); // set up the filters
+        }
+    }
+} else {
     if ( get_option('comment_registration') )
         wp_die( __('Sorry, you must be logged in to post a comment.') );
-endif;
+}
 
 $comment_type = '';

trunk/wp-includes/comment-template.php

@@ -272 +272 @@
 }
 
+function wp_comment_form_unfiltered_html_nonce() {
+    global $post;
+    if ( current_user_can('unfiltered_html') )
+        wp_nonce_field('unfiltered-html-comment_' . $post->ID, '_wp_unfiltered_html_comment', false);
+}
+
 function comments_template( $file = '/comments.php' ) {
     global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity;

trunk/wp-includes/default-filters.php

@@ -31 +31 @@
 add_filter('pre_comment_author_email', 'wp_filter_kses');
 add_filter('pre_comment_author_url', 'wp_filter_kses');
+
+add_action('comment_form', 'wp_comment_form_unfiltered_html_nonce');
 
 // Default filters for these functions

trunk/wp-includes/functions.php

@@ -1001 +1001 @@
 }
 
-function wp_nonce_field($action = -1) {
-    echo '<input type="hidden" name="_wpnonce" value="' . wp_create_nonce($action) . '" />';
-    wp_referer_field();
+function wp_nonce_field($action = -1, $name = "_wpnonce", $referer = true) {
+    $name = attribute_escape($name);
+    echo '<input type="hidden" name="' . $name . '" value="' . wp_create_nonce($action) . '" />';
+    if ( $referer )
+        wp_referer_field();
 }