<!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>[38960] trunk: REST API: Use term-specific caps for permission checks in term update and delete endpoints.</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 { 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/38960">38960</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/38960","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-26 14:51:54 +0000 (Wed, 26 Oct 2016)</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'>REST API: Use term-specific caps for permission checks in term update and delete endpoints.
See <a href="https://core.trac.wordpress.org/ticket/38505">#38505</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiresttagscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2016-10-26 14:47:09 UTC (rev 38959)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2016-10-26 14:51:54 UTC (rev 38960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,8 +451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_term_invalid', __( "Resource doesn't exist." ), array( 'status' => 404 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_obj = get_taxonomy( $this->taxonomy );
- if ( ! current_user_can( $taxonomy_obj->cap->edit_terms ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'edit_term', $term->term_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_cannot_update', __( 'Sorry, you cannot update resource.' ), array( 'status' => rest_authorization_required_code() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,8 +526,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_term_invalid', __( "Resource doesn't exist." ), array( 'status' => 404 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_obj = get_taxonomy( $this->taxonomy );
- if ( ! current_user_can( $taxonomy_obj->cap->delete_terms ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! current_user_can( 'delete_term', $term->term_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_cannot_delete', __( 'Sorry, you cannot delete resource.' ), array( 'status' => rest_authorization_required_code() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttagscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2016-10-26 14:47:09 UTC (rev 38959)
+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2016-10-26 14:51:54 UTC (rev 38960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,6 +533,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_cannot_update', $response, 403 );
</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">+ /**
+ * @ticket 38505
+ */
+ public function test_update_item_with_edit_term_cap_granted() {
+ wp_set_current_user( self::$subscriber );
+ $term = $this->factory->tag->create_and_get();
+ $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
+ $request->set_param( 'name', 'New Name' );
+
+ add_filter( 'map_meta_cap', array( $this, 'grant_edit_term' ), 10, 2 );
+ $response = $this->server->dispatch( $request );
+ remove_filter( 'user_has_cap', array( $this, 'grant_edit_term' ), 10, 2 );
+
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $this->assertEquals( 'New Name', $data['name'] );
+ }
+
+ public function grant_edit_term( $caps, $cap ) {
+ if ( 'edit_term' === $cap ) {
+ $caps = array( 'read' );
+ }
+ return $caps;
+ }
+
+ /**
+ * @ticket 38505
+ */
+ public function test_update_item_with_edit_term_cap_revoked() {
+ wp_set_current_user( self::$administrator );
+ $term = $this->factory->tag->create_and_get();
+ $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
+ $request->set_param( 'name', 'New Name' );
+
+ add_filter( 'map_meta_cap', array( $this, 'revoke_edit_term' ), 10, 2 );
+ $response = $this->server->dispatch( $request );
+ remove_filter( 'user_has_cap', array( $this, 'revoke_edit_term' ), 10, 2 );
+
+ $this->assertErrorResponse( 'rest_cannot_update', $response, 403 );
+ }
+
+ public function revoke_edit_term( $caps, $cap ) {
+ if ( 'edit_term' === $cap ) {
+ $caps = array( 'do_not_allow' );
+ }
+ return $caps;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_parent_non_hierarchical_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$administrator );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,6 +626,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_cannot_delete', $response, 403 );
</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">+ /**
+ * @ticket 38505
+ */
+ public function test_delete_item_with_delete_term_cap_granted() {
+ wp_set_current_user( self::$subscriber );
+ $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+ $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
+ $request->set_param( 'force', true );
+
+ add_filter( 'map_meta_cap', array( $this, 'grant_delete_term' ), 10, 2 );
+ $response = $this->server->dispatch( $request );
+ remove_filter( 'map_meta_cap', array( $this, 'grant_delete_term' ), 10, 2 );
+
+ $this->assertEquals( 200, $response->get_status() );
+ $data = $response->get_data();
+ $this->assertEquals( 'Deleted Tag', $data['name'] );
+ }
+
+ public function grant_delete_term( $caps, $cap ) {
+ if ( 'delete_term' === $cap ) {
+ $caps = array( 'read' );
+ }
+ return $caps;
+ }
+
+ /**
+ * @ticket 38505
+ */
+ public function test_delete_item_with_delete_term_cap_revoked() {
+ wp_set_current_user( self::$administrator );
+ $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+ $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
+ $request->set_param( 'force', true );
+
+ add_filter( 'map_meta_cap', array( $this, 'revoke_delete_term' ), 10, 2 );
+ $response = $this->server->dispatch( $request );
+ remove_filter( 'map_meta_cap', array( $this, 'revoke_delete_term' ), 10, 2 );
+
+ $this->assertErrorResponse( 'rest_cannot_delete', $response, 403 );
+ }
+
+ public function revoke_delete_term( $caps, $cap ) {
+ if ( 'delete_term' === $cap ) {
+ $caps = array( 'do_not_allow' );
+ }
+ return $caps;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_prepare_item() {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $term->term_id );
</span></span></pre>
</div>
</div>
</body>
</html>