Changeset 56878 for branches/5.4/src/wp-includes/media.php

Timestamp:

10/12/2023 03:06:49 PM (3 years ago)

Author:

davidbaumwald

Message:

Grouped backports to the 5.4 branch.

• Comments: Prevent users who can not see a post from seeing comments on it.
• Shortcodes: Restrict media shortcode ajax to certain type.
• REST API: Ensure no-cache headers are sent when methods are overridden.
• REST API: Limit search_columns for users without list_users.
• Prevent unintended behavior when certain objects are unserialized.

Merges [56833], [56834], [56835], [56836], and [56838] to the 5.4 branch.
Props xknown, jorbin, joehoyle, timothyblynjacobs, peterwilsoncc, ehtis, tykoted, antpb, rmccue.

Location:

branches/5.4

Files:

• . (modified) (1 prop)
• src/wp-includes/media.php (modified) (4 diffs)

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

@@ -1931 +1931 @@
                 }
         } elseif ( ! empty( $atts['exclude'] ) ) {
-                $attachments = get_children(
+                $post_parent_id = $id;
+                $attachments    = get_children(
                         array(
                                 'post_parent'    => $id,
@@ -1943 +1944 @@
                 );
         } else {
-                $attachments = get_children(
+                $post_parent_id = $id;
+                $attachments    = get_children(
                         array(
                                 'post_parent'    => $id,
@@ -1953 +1955 @@
                         )
                 );
+        }
+
+        if ( ! empty( $post_parent_id ) ) {
+                $post_parent = get_post( $post_parent_id );
+
+                // terminate the shortcode execution if user cannot read the post or password-protected
+                if (
+                ( ! is_post_publicly_viewable( $post_parent->ID ) && ! current_user_can( 'read_post', $post_parent->ID ) )
+                || post_password_required( $post_parent ) ) {
+                        return '';
+                }
         }
 
@@ -2273 +2286 @@
         }
 
+        if ( ! empty( $args['post_parent'] ) ) {
+                $post_parent = get_post( $id );
+
+                // terminate the shortcode execution if user cannot read the post or password-protected
+                if ( ! current_user_can( 'read_post', $post_parent->ID ) || post_password_required( $post_parent ) ) {
+                        return '';
+                }
+        }
+
         if ( empty( $attachments ) ) {
                 return '';