Changeset 56864 for branches/4.8/src/wp-includes/media.php

Timestamp:

10/12/2023 02:50:31 PM (17 months ago)

Author:

davidbaumwald

Message:

Grouped backports to the 4.8 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 [56834], [56835], [56836], [56838], and [56840] to the 4.8 branch.
Props xknown, jorbin, joehoyle, timothyblynjacobs, peterwilsoncc, ehtis, tykoted, antpb, rmccue.

File:

• branches/4.8/src/wp-includes/media.php (modified) (2 diffs)

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

@@ -1690 +1690 @@
         }
     } elseif ( ! empty( $atts['exclude'] ) ) {
+        $post_parent_id = $id;
         $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 {
+        $post_parent_id = $id;
         $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+    }
+
+    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 '';
+        }
     }
 
@@ -1994 +2007 @@
     }
 
+    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 '';