Changeset 9948 for trunk/src/bp-messages/classes/class-bp-messages-thread.php

Timestamp:

06/16/2015 10:48:11 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Messages: Introduce filter to enforce private message thread query boundaries.

This change ensures that all queries for private messages will always return anticipated results, even when certain malformed values are passed in. It specifically hardens the user ID argument to prevent accidental overriding.

Fixes #6504. Props r-a-y. (trunk, for 2.4.0)

File:

• trunk/src/bp-messages/classes/class-bp-messages-thread.php (modified) (1 diff)

trunk/src/bp-messages/classes/class-bp-messages-thread.php

@@ -461 +461 @@
         }
 
-        if ( ! empty( $r['user_id'] ) ) {
-            if ( 'sentbox' == $r['box'] ) {
+        $r['user_id'] = (int) $r['user_id'];
+
+        switch ( $r['box'] ) {
+            case 'sentbox' :
                 $user_id_sql = 'AND ' . $wpdb->prepare( 'm.sender_id = %d', $r['user_id'] );
-                $sender_sql  = ' AND m.sender_id = r.user_id';
-            } else {
+                $sender_sql  = 'AND m.sender_id = r.user_id';
+                break;
+
+            case 'inbox' :
+            default :
                 $user_id_sql = 'AND ' . $wpdb->prepare( 'r.user_id = %d', $r['user_id'] );
-                $sender_sql  = ' AND r.sender_only = 0';
-            }
+                $sender_sql  = 'AND r.sender_only = 0';
+                break;
         }