Ticket #3973: unfiltered_html_xsrf_xss.diff

trunk/wp-comments-post.php

@@ -25 +25 @@
 
 // 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/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
 add_filter('comment_author', 'wptexturize');
 add_filter('comment_author', 'convert_chars');

trunk/wp-includes/functions.php

@@ -1000 +1000 @@
         return wp_specialchars(add_query_arg('_wpnonce', wp_create_nonce($action), $actionurl));
 }
 
-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();
 }
 
 function wp_referer_field() {

trunk/wp-includes/comment-template.php

@@ -271 +271 @@
                 return false;
 }
 
+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;
 

branches/2.0/wp-comments-post.php

@@ -25 +25 @@
 
 // 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') )
                 die( __('Sorry, you must be logged in to post a comment.') );
-endif;
+}
 
 $comment_type = '';
 

branches/2.0/wp-includes/default-filters.php

@@ -33 +33 @@
 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
 add_filter('comment_author', 'wptexturize');
 add_filter('comment_author', 'convert_chars');

branches/2.0/wp-includes/functions.php

@@ -2372 +2372 @@
         return wp_specialchars(add_query_arg('_wpnonce', wp_create_nonce($action), $actionurl));
 }
 
-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();
 }
 
 function wp_referer_field() {

branches/2.0/wp-includes/comment-functions.php

@@ -2 +2 @@
 
 // Template functions
 
+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;
 

branches/2.1/wp-comments-post.php

@@ -25 +25 @@
 
 // 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 = '';
 

branches/2.1/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
 add_filter('comment_author', 'wptexturize');
 add_filter('comment_author', 'convert_chars');

branches/2.1/wp-includes/functions.php

@@ -920 +920 @@
         return wp_specialchars(add_query_arg('_wpnonce', wp_create_nonce($action), $actionurl));
 }
 
-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();
 }
 
 function wp_referer_field() {

branches/2.1/wp-includes/comment-template.php

@@ -271 +271 @@
                 return false;
 }
 
+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;