<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56846] branches/6.3: Shortcodes: Restrict ajax handler for media shortcode.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56846">56846</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56846","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-12 13:27:29 +0000 (Thu, 12 Oct 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Shortcodes: Restrict ajax handler for media shortcode.
Props tykoted, xknown, peterwilsoncc, antpb, jorbin.
Merges <a href="https://core.trac.wordpress.org/changeset/56838">[56838]</a> to the 6.3 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches63srcwpadminincludesajaxactionsphp">branches/6.3/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#branches63srcwpincludesmediaphp">branches/6.3/src/wp-includes/media.php</a></li>
<li><a href="#branches63srcwpincludesshortcodesphp">branches/6.3/src/wp-includes/shortcodes.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches63testsphpunittestsajaxwpAjaxParseMediaShortcodephp">branches/6.3/tests/phpunit/tests/ajax/wpAjaxParseMediaShortcode.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches63">branches/6.3/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.3
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.3 2023-10-12 13:25:48 UTC (rev 56845)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.3 2023-10-12 13:27:29 UTC (rev 56846)
</ins><a id="branches63"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.3</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:56268,56272,56277,56279,56282,56284,56287,56290-56292,56296,56298,56300,56302,56308-56309,56311,56315,56320,56327,56329,56332,56335,56337,56339,56341,56350,56358,56365,56381,56386,56401,56417,56422,56459,56461,56463,56490-56491,56502-56503,56524-56525,56527,56529,56550,56577,56622,56757,56778,56783,56785,56833-56837
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:56268,56272,56277,56279,56282,56284,56287,56290-56292,56296,56298,56300,56302,56308-56309,56311,56315,56320,56327,56329,56332,56335,56337,56339,56341,56350,56358,56365,56381,56386,56401,56417,56422,56459,56461,56463,56490-56491,56502-56503,56524-56525,56527,56529,56550,56577,56622,56757,56778,56783,56785,56833-56838
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches63srcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.3/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/src/wp-admin/includes/ajax-actions.php 2023-10-12 13:25:48 UTC (rev 56845)
+++ branches/6.3/src/wp-admin/includes/ajax-actions.php 2023-10-12 13:27:29 UTC (rev 56846)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3882,6 +3882,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $shortcode = wp_unslash( $_POST['shortcode'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['post_ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( (int) $_POST['post_ID'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3888,7 +3904,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The embed shortcode requires a post.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'embed' === $shortcode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'embed', $found_shortcodes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="branches63srcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.3/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/src/wp-includes/media.php 2023-10-12 13:25:48 UTC (rev 56845)
+++ branches/6.3/src/wp-includes/media.php 2023-10-12 13:27:29 UTC (rev 56846)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2605,6 +2605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attachments[ $val->ID ] = $_attachments[ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $atts['exclude'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_parent_id = $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachments = get_children(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2617,6 +2618,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_parent_id = $id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachments = get_children(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2629,6 +2631,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 '';
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $attachments ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2961,6 +2974,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attachments = get_children( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 '';
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $attachments ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches63srcwpincludesshortcodesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.3/src/wp-includes/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/src/wp-includes/shortcodes.php 2023-10-12 13:25:48 UTC (rev 56845)
+++ branches/6.3/src/wp-includes/shortcodes.php 2023-10-12 13:27:29 UTC (rev 56846)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,6 +169,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Searches content for shortcodes and filter shortcodes through their hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This function is an alias for do_shortcode().
</span></span></pre></div>
<a id="branches63testsphpunittestsajaxwpAjaxParseMediaShortcodephpfromrev56838trunktestsphpunittestsajaxwpAjaxParseMediaShortcodephp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: branches/6.3/tests/phpunit/tests/ajax/wpAjaxParseMediaShortcode.php (from rev 56838, trunk/tests/phpunit/tests/ajax/wpAjaxParseMediaShortcode.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/tests/phpunit/tests/ajax/wpAjaxParseMediaShortcode.php (rev 0)
+++ branches/6.3/tests/phpunit/tests/ajax/wpAjaxParseMediaShortcode.php 2023-10-12 13:27:29 UTC (rev 56846)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,85 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Admin Ajax functions to be tested.
+ */
+require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
+
+/**
+ * Testing Ajax save draft functionality.
+ *
+ * @package WordPress
+ * @subpackage UnitTests
+ * @since 6.3.2
+ *
+ * @group ajax
+ *
+ * @covers ::wp_ajax_parse-media-shortcode
+ */
+class Tests_Ajax_wpAjaxParseMediaShortcode extends WP_Ajax_UnitTestCase {
+ const SHORTCODE_RETURN_VALUE = 'TEST';
+ private static $media_id;
+ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+ self::$media_id = self::factory()->attachment->create_object(
+ get_temp_dir() . 'canola.jpg',
+ 0,
+ array(
+ 'post_mime_type' => 'image/jpeg',
+ 'post_excerpt' => 'A sample caption',
+ 'post_name' => 'restapi-client-fixture-attachment',
+ 'post_title' => 'REST API Client Fixture: Attachment',
+ 'post_date' => '2017-02-14 00:00:00',
+ 'post_date_gmt' => '2017-02-14 00:00:00',
+ 'post_author' => 0,
+ )
+ );
+ }
+ /**
+ * @dataProvider shortcode_provider
+ */
+ public function test_parse_shortcode( array $payload, $expected ) {
+ add_shortcode( 'test', array( $this, 'shortcode_test' ) );
+
+ $_POST = array_merge(
+ array(
+ 'action' => 'paser-media-shortcode',
+ 'type' => '',
+ ),
+ $payload
+ );
+ // Make the request.
+ try {
+ $this->_handleAjax( 'parse-media-shortcode' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+ // Get the response, it is in heartbeat's response.
+ $response = json_decode( $this->_last_response, true );
+ $body = $response['data']['body'] ?? '';
+ if ( $body ) {
+ $this->assertStringNotContainsString( self::SHORTCODE_RETURN_VALUE, $body );
+ }
+ $this->assertSame( $expected['success'], $response['success'] );
+ }
+
+ public function shortcode_test() {
+ return self::SHORTCODE_RETURN_VALUE;
+ }
+
+ public function shortcode_provider() {
+ return array(
+ 'gallery_shortcode_is_allowed' => array(
+ 'payload' => array( 'shortcode' => '[gallery ids=" ' . self::$media_id . '"]' ),
+ 'expected' => array( 'success' => true ),
+ ),
+ 'gallery_and_custom_test_shortcode_is_not_allowed' => array(
+ 'payload' => array( 'shortcode' => '[gallery ids=" ' . self::$media_id . '"] [test]' ),
+ 'expected' => array( 'success' => false ),
+ ),
+ 'custom_test_shortcode_is_not_allowed' => array(
+ 'payload' => array( 'shortcode' => '[test]' ),
+ 'expected' => array( 'success' => false ),
+ ),
+ );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>