Changeset 5558 for trunk/src/includes/topics/template.php

Timestamp:

11/10/2014 05:37:29 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Improve form field output sanitization when posting theme-side forum/topic/reply content. Thanks planetzuda. See #2719.

File:

• trunk/src/includes/topics/template.php (modified) (10 diffs)

trunk/src/includes/topics/template.php

@@ -3266 +3266 @@
 
             // Post value is passed
-            if ( bbp_is_post_request() && isset( $_POST[ $r['select_id'] ] ) ) {
+            if ( bbp_is_topic_form_post_request() && isset( $_POST[ $r['select_id'] ] ) ) {
                 $r['selected'] = $_POST[ $r['select_id'] ];
 
@@ -3355 +3355 @@
 
             // Post value is passed
-            if ( bbp_is_post_request() && isset( $_POST[ $r['select_id'] ] ) ) {
+            if ( bbp_is_topic_form_post_request() && isset( $_POST[ $r['select_id'] ] ) ) {
                 $r['selected'] = $_POST[ $r['select_id'] ];
 
@@ -3849 +3849 @@
 
         // Get _POST data
-        if ( bbp_is_post_request() && isset( $_POST['bbp_topic_title'] ) ) {
-            $topic_title = $_POST['bbp_topic_title'];
+        if ( bbp_is_topic_form_post_request() && isset( $_POST['bbp_topic_title'] ) ) {
+            $topic_title = stripslashes( $_POST['bbp_topic_title'] );
 
         // Get edit data
@@ -3886 +3886 @@
 
         // Get _POST data
-        if ( bbp_is_post_request() && isset( $_POST['bbp_topic_content'] ) ) {
+        if ( bbp_is_topic_form_post_request() && isset( $_POST['bbp_topic_content'] ) ) {
             $topic_content = stripslashes( $_POST['bbp_topic_content'] );
 
@@ -3933 +3933 @@
 
         // Get _POST data
-        if ( bbp_is_post_request() && isset( $_POST['bbp_topic_tags'] ) ) {
-            $topic_tags = $_POST['bbp_topic_tags'];
+        if ( ( bbp_is_topic_form_post_request() || bbp_is_reply_form_post_request() ) && isset( $_POST['bbp_topic_tags'] ) ) {
+            $topic_tags = stripslashes( $_POST['bbp_topic_tags'] );
 
         // Get edit data
@@ -4016 +4016 @@
 
         // Get _POST data
-        if ( bbp_is_post_request() && isset( $_POST['bbp_forum_id'] ) ) {
+        if ( bbp_is_topic_form_post_request() && isset( $_POST['bbp_forum_id'] ) ) {
             $topic_forum = (int) $_POST['bbp_forum_id'];
 
@@ -4056 +4056 @@
 
         // Get _POST data
-        if ( bbp_is_post_request() && isset( $_POST['bbp_topic_subscription'] ) ) {
+        if ( bbp_is_topic_form_post_request() && isset( $_POST['bbp_topic_subscription'] ) ) {
             $topic_subscribed = (bool) $_POST['bbp_topic_subscription'];
 
@@ -4111 +4111 @@
 
         // Get _POST data
-        if ( bbp_is_post_request() && isset( $_POST['bbp_log_topic_edit'] ) ) {
-            $topic_revision = (int) $_POST['bbp_log_topic_edit'];
+        if ( bbp_is_topic_form_post_request() && isset( $_POST['bbp_log_topic_edit'] ) ) {
+            $topic_revision = (bool) $_POST['bbp_log_topic_edit'];
 
         // No data
         } else {
-            $topic_revision = 1;
+            $topic_revision = true;
         }
 
@@ -4147 +4147 @@
 
         // Get _POST data
-        if ( bbp_is_post_request() && isset( $_POST['bbp_topic_edit_reason'] ) ) {
-            $topic_edit_reason = $_POST['bbp_topic_edit_reason'];
+        if ( bbp_is_topic_form_post_request() && isset( $_POST['bbp_topic_edit_reason'] ) ) {
+            $topic_edit_reason = stripslashes( $_POST['bbp_topic_edit_reason'] );
 
         // No data
@@ -4155 +4155 @@
         }
 
-        return apply_filters( 'bbp_get_form_topic_edit_reason', esc_attr( $topic_edit_reason ) );
-    }
+        return apply_filters( 'bbp_get_form_topic_edit_reason', $topic_edit_reason );
+    }
+
+/**
+ * Verify if a POST request came from a failed topic attempt.
+ *
+ * Used to avoid cross-site request forgeries when checking posted topic form
+ * content.
+ *
+ * @see bbp_topic_form_fields()
+ *
+ * @since bbPress (r5558)
+ * @return boolean True if is a post request with valid nonce
+ */
+function bbp_is_topic_form_post_request() {
+
+    // Bail if not a post request
+    if ( ! bbp_is_post_request() ) {
+        return false;
+    }
+
+    // Creating a new topic
+    if ( bbp_verify_nonce_request( 'bbp-new-topic' ) ) {
+        return true;
+    }
+
+    // Editing an existing topic
+    if ( bbp_verify_nonce_request( 'bbp-edit-topic' ) ) {
+        return true;
+    }
+
+    return false;
+}