From 5ecd61023a802373138fd25dd5aca6fedcfeb3d0 Mon Sep 17 00:00:00 2001 From: TimothyBlynJacobs Date: Sun, 9 Feb 2020 20:54:05 +0000 Subject: [PATCH] REST API: Introduce selective link embedding. Previously the _embed flag would embed all embeddable links in a response even if only a subset of the links were necessary. Now, a list of link relations can be passed in the _embed parameter to restrict the list of embedded objects. Props rheinardkorf, adamsilverstein, jnylen0, cklosows, chrisvanpatten, TimothyBlynJacobs. Fixes #39696. Built from https://develop.svn.wordpress.org/trunk@47224 git-svn-id: http://core.svn.wordpress.org/trunk@47024 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/rest-api.php | 22 ++++++++++++++++++ wp-includes/rest-api/class-wp-rest-server.php | 23 ++++++++++++++----- wp-includes/version.php | 2 +- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php index bad90ae336..5add20bc60 100644 --- a/wp-includes/rest-api.php +++ b/wp-includes/rest-api.php @@ -1571,3 +1571,25 @@ function rest_preload_api_request( $memo, $path ) { return $memo; } + +/** + * Parses the "_embed" parameter into the list of resources to embed. + * + * @since 5.4.0 + * + * @param string|array $embed Raw "_embed" parameter value. + * @return true|string[] Either true to embed all embeds, or a list of relations to embed. + */ +function rest_parse_embed_param( $embed ) { + if ( ! $embed || 'true' === $embed || '1' === $embed ) { + return true; + } + + $rels = wp_parse_list( $embed ); + + if ( ! $rels ) { + return true; + } + + return $rels; +} diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php index a14de5c225..d11318916e 100644 --- a/wp-includes/rest-api/class-wp-rest-server.php +++ b/wp-includes/rest-api/class-wp-rest-server.php @@ -398,7 +398,8 @@ class WP_REST_Server { } // Embed links inside the request. - $result = $this->response_to_data( $result, isset( $_GET['_embed'] ) ); + $embed = isset( $_GET['_embed'] ) ? rest_parse_embed_param( $_GET['_embed'] ) : false; + $result = $this->response_to_data( $result, $embed ); /** * Filters the API response. @@ -450,9 +451,10 @@ class WP_REST_Server { * Converts a response to data to send. * * @since 4.4.0 + * @since 5.4.0 The $embed parameter can now contain a list of link relations to include. * * @param WP_REST_Response $response Response object. - * @param bool $embed Whether links should be embedded. + * @param bool|string[] $embed Whether to embed all links, a filtered list of link relations, or no links. * @return array { * Data with sub-requests embedded. * @@ -473,9 +475,11 @@ class WP_REST_Server { $this->embed_cache = array(); // Determine if this is a numeric array. if ( wp_is_numeric_array( $data ) ) { - $data = array_map( array( $this, 'embed_links' ), $data ); + foreach ( $data as $key => $item ) { + $data[ $key ] = $this->embed_links( $item, $embed ); + } } else { - $data = $this->embed_links( $data ); + $data = $this->embed_links( $data, $embed ); } $this->embed_cache = array(); } @@ -571,8 +575,10 @@ class WP_REST_Server { * Embeds the links from the data into the request. * * @since 4.4.0 + * @since 5.4.0 The $embed parameter can now contain a list of link relations to include. * - * @param array $data Data from the request. + * @param array $data Data from the request. + * @param bool|string[] $embed Whether to embed all links or a filtered list of link relations. * @return array { * Data with sub-requests embedded. * @@ -580,7 +586,7 @@ class WP_REST_Server { * @type array [$_embedded] Embeddeds. * } */ - protected function embed_links( $data ) { + protected function embed_links( $data, $embed = true ) { if ( empty( $data['_links'] ) ) { return $data; } @@ -588,6 +594,11 @@ class WP_REST_Server { $embedded = array(); foreach ( $data['_links'] as $rel => $links ) { + // If a list of relations was specified, and the link relation is not in the whitelist, don't process the link. + if ( is_array( $embed ) && ! in_array( $rel, $embed, true ) ) { + continue; + } + $embeds = array(); foreach ( $links as $item ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 868d131827..97a0f24ef7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-47223'; +$wp_version = '5.4-alpha-47224'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.