Changeset 56850

Timestamp:

10/12/2023 02:21:47 PM (10 months ago)

Author:

davidbaumwald

Message:

Grouped backports to the 4.1 branch.

• Comments: Prevent users who can not see a post from seeing comments on it.
• Shortcodes: Restrict ajax handler for media shortcode.
• Prevent unintended behavior when certain objects are unserialized.

Merges [56835], [56836], and [56838] to the 4.1 branch.
Props xknown, jorbin, joehoyle, peterwilsoncc, ehtis, tykoted, antpb.

Location:

branches/4.1/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (3 diffs)
• wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/class-wp-theme.php (modified) (2 diffs)
• wp-includes/media.php (modified) (2 diffs)
• wp-includes/shortcodes.php (modified) (1 diff)

branches/4.1/src/wp-admin/includes/ajax-actions.php

@@ -829 +829 @@
         wp_die( 0 );
     }
-    
+
     if ( ! current_user_can( $tax->cap->assign_terms ) ) {
         wp_die( -1 );
@@ -2768 +2768 @@
     }
 
-    setup_postdata( $post );
-    $shortcode = do_shortcode( wp_unslash( $_POST['shortcode'] ) );
+    $shortcode = wp_unslash( $_POST['shortcode'] );
+
+    // Only process previews for media related shortcodes:
+    $found_shortcodes = get_shortcode_tags_in_content( $shortcode );
+    $media_shortcodes = array(
+        'audio',
+        'embed',
+        'playlist',
+        'video',
+        'gallery',
+    );
+
+    $other_shortcodes = array_diff( $found_shortcodes, $media_shortcodes );
+
+    if ( ! empty( $other_shortcodes ) ) {
+        wp_send_json_error();
+    }
+
+    if ( ! empty( $_POST['post_ID'] ) ) {
+        $post = get_post( (int) $_POST['post_ID'] );
+    }
+
+    // the embed shortcode requires a post
+    if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
+        if ( in_array( 'embed', $found_shortcodes, true ) ) {
+            wp_send_json_error();
+        }
+    } else {
+        setup_postdata( $post );
+    }
 
     if ( empty( $shortcode ) ) {
@@ -2836 +2864 @@
     } else {
         $sessions->destroy_all();
-        /* translators: 1: User's display name. */ 
+        /* translators: 1: User's display name. */
         $message = sprintf( __( '%s has been logged out.' ), $user->display_name );
     }

branches/4.1/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -363 +363 @@
         $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
 
+
+
+
+
+
+
+
+
+
+
+
+
+
         echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
         $this->single_row_columns( $comment );

branches/4.1/src/wp-admin/includes/class-wp-list-table.php

@@ -574 +574 @@
         $pending_phrase = sprintf( __( '%s pending' ), number_format( $pending_comments ) );
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         if ( $pending_comments )
             echo '<strong>';

branches/4.1/src/wp-admin/includes/dashboard.php

@@ -779 +779 @@
 
         echo '<div id="the-comment-list" data-wp-lists="list:comment">';
-        foreach ( $comments as $comment )
-            _wp_dashboard_recent_comments_row( $comment );
+        foreach ( $comments as $comment ) {
+            $comment_post = get_post( $comment->comment_post_ID );
+            if (
+                current_user_can( 'edit_post', $comment->comment_post_ID ) ||
+                (
+                    empty( $comment_post->post_password ) &&
+                    current_user_can( 'read_post', $comment->comment_post_ID )
+                )
+            ) {
+                _wp_dashboard_recent_comments_row( $comment );
+            }
+        }
         echo '</div>';
 

branches/4.1/src/wp-includes/class-wp-theme.php

@@ -478 +478 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Adds theme data to cache.
      *
@@ -1233 +1255 @@
         return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
     }
+
+
+
+
+
+
+
+
+
+
+
+
 }

branches/4.1/src/wp-includes/media.php

@@ -975 +975 @@
         }
     } elseif ( ! empty( $atts['exclude'] ) ) {
+
         $attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
     } else {
+
         $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -1269 +1282 @@
     }
 
+
+
+
+
+
+
+
+
+
     if ( empty( $attachments ) ) {
         return '';

branches/4.1/src/wp-includes/shortcodes.php

@@ -171 +171 @@
 
 /**
- * Search content for shortcodes and filter shortcodes through their hooks.
+ * Returns a list of registered shortcode names found in the given content.
+ *
+ * Example usage:
+ *
+ *     get_shortcode_tags_in_content( '[audio src="file.mp3"][/audio] [foo] [gallery ids="1,2,3"]' );
+ *     // array( 'audio', 'gallery' )
+ *
+ * @since 6.3.2
+ *
+ * @param string $content The content to check.
+ * @return string[] An array of registered shortcode names found in the content.
+ */
+function get_shortcode_tags_in_content( $content ) {
+    if ( false === strpos( $content, '[' ) ) {
+        return array();
+    }
+
+    preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
+    if ( empty( $matches ) ) {
+        return array();
+    }
+
+    $tags = array();
+    foreach ( $matches as $shortcode ) {
+        $tags[] = $shortcode[2];
+
+        if ( ! empty( $shortcode[5] ) ) {
+            $deep_tags = get_shortcode_tags_in_content( $shortcode[5] );
+            if ( ! empty( $deep_tags ) ) {
+                $tags = array_merge( $tags, $deep_tags );
+            }
+        }
+    }
+
+    return $tags;
+}
+
+/**
+ * Searches content for shortcodes and filter shortcodes through their hooks.
  *
  * If there are no shortcode tags defined, then the content will be returned