Changeset 56867 for branches/6.1/src/wp-includes/media.php

Timestamp:

10/12/2023 02:54:10 PM (22 months ago)

Author:

joemcgill

Message:

Grouped backports to the 6.1 branch.

• REST API: Limit search_columns for users without list_users.
• Comments: Prevent users who can not see a post from seeing comments on it.
• Application Passwords: Prevent the use of some pseudo protocols in application passwords.
• Restrict media shortcode ajax to certain type
• REST API: Ensure no-cache headers are sent when methods are overriden.
• Prevent unintended behavior when certain objects are unserialized.

Merges [56833], [56834], [56835], [56836], [56837], and [56838] to the 6.1 branch.
Props xknown, jorbin, Vortfu, joehoyle, timothyblynjacobs, peterwilsoncc, ehtis, tykoted, martinkrcho, paulkevan, dd32, antpb, rmccue.

Location:

branches/6.1

Files:

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

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

@@ -2454 +2454 @@
         }
     } elseif ( ! empty( $atts['exclude'] ) ) {
+        $post_parent_id = $id;
         $attachments = get_children(
             array(
@@ -2466 +2467 @@
         );
     } else {
+        $post_parent_id = $id;
         $attachments = get_children(
             array(
@@ -2476 +2478 @@
             )
         );
+    }
+
+    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 '';
+        }
     }
 
@@ -2804 +2817 @@
     }
 
+    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 '';