REST API: Support a route-level validation callback.
Most request data is validated on a per-parameter basis. Often, however, additional validation is needed that operates on the entire request object. Currently, this is done in the route callback and often in the `prepare_item_for_database` method specifically. #50244 aims to introduce batch processing in the REST API. An important feature is the ability to enforce that all requests have valid data before executing the route callbacks in "pre-validate" mode. This patch introduces support for calling a `validate_callback` after all parameter validation has succeeded. That allows moving more validation outside of the route callback and into `WP_REST_Request` which will improve "pre-validate" support. Props TimothyBlynJacobs, zieladam. Fixes #51255. See #50244. Built from https://develop.svn.wordpress.org/trunk@48945 git-svn-id: http://core.svn.wordpress.org/trunk@48707 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
63b15a6fd6
commit
f43ca27db9
|
@ -858,13 +858,9 @@ class WP_REST_Request implements ArrayAccess {
|
||||||
$attributes = $this->get_attributes();
|
$attributes = $this->get_attributes();
|
||||||
$required = array();
|
$required = array();
|
||||||
|
|
||||||
// No arguments set, skip validation.
|
$args = empty( $attributes['args'] ) ? array() : $attributes['args'];
|
||||||
if ( empty( $attributes['args'] ) ) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ( $attributes['args'] as $key => $arg ) {
|
|
||||||
|
|
||||||
|
foreach ( $args as $key => $arg ) {
|
||||||
$param = $this->get_param( $key );
|
$param = $this->get_param( $key );
|
||||||
if ( isset( $arg['required'] ) && true === $arg['required'] && null === $param ) {
|
if ( isset( $arg['required'] ) && true === $arg['required'] && null === $param ) {
|
||||||
$required[] = $key;
|
$required[] = $key;
|
||||||
|
@ -890,7 +886,7 @@ class WP_REST_Request implements ArrayAccess {
|
||||||
*/
|
*/
|
||||||
$invalid_params = array();
|
$invalid_params = array();
|
||||||
|
|
||||||
foreach ( $attributes['args'] as $key => $arg ) {
|
foreach ( $args as $key => $arg ) {
|
||||||
|
|
||||||
$param = $this->get_param( $key );
|
$param = $this->get_param( $key );
|
||||||
|
|
||||||
|
@ -919,8 +915,20 @@ class WP_REST_Request implements ArrayAccess {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
if ( isset( $attributes['validate_callback'] ) ) {
|
||||||
|
$valid_check = call_user_func( $attributes['validate_callback'], $this );
|
||||||
|
|
||||||
|
if ( is_wp_error( $valid_check ) ) {
|
||||||
|
return $valid_check;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( false === $valid_check ) {
|
||||||
|
// A WP_Error instance is preferred, but false is supported for parity with the per-arg validate_callback.
|
||||||
|
return new WP_Error( 'rest_invalid_params', __( 'Invalid parameters.' ), array( 'status' => 400 ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '5.6-alpha-48944';
|
$wp_version = '5.6-alpha-48945';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue